Refactoring continues: UserService is created instead of UserDirectory. Database...

[tools/siman.git] / Workspace / Siman / src / spring / applicationContext.xml

diff --git a/Workspace/Siman/src/spring/applicationContext.xml b/Workspace/Siman/src/spring/applicationContext.xml
index 62240ae9b2b0d7c6650e626dd66408fd269c8c83..71782db2122dde67ee387b715c0ac43e9fcf154b 100644 (file)
--- a/Workspace/Siman/src/spring/applicationContext.xml
+++ b/Workspace/Siman/src/spring/applicationContext.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:aop="http://www.springframework.org/schema/aop"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
        xmlns:context="http://www.springframework.org/schema/context"
        xsi:schemaLocation="http://www.springframework.org/schema/beans  
 http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
@@ -17,8 +16,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
        <!-- configuration i18n -->
        <bean id="i18nUtils" class="org.splat.i18n.I18nUtils">
-               <property name="resourceBundleMessageSource"
-                       ref="messageSource" />
+               <property name="resourceBundleMessageSource" ref="messageSource" />
        </bean>
 
        <bean id="messageSource"
@@ -31,10 +29,10 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                </property>
        </bean>
        <!-- ref 'baseMessageSource' into Siman-common\src\spring\globalContext.xml -->
-       <!-- property name="parentMessageSource" ref="baseMessageSource"/-->
+       <!-- property name="parentMessageSource" ref="baseMessageSource"/ -->
 
-       <bean id="applicationSettings"
-               class="org.splat.simer.ApplicationSettings">
+       <bean id="applicationSettings" class="org.splat.simer.ApplicationSettings"
+               factory-method="getMe">
                <property name="projectSettings" ref="projectSettings" />
                <property name="documentTypeService" ref="documentTypeService" />
        </bean>
@@ -43,69 +41,63 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                scope="prototype" />
 
        <bean id="slidMenu" scope="session" abstract="true">
-               <property name="projectElementService"
-                       ref="projectElementService" />
+               <property name="projectElementService" ref="projectElementService" />
                <property name="scenarioService" ref="scenarioService" />
        </bean>
 
-       <bean id="studyMenu" class="org.splat.simer.StudyMenu"
-               scope="session" parent="slidMenu" />
+       <bean id="studyMenu" class="org.splat.simer.StudyMenu" scope="session"
+               parent="slidMenu" />
 
        <bean id="newScenarioMenu" class="org.splat.simer.NewScenarioMenu"
                scope="session" parent="slidMenu" />
 
-       <bean id="openObject" abstract="true"
-               class="org.splat.simer.OpenObject" scope="session">
-               <property name="projectElementService"
-                       ref="projectElementService" />
+       <bean id="openObject" abstract="true" class="org.splat.simer.OpenObject"
+               scope="session">
+               <property name="projectElementService" ref="projectElementService" />
                <property name="projectSettings" ref="projectSettings" />
-               <property name="knowledgeElementTypeService"
-                       ref="knowledgeElementTypeService" />
+               <property name="knowledgeElementTypeService" ref="knowledgeElementTypeService" />
        </bean>
 
-       <bean id="openStudy" class="org.splat.simer.OpenStudy"
-               parent="openObject" scope="session">
-               <property name="projectElementService"
-                       ref="projectElementService" />
+       <bean id="openStudy" class="org.splat.simer.OpenStudy" parent="openObject"
+               scope="session">
+               <property name="projectElementService" ref="projectElementService" />
                <property name="publicationService" ref="publicationService" />
                <property name="studyService" ref="studyService" />
                <property name="stepService" ref="stepService" />
                <property name="repositoryService" ref="repositoryService" />
                <property name="menu" ref="studyMenu" />
                <property name="documentTypeService" ref="documentTypeService" />
+        <property name="documentService" ref="documentService" />
        </bean>
 
        <bean id="openKnowledge" class="org.splat.simer.OpenKnowledge"
                parent="openObject" scope="session">
        </bean>
 
-       <bean id="baseAction" class="org.splat.simer.Action"
-               scope="prototype" abstract="true">
+       <bean id="baseAction" class="org.splat.simer.Action" scope="prototype"
+               abstract="true">
                <property name="openStudy" ref="openStudy" />
                <property name="openKnowledge" ref="openKnowledge" />
        </bean>
 
-       <!--========= Inherited from baseAction =========-->
+       <!--========= Inherited from baseAction ========= -->
 
        <bean id="newStudyAction" class="org.splat.simer.NewStudyAction"
                parent="baseAction" scope="prototype">
-               <property name="simulationContextService"
-                       ref="simulationContextService" />
+               <property name="simulationContextService" ref="simulationContextService" />
+               <property name="scenarioService" ref="scenarioService" />
                <property name="studyService" ref="studyService" />
        </bean>
 
