ProjectSettings are now configured when the bean is created (without call to a struts...

[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 a7ce2df303515eec1ab9eff97b06b4f132df67ba..13d385d7d61481e4db2c2722f6caf11966d2e746 100644 (file)
--- a/Workspace/Siman/src/spring/applicationContext.xml
+++ b/Workspace/Siman/src/spring/applicationContext.xml
@@ -25,8 +25,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                class="org.springframework.context.support.ResourceBundleMessageSource">
                <property name="basenames">
                        <list>
-                <value>conf/log-messages</value>
-                <value>som</value>
+                               <value>conf/log-messages</value>
+                               <value>som</value>
                        </list>
                </property>
        </bean>
@@ -48,20 +48,16 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        </bean>
 
        <bean id="menuBarSettings" class="org.splat.simer.MenuBarSettings"
-               scope="session">
-       </bean>
+               scope="session" />
 
        <bean id="titleBarSettings" class="org.splat.simer.TitleBarSettings"
-               scope="session">
-       </bean>
+               scope="session" />
 
        <bean id="toolBarSettings" class="org.splat.simer.ToolBarSettings"
-               scope="session">
-       </bean>
+               scope="session" />
 
        <bean id="leftMenuSettings" class="org.splat.simer.LeftMenuSettings"
-               scope="session">
-       </bean>
+               scope="session" />
 
        <bean id="slidMenu" scope="session" abstract="true">
                <property name="projectElementService"
@@ -83,7 +79,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="projectSettings" ref="projectSettings" />
                <property name="knowledgeElementTypeService"
                        ref="knowledgeElementTypeService" />
-        <property name="publicationService" ref="publicationService" />
+               <property name="publicationService" ref="publicationService" />
        </bean>
 
        <bean id="openStudy" class="org.splat.simer.OpenStudy"
@@ -99,12 +95,12 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        </bean>
 
        <bean id="openKnowledge" class="org.splat.simer.OpenKnowledge"
-               parent="openObject" scope="session">
-       </bean>
+               parent="openObject" scope="session" />
+
+       <bean id="invalidateAction"
+               class="org.splat.simer.InvalidateAction" />
 
-    <bean id="invalidateAction" class="org.splat.simer.InvalidateAction"/>
-    
-    <bean id="baseAction" class="org.splat.simer.Action"
+       <bean id="baseAction" class="org.splat.simer.Action"
                scope="prototype" abstract="true">
                <property name="applicationSettings" ref="applicationSettings" />
                <property name="openStudy" ref="openStudy" />
@@ -141,7 +137,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        <bean id="importDocumentAction"
                class="org.splat.simer.ImportDocumentAction" scope="prototype"
                parent="baseAction">
-        <property name="studyService" ref="studyService" />
+               <property name="studyService" ref="studyService" />
                <property name="stepService" ref="stepService" />
                <property name="projectSettings" ref="projectSettings" />
                <property name="publicationService" ref="publicationService" />
@@ -156,10 +152,11 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="studyService" ref="studyService" />
        </bean>
 
-    <bean id="removeStudyAction" class="org.splat.simer.RemoveStudyAction"
-        scope="prototype" parent="baseAction">
-        <property name="studyService" ref="studyService" />
-    </bean>
+       <bean id="removeStudyAction"
+               class="org.splat.simer.RemoveStudyAction" scope="prototype"
+               parent="baseAction">
+               <property name="studyService" ref="studyService" />
+       </bean>
 
        <!--========= Inherited from displayStudyStepAction ========= -->
 
@@ -170,10 +167,9 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="userService" ref="userService" />
        </bean>
 
-    <bean id="editStudyAction" class="org.splat.simer.EditStudyAction"
-        scope="prototype" parent="displayStudyStepAction">
-    </bean>
-    
+       <bean id="editStudyAction" class="org.splat.simer.EditStudyAction"
+               scope="prototype" parent="displayStudyStepAction" />
+
        <bean id="editScenarioPropertiesAction"
                class="org.splat.simer.EditScenarioPropertiesAction" scope="prototype"
                parent="displayStudyStepAction">
@@ -209,49 +205,43 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                        ref="knowledgeElementTypeService" />
                <property name="scenarioService" ref="scenarioService" />
        </bean>
-       
+
        <bean id="editStepCommentAction"
-        class="org.splat.simer.EditStepCommentAction" scope="prototype"
-        parent="displayStudyStepAction">
-        <property name="stepService" ref="stepService" />
-    </bean>
-    
-    <bean id="editStudyDescriptionAction"
-        class="org.splat.simer.EditStudyDescriptionAction" scope="prototype"
-        parent="displayStudyStepAction">
-    </bean>
-    
-    
-    <!-- bean id="CompareStudyAction"
-        class="org.splat.simer.CompareStudyAction" scope="prototype"
-        parent="displayStudyStepAction">
-        <property name="studyService" ref="studyService" />
-    </bean-->
+               class="org.splat.simer.EditStepCommentAction" scope="prototype"
+               parent="displayStudyStepAction">
+               <property name="stepService" ref="stepService" />
+       </bean>
+
+       <bean id="editStudyDescriptionAction"
+               class="org.splat.simer.EditStudyDescriptionAction" scope="prototype"
+               parent="displayStudyStepAction" />
+
+
+       <!-- bean id="CompareStudyAction"
+               class="org.splat.simer.CompareStudyAction" scope="prototype"
+               parent="displayStudyStepAction">
+               <property name="studyService" ref="studyService" />
+               </bean-->
 
        <!-- End of Inherited from displayStudyStepAction -->
 
        <bean id="startAction" class="org.splat.simer.StartAction"
-               scope="prototype" parent="baseAction">
-               <property name="applicationSettings" ref="applicationSettings" />
-               <property name="projectSettings" ref="projectSettings" />
-       </bean>
+               scope="prototype" parent="baseAction" />
+
        <bean id="connectionAction" class="org.splat.simer.ConnectionAction"
-               scope="prototype" parent="baseAction">
-       </bean>
+               scope="prototype" parent="baseAction" />
 
        <bean id="menuAction" class="org.splat.simer.MenuAction"
-               scope="prototype" parent="baseAction">
-       </bean>
+               scope="prototype" parent="baseAction" />
 
        <bean id="notYetImplementedAction"
                class="org.splat.simer.NotYetImplementedAction" scope="prototype"
-               parent="baseAction">
-       </bean>
+               parent="baseAction" />
 
        <bean id="searchStudyAction"
                class="org.splat.simer.SearchStudyAction" scope="prototype"
                parent="baseAction">
-               <property name="projectSettings" ref="projectSettings" />
+               <property name="stepsConfigService" ref="stepsConfigService" />
                <property name="searchService" ref="searchService" />
                <property name="simulationContextService"
                        ref="simulationContextService" />
@@ -270,8 +260,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        </bean>
 
        <bean id="searchDocumentAction"
-               class="org.splat.simer.SearchDocumentAction" scope="prototype">
-       </bean>
+               class="org.splat.simer.SearchDocumentAction" scope="prototype" />
 
        <bean id="displayKnowledgeAction"
                class="org.splat.simer.DisplayKnowledgeAction" scope="prototype"
@@ -287,8 +276,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
        <bean id="uploadStudyAction"
                class="org.splat.simer.UploadStudyAction" scope="prototype"
-               parent="baseAction">
-       </bean>
+               parent="baseAction" />
 
        <bean id="versionDocumentAction"
                class="org.splat.simer.VersionDocumentAction" scope="prototype"
@@ -296,7 +284,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="projectSettings" ref="projectSettings" />
                <property name="publicationService" ref="publicationService" />
                <property name="stepService" ref="stepService" />
-        <property name="studyService" ref="studyService" />
+               <property name="studyService" ref="studyService" />
                <property name="repositoryService" ref="repositoryService" />
        </bean>
 
@@ -326,7 +314,6 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
        <bean id="knowledgeElementAction"
                class="org.splat.simer.admin.KnowledgeElementAction"
-               scope="prototype">
-       </bean>
+               scope="prototype" />
 
 </beans>