Fixed: adding a knowledge element (but there is still a double addition), opening...

[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 c7b78a981732fe2a8b6d76175aa622b50fa982ba..6ca12a4f3b94bdebc29482d3e8e4d5bd27f6f74c 100644 (file)
--- a/Workspace/Siman/src/spring/applicationContext.xml
+++ b/Workspace/Siman/src/spring/applicationContext.xml
@@ -26,7 +26,7 @@ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
        </bean>
 
        <bean id="openKnowledge" class="org.splat.simer.OpenKnowledge"
-               scope="prototype">
+               scope="session">
                <property name="projectElementService"
                        ref="projectElementService" />
                <property name="projectSettings" ref="projectSettings" />
@@ -38,17 +38,60 @@ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
                <property name="openKnowledge" ref="openKnowledge" />
        </bean>
 
+    <!--========= Inherited from baseAction =========-->
+    
+    <bean id="newStudyAction" class="org.splat.simer.NewStudyAction"
+        parent="baseAction" scope="prototype">
+        <property name="studyService" ref="studyService" />
+    </bean>
+
        <bean id="displayStudyStepAction"
                class="org.splat.simer.DisplayStudyStepAction" parent="baseAction"
                scope="prototype">
                <property name="studyService" ref="studyService" />
        </bean>
 
-       <bean id="newStudyAction" class="org.splat.simer.NewStudyAction"
-               parent="baseAction" scope="prototype">
-               <property name="studyService" ref="studyService" />
+    <!--========= Inherited from displayStudyStepAction =========-->
+    
+       <bean id="studyPropertiesAction"
+               class="org.splat.simer.StudyPropertiesAction" scope="prototype"
+               parent="displayStudyStepAction">
+       </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" />
+               <property name="scenarioService" ref="scenarioService" />
+       </bean>
+
+       <bean id="editSimulationContextAction"
+               class="org.splat.simer.EditSimulationContextAction" scope="prototype"
+               parent="displayStudyStepAction">
+               <property name="stepService" ref="stepService" />
+       </bean>
+
+       <bean id="editDocumentAction"
+               class="org.splat.simer.EditDocumentAction" scope="prototype"
+               parent="displayStudyStepAction">
+               <property name="publicationService" ref="publicationService" />
        </bean>
 
+       <bean id="editKnowledgeElementAction"
+               class="org.splat.simer.EditKnowledgeElementAction" scope="prototype"
+               parent="displayStudyStepAction">
+               <property name="knowledgeElementService"
+                       ref="knowledgeElementService" />
+               <property name="scenarioService" ref="scenarioService" />
+       </bean>
+
+    <!-- End of Inherited from displayStudyStepAction -->
+    
        <bean id="startAction" class="org.splat.simer.StartAction"
                scope="prototype">
                <property name="applicationSettings" ref="applicationSettings" />
@@ -81,22 +124,12 @@ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
                class="org.splat.simer.SearchDocumentAction" scope="prototype">
        </bean>
 
-       <bean id="studyPropertiesAction"
-               class="org.splat.simer.StudyPropertiesAction" scope="prototype">
-               <property name="studyService" ref="studyService" />
-       </bean>
-
        <bean id="displayKnowledgeAction"
                class="org.splat.simer.DisplayKnowledgeAction" scope="prototype">
                <property name="knowledgeElementService"
                        ref="knowledgeElementService" />
        </bean>
 
-       <bean id="editStudyAction" class="org.splat.simer.EditStudyAction"
-               scope="prototype">
-               <property name="studyService" ref="studyService" />
-       </bean>
-
        <bean id="newScenarioAction"
                class="org.splat.simer.NewScenarioAction" scope="prototype">
                <property name="projectElementService"
@@ -104,21 +137,6 @@ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
                <property name="studyService" ref="studyService" />
        </bean>
 
-       <bean id="editScenarioPropertiesAction"
-               class="org.splat.simer.EditScenarioPropertiesAction"
-               scope="prototype">
-               <property name="projectElementService"
-                       ref="projectElementService" />
-               <property name="scenarioService" ref="scenarioService" />
-       </bean>
-
-       <bean id="editSimulationContextAction"
-               class="org.splat.simer.EditSimulationContextAction"
-               scope="prototype">
-               <property name="stepService" ref="stepService" />
-               <property name="studyService" ref="studyService" />
-       </bean>
-
        <bean id="uploadAction" class="org.splat.simer.UploadAction"
                scope="prototype">
        </bean>
@@ -137,19 +155,6 @@ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
                <property name="stepService" ref="stepService" />
        </bean>
 
-       <bean id="editDocumentAction"
-               class="org.splat.simer.EditDocumentAction" scope="prototype">
-               <property name="publicationService" ref="publicationService" />
-       </bean>
-
-       <bean id="editKnowledgeElementAction"
-               class="org.splat.simer.EditKnowledgeElementAction"
-               scope="prototype" parent="baseAction">
-               <property name="knowledgeElementService"
-                       ref="knowledgeElementService" />
-               <property name="scenarioService" ref="scenarioService" />
-       </bean>
-
        <bean id="databaseIndexingAction"
                class="org.splat.simer.admin.DatabaseIndexingAction"
                scope="prototype">