The bug related to the end of session is fixed. redirectOnEndOfSession interceptor...

[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 c7f34a55ecfb26c90725e2eaf70923668bf7d15d..ade8fa1a9f1dbbb9ccca041e2644afcf568ac5f9 100644 (file)
--- a/Workspace/Siman/src/spring/applicationContext.xml
+++ b/Workspace/Siman/src/spring/applicationContext.xml
@@ -25,23 +25,41 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                class="org.springframework.context.support.ResourceBundleMessageSource">
                <property name="basenames">
                        <list>
-                               <value>application</value>
-                               <value>log-messages</value>
+                               <value>conf/log-messages</value>
                        </list>
                </property>
        </bean>
        <!-- ref 'baseMessageSource' into Siman-common\src\spring\globalContext.xml -->
        <!-- property name="parentMessageSource" ref="baseMessageSource"/ -->
 
+       <bean id="exceptionAction" class="org.splat.simer.ExceptionAction"
+               scope="prototype" />
+
        <bean id="applicationSettings"
-               class="org.splat.simer.ApplicationSettings" factory-method="getMe">
+               class="org.splat.simer.ApplicationSettings" scope="session">
                <property name="projectSettings" ref="projectSettings" />
                <property name="documentTypeService" ref="documentTypeService" />
        </bean>
 
-       <bean id="importedStudy" class="org.splat.simer.admin.ImportedStudy"
-               scope="prototype">
-               <property name="searchService" ref="searchService" />
+       <bean id="redirectOnEndOfSessionInterceptor"
+               class="org.splat.simer.SimanRedirectOnEndOfSessionInterceptor">
+               <property name="globalResult" value="home" />
+       </bean>
+
+       <bean id="menuBarSettings" class="org.splat.simer.MenuBarSettings"
+               scope="session">
+       </bean>
+
+       <bean id="titleBarSettings" class="org.splat.simer.TitleBarSettings"
+               scope="session">
+       </bean>
+
+       <bean id="toolBarSettings" class="org.splat.simer.ToolBarSettings"
+               scope="session">
+       </bean>
+
+       <bean id="leftMenuSettings" class="org.splat.simer.LeftMenuSettings"
+               scope="session">
        </bean>
 
        <bean id="slidMenu" scope="session" abstract="true">
@@ -57,7 +75,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                scope="session" parent="slidMenu" />
 
        <bean id="openObject" abstract="true"
-               class="org.splat.simer.OpenObject" scope="session">
+               class="org.splat.simer.AbstractOpenObject" scope="session">
+               <property name="applicationSettings" ref="applicationSettings" />
                <property name="projectElementService"
                        ref="projectElementService" />
                <property name="projectSettings" ref="projectSettings" />
@@ -82,10 +101,17 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                parent="openObject" scope="session">
        </bean>
 
-       <bean id="baseAction" class="org.splat.simer.Action"
+    <bean id="invalidateAction" class="org.splat.simer.InvalidateAction"/>
+    
+    <bean id="baseAction" class="org.splat.simer.Action"
                scope="prototype" abstract="true">
+               <property name="applicationSettings" ref="applicationSettings" />
                <property name="openStudy" ref="openStudy" />
                <property name="openKnowledge" ref="openKnowledge" />
+               <property name="menuBarSettings" ref="menuBarSettings" />
+               <property name="titleBarSettings" ref="titleBarSettings" />
+               <property name="toolBarSettings" ref="toolBarSettings" />
+               <property name="leftMenuSettings" ref="leftMenuSettings" />
        </bean>
 
        <!--========= Inherited from baseAction ========= -->
@@ -95,7 +121,6 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="simulationContextService"
                        ref="simulationContextService" />
                <property name="scenarioService" ref="scenarioService" />
-               <property name="studyService" ref="studyService" />
        </bean>
 
        <bean id="newScenarioAction"
@@ -107,6 +132,11 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="menu" ref="newScenarioMenu" />
        </bean>
 
+       <bean id="checkoutAction" class="org.splat.simer.CheckoutAction"
+               scope="prototype">
+               <property name="scenarioService" ref="scenarioService" />
+       </bean>
+
        <bean id="importDocumentAction"
                class="org.splat.simer.ImportDocumentAction" scope="prototype"
                parent="baseAction">
@@ -114,8 +144,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="projectSettings" ref="projectSettings" />
                <property name="publicationService" ref="publicationService" />
                <property name="repositoryService" ref="repositoryService" />
-        <property name="documentService" ref="documentService" />
-        <property name="documentTypeService" ref="documentTypeService" />
+               <property name="documentService" ref="documentService" />
+               <property name="documentTypeService" ref="documentTypeService" />
        </bean>
 
        <bean id="displayStudyStepAction"
@@ -149,10 +179,10 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                class="org.splat.simer.EditSimulationContextAction" scope="prototype"
                parent="displayStudyStepAction">
                <property name="stepService" ref="stepService" />
-        <property name="simulationContextService"
-            ref="simulationContextService" />
-        <property name="simulationContextTypeService"
-            ref="simulationContextTypeService" />
+               <property name="simulationContextService"
+                       ref="simulationContextService" />
+               <property name="simulationContextTypeService"
+                       ref="simulationContextTypeService" />
        </bean>
 
        <bean id="editDocumentAction"
@@ -176,24 +206,26 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        <!-- End of Inherited from displayStudyStepAction -->
 
        <bean id="startAction" class="org.splat.simer.StartAction"
-               scope="prototype">
+               scope="prototype" parent="baseAction">
                <property name="applicationSettings" ref="applicationSettings" />
                <property name="projectSettings" ref="projectSettings" />
        </bean>
        <bean id="connectionAction" class="org.splat.simer.ConnectionAction"
-               scope="prototype">
+               scope="prototype" parent="baseAction">
        </bean>
 
        <bean id="menuAction" class="org.splat.simer.MenuAction"
-               scope="prototype">
+               scope="prototype" parent="baseAction">
        </bean>
 
        <bean id="notYetImplementedAction"
-               class="org.splat.simer.NotYetImplementedAction" scope="prototype">
+               class="org.splat.simer.NotYetImplementedAction" scope="prototype"
+               parent="baseAction">
        </bean>
 
        <bean id="searchStudyAction"
-               class="org.splat.simer.SearchStudyAction" scope="prototype">
+               class="org.splat.simer.SearchStudyAction" scope="prototype"
+               parent="baseAction">
                <property name="projectSettings" ref="projectSettings" />
                <property name="searchService" ref="searchService" />
                <property name="simulationContextService"
@@ -202,7 +234,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        </bean>
 
        <bean id="searchKnowledgeAction"
-               class="org.splat.simer.SearchKnowledgeAction" scope="prototype">
+               class="org.splat.simer.SearchKnowledgeAction" scope="prototype"
+               parent="baseAction">
                <property name="searchService" ref="searchService" />
                <property name="simulationContextService"
                        ref="simulationContextService" />
@@ -216,18 +249,25 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        </bean>
 
        <bean id="displayKnowledgeAction"
-               class="org.splat.simer.DisplayKnowledgeAction" scope="prototype">
+               class="org.splat.simer.DisplayKnowledgeAction" scope="prototype"
+               parent="baseAction">
                <property name="knowledgeElementService"
                        ref="knowledgeElementService" />
        </bean>
 
        <bean id="uploadAction" class="org.splat.simer.UploadAction"
-               scope="prototype">
+               scope="prototype" parent="baseAction">
                <property name="repositoryService" ref="repositoryService" />
        </bean>
 
+       <bean id="uploadStudyAction"
+               class="org.splat.simer.UploadStudyAction" scope="prototype"
+               parent="baseAction">
+       </bean>
+
        <bean id="versionDocumentAction"
-               class="org.splat.simer.VersionDocumentAction" scope="prototype">
+               class="org.splat.simer.VersionDocumentAction" scope="prototype"
+               parent="baseAction">
                <property name="projectSettings" ref="projectSettings" />
                <property name="publicationService" ref="publicationService" />
                <property name="stepService" ref="stepService" />
@@ -235,21 +275,21 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        </bean>
 
        <bean id="databaseIndexingAction"
-               class="org.splat.simer.admin.DatabaseIndexingAction"
-               scope="prototype">
-               <property name="importedStudy" ref="importedStudy" />
+               class="org.splat.simer.admin.DatabaseIndexingAction" scope="prototype"
+               parent="baseAction">
                <property name="searchService" ref="searchService" />
        </bean>
 
        <bean id="importUserAction"
-               class="org.splat.simer.admin.ImportUserAction" scope="prototype">
+               class="org.splat.simer.admin.ImportUserAction" scope="prototype"
+               parent="baseAction">
                <property name="repositoryService" ref="repositoryService" />
                <property name="userService" ref="userService" />
        </bean>
 
        <bean id="simulationContextAction"
                class="org.splat.simer.admin.SimulationContextAction"
-               scope="prototype">
+               scope="prototype" parent="baseAction">
                <property name="knowledgeElementService"
                        ref="knowledgeElementService" />
                <property name="searchService" ref="searchService" />
@@ -263,15 +303,4 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                scope="prototype">
        </bean>
 
-       <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" />
-       </bean>
-
 </beans>