-       <bean id="newScenarioAction"
-               class="org.splat.simer.NewScenarioAction" parent="baseAction"
-               scope="prototype">
-               <property name="projectElementService"
-                       ref="projectElementService" />
+       <bean id="newScenarioAction" class="org.splat.simer.NewScenarioAction"
+               parent="baseAction" scope="prototype">
+               <property name="projectElementService" ref="projectElementService" />
                <property name="scenarioService" ref="scenarioService" />
                <property name="menu" ref="newScenarioMenu" />
        </bean>
 
-       <bean id="importDocumentAction"
-               class="org.splat.simer.ImportDocumentAction" scope="prototype"
-               parent="baseAction">
+       <bean id="importDocumentAction" class="org.splat.simer.ImportDocumentAction"
+               scope="prototype" parent="baseAction">
                <property name="stepService" ref="stepService" />
                <property name="projectSettings" ref="projectSettings" />
                <property name="publicationService" ref="publicationService" />
@@ -113,62 +105,52 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="documentTypeService" ref="documentTypeService" />
        </bean>
 
-       <bean id="displayStudyStepAction"
-               class="org.splat.simer.DisplayStudyStepAction" parent="baseAction"
-               scope="prototype">
+       <bean id="displayStudyStepAction" class="org.splat.simer.DisplayStudyStepAction"
+               parent="baseAction" scope="prototype">
                <property name="studyService" ref="studyService" />
        </bean>
 
-       <!--========= Inherited from displayStudyStepAction =========-->
+       <!--========= Inherited from displayStudyStepAction ========= -->
 
-       <bean id="studyPropertiesAction"
-               class="org.splat.simer.StudyPropertiesAction" scope="prototype"
-               parent="displayStudyStepAction">
+       <bean id="studyPropertiesAction" class="org.splat.simer.StudyPropertiesAction"
+               scope="prototype" parent="displayStudyStepAction">
                <property name="documentTypeService" ref="documentTypeService" />
+        <property name="userService" ref="userService" />
        </bean>
 
        <bean id="editStudyAction" class="org.splat.simer.EditStudyAction"
                scope="prototype" parent="displayStudyStepAction">
        </bean>
 
-       <bean id="editScenarioPropertiesAction"
-               class="org.splat.simer.EditScenarioPropertiesAction" scope="prototype"
-               parent="displayStudyStepAction">
-               <property name="projectElementService"
-                       ref="projectElementService" />
+       <bean id="editScenarioPropertiesAction" class="org.splat.simer.EditScenarioPropertiesAction"
+               scope="prototype" parent="displayStudyStepAction">
+               <property name="projectElementService" ref="projectElementService" />
                <property name="scenarioService" ref="scenarioService" />
        </bean>
 
-       <bean id="editSimulationContextAction"
-               class="org.splat.simer.EditSimulationContextAction" scope="prototype"
-               parent="displayStudyStepAction">
+       <bean id="editSimulationContextAction" class="org.splat.simer.EditSimulationContextAction"
+               scope="prototype" parent="displayStudyStepAction">
                <property name="stepService" ref="stepService" />
-               <property name="simulationContextService"
-                       ref="simulationContextService" />
+               <property name="simulationContextService" ref="simulationContextService" />
        </bean>
 
-       <bean id="editDocumentAction"
-               class="org.splat.simer.EditDocumentAction" scope="prototype"
-               parent="displayStudyStepAction">
+       <bean id="editDocumentAction" class="org.splat.simer.EditDocumentAction"
+               scope="prototype" parent="displayStudyStepAction">
                <property name="stepService" ref="stepService" />
                <property name="publicationService" ref="publicationService" />
                <property name="repositoryService" ref="repositoryService" />
        </bean>
 
-       <bean id="editKnowledgeElementAction"
-               class="org.splat.simer.EditKnowledgeElementAction" scope="prototype"
-               parent="displayStudyStepAction">
-               <property name="knowledgeElementService"
-                       ref="knowledgeElementService" />
-               <property name="knowledgeElementTypeService"
-                       ref="knowledgeElementTypeService" />
+       <bean id="editKnowledgeElementAction" class="org.splat.simer.EditKnowledgeElementAction"
+               scope="prototype" parent="displayStudyStepAction">
+               <property name="knowledgeElementService" ref="knowledgeElementService" />
+               <property name="knowledgeElementTypeService" ref="knowledgeElementTypeService" />
                <property name="scenarioService" ref="scenarioService" />
        </bean>
 
        <!-- End of Inherited from displayStudyStepAction -->
 
-       <bean id="startAction" class="org.splat.simer.StartAction"
-               scope="prototype">
+       <bean id="startAction" class="org.splat.simer.StartAction" scope="prototype">
                <property name="applicationSettings" ref="applicationSettings" />
                <property name="projectSettings" ref="projectSettings" />
        </bean>
@@ -176,39 +158,36 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                scope="prototype">
        </bean>
 
-       <bean id="menuAction" class="org.splat.simer.MenuAction"
-               scope="prototype">
+       <bean id="menuAction" class="org.splat.simer.MenuAction" scope="prototype">
        </bean>
 
-       <bean id="notYetImplementedAction"
-               class="org.splat.simer.NotYetImplementedAction" scope="prototype">
+       <bean id="notYetImplementedAction" class="org.splat.simer.NotYetImplementedAction"
+               scope="prototype">
        </bean>
 
-       <bean id="searchStudyAction"
-               class="org.splat.simer.SearchStudyAction" scope="prototype">
+       <bean id="searchStudyAction" class="org.splat.simer.SearchStudyAction"
+               scope="prototype">
                <property name="projectSettings" ref="projectSettings" />
                <property name="searchService" ref="searchService" />
-               <property name="simulationContextService"
-                       ref="simulationContextService" />
+               <property name="simulationContextService" ref="simulationContextService" />
+        <property name="userService" ref="userService" />
        </bean>
 
-       <bean id="searchKnowledgeAction"
-               class="org.splat.simer.SearchKnowledgeAction" scope="prototype">
+       <bean id="searchKnowledgeAction" class="org.splat.simer.SearchKnowledgeAction"
+               scope="prototype">
                <property name="searchService" ref="searchService" />
-               <property name="simulationContextService"
-                       ref="simulationContextService" />
-               <property name="knowledgeElementTypeService"
-                       ref="knowledgeElementTypeService" />
+               <property name="simulationContextService" ref="simulationContextService" />
+               <property name="knowledgeElementTypeService" ref="knowledgeElementTypeService" />
+        <property name="userService" ref="userService" />
        </bean>
 
-       <bean id="searchDocumentAction"
-               class="org.splat.simer.SearchDocumentAction" scope="prototype">
+       <bean id="searchDocumentAction" class="org.splat.simer.SearchDocumentAction"
+               scope="prototype">
        </bean>
 
-       <bean id="displayKnowledgeAction"
-               class="org.splat.simer.DisplayKnowledgeAction" scope="prototype">
-               <property name="knowledgeElementService"
-                       ref="knowledgeElementService" />
+       <bean id="displayKnowledgeAction" class="org.splat.simer.DisplayKnowledgeAction"
+               scope="prototype">
+               <property name="knowledgeElementService" ref="knowledgeElementService" />
        </bean>
 
        <bean id="uploadAction" class="org.splat.simer.UploadAction"
@@ -216,52 +195,47 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="repositoryService" ref="repositoryService" />
        </bean>
 
-       <bean id="versionDocumentAction"
-               class="org.splat.simer.VersionDocumentAction" scope="prototype">
+       <bean id="versionDocumentAction" class="org.splat.simer.VersionDocumentAction"
+               scope="prototype">
                <property name="projectSettings" ref="projectSettings" />
                <property name="publicationService" ref="publicationService" />
                <property name="stepService" ref="stepService" />
                <property name="repositoryService" ref="repositoryService" />
        </bean>
 
-       <bean id="databaseIndexingAction"
-               class="org.splat.simer.admin.DatabaseIndexingAction"
+       <bean id="databaseIndexingAction" class="org.splat.simer.admin.DatabaseIndexingAction"
                scope="prototype">
                <property name="studyService" ref="studyService" />
                <property name="importedStudy" ref="importedStudy" />
                <property name="searchService" ref="searchService" />
        </bean>
 
-       <bean id="importUserAction"
-               class="org.splat.simer.admin.ImportUserAction" scope="prototype">
+       <bean id="importUserAction" class="org.splat.simer.admin.ImportUserAction"
+               scope="prototype">
                <property name="repositoryService" ref="repositoryService" />
+        <property name="userService" ref="userService" />
        </bean>
 
-       <bean id="simulationContextAction"
-               class="org.splat.simer.admin.SimulationContextAction"
+       <bean id="simulationContextAction" class="org.splat.simer.admin.SimulationContextAction"
                scope="prototype">
-               <property name="knowledgeElementService"
-                       ref="knowledgeElementService" />
+               <property name="knowledgeElementService" ref="knowledgeElementService" />
                <property name="searchService" ref="searchService" />
                <property name="projectSettings" ref="projectSettings" />
-               <property name="simulationContextService"
-                       ref="simulationContextService" />
+               <property name="simulationContextService" ref="simulationContextService" />
        </bean>
 
-       <bean id="knowledgeElementAction"
-               class="org.splat.simer.admin.KnowledgeElementAction"
+       <bean id="knowledgeElementAction" class="org.splat.simer.admin.KnowledgeElementAction"
                scope="prototype">
        </bean>
 
-       <bean id="saveDocumentAction"
-               class="org.splat.module.SaveDocumentAction" scope="prototype">
+       <bean id="saveDocumentAction" class="org.splat.module.SaveDocumentAction"
+               scope="prototype">
                <property name="documentTypeService" ref="documentTypeService" />
                <property name="publicationService" ref="publicationService" />
                <property name="repositoryService" ref="repositoryService" />
                <property name="scenarioService" ref="scenarioService" />
                <property name="stepService" ref="stepService" />
-               <property name="simulationContextService"
-                       ref="simulationContextService" />
+               <property name="simulationContextService" ref="simulationContextService" />
        </bean>
 
 </beans>