X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Workspace%2FSiman%2Fsrc%2Fspring%2FapplicationContext.xml;h=d1a62f4567f05aa2874e70a5e7b1d207c1a6c522;hb=d0f7e95389f08ff3dfec5961d9f19866e0ee956b;hp=41894a0a159402873724c3342501e7e031b9db5b;hpb=e5491020359473ec71699f297cd55b547f4f6b19;p=tools%2Fsiman.git

diff --git a/Workspace/Siman/src/spring/applicationContext.xml b/Workspace/Siman/src/spring/applicationContext.xml
index 41894a0..d1a62f4 100644
--- a/Workspace/Siman/src/spring/applicationContext.xml
+++ b/Workspace/Siman/src/spring/applicationContext.xml
@@ -25,24 +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>
+				<value>som</value>
+				<value>labels</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="menuBarSettings"
-		class="org.splat.simer.MenuBarSettings" scope="session">
+
+	<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 id="titleBarSettings" class="org.splat.simer.TitleBarSettings"
+		scope="session" />
+
+	<bean id="toolBarSettings" class="org.splat.simer.ToolBarSettings"
+		scope="session" />
+
+	<bean id="leftMenuSettings" class="org.splat.simer.LeftMenuSettings"
+		scope="session" />
+
 	<bean id="slidMenu" scope="session" abstract="true">
 		<property name="projectElementService"
 			ref="projectElementService" />
@@ -56,19 +73,20 @@ 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" />
 		<property name="knowledgeElementTypeService"
 			ref="knowledgeElementTypeService" />
+		<property name="publicationService" ref="publicationService" />
 	</bean>
 
 	<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" />
@@ -78,14 +96,20 @@ 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="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 ========= -->
@@ -97,6 +121,12 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 		<property name="scenarioService" ref="scenarioService" />
 	</bean>
 
+	<bean id="copyStudyAction" class="org.splat.simer.CopyStudyAction"
+		parent="newStudyAction" scope="prototype">
+        <property name="searchService" ref="searchService" />
+        <property name="stepsConfigService" ref="stepsConfigService" />
+	</bean>
+
 	<bean id="newScenarioAction"
 		class="org.splat.simer.NewScenarioAction" parent="baseAction"
 		scope="prototype">
@@ -106,15 +136,21 @@ 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">
+		<property name="studyService" ref="studyService" />
 		<property name="stepService" ref="stepService" />
 		<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"
@@ -123,6 +159,12 @@ 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>
+
 	<!--========= Inherited from displayStudyStepAction ========= -->
 
 	<bean id="studyPropertiesAction"
@@ -133,8 +175,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 	</bean>
 
 	<bean id="editStudyAction" class="org.splat.simer.EditStudyAction"
-		scope="prototype" parent="displayStudyStepAction">
-	</bean>
+		scope="prototype" parent="displayStudyStepAction" />
 
 	<bean id="editScenarioPropertiesAction"
 		class="org.splat.simer.EditScenarioPropertiesAction" scope="prototype"
@@ -148,10 +189,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"
@@ -172,30 +213,41 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 		<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 id="CompareStudyAction"
+		class="org.splat.simer.CompareStudyAction" scope="prototype"
+		parent="displayStudyStepAction">
+		<property name="publicationService" ref="publicationService" />
+	</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">
-	</bean>
+		scope="prototype" parent="baseAction" />
 
 	<bean id="notYetImplementedAction"
-		class="org.splat.simer.NotYetImplementedAction" 
-		scope="prototype" parent ="baseAction">
-	</bean>
+		class="org.splat.simer.NotYetImplementedAction" scope="prototype"
+		parent="baseAction" />
 
 	<bean id="searchStudyAction"
-		class="org.splat.simer.SearchStudyAction" 
-		scope="prototype" parent ="baseAction">
-		<property name="projectSettings" ref="projectSettings" />
+		class="org.splat.simer.SearchStudyAction" scope="prototype"
+		parent="baseAction">
+		<property name="stepsConfigService" ref="stepsConfigService" />
 		<property name="searchService" ref="searchService" />
 		<property name="simulationContextService"
 			ref="simulationContextService" />
@@ -203,8 +255,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 	</bean>
 
 	<bean id="searchKnowledgeAction"
-		class="org.splat.simer.SearchKnowledgeAction" 
-		scope="prototype" parent ="baseAction">
+		class="org.splat.simer.SearchKnowledgeAction" scope="prototype"
+		parent="baseAction">
 		<property name="searchService" ref="searchService" />
 		<property name="simulationContextService"
 			ref="simulationContextService" />
@@ -214,50 +266,50 @@ 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"  parent ="baseAction">
+		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" parent ="baseAction">
+		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="uploadStudyAction"
+		class="org.splat.simer.UploadStudyAction" scope="prototype"
+		parent="baseAction" />
 
 	<bean id="versionDocumentAction"
-		class="org.splat.simer.VersionDocumentAction" 
-		scope="prototype" parent ="baseAction">
+		class="org.splat.simer.VersionDocumentAction" scope="prototype"
+		parent="baseAction">
 		<property name="projectSettings" ref="projectSettings" />
 		<property name="publicationService" ref="publicationService" />
 		<property name="stepService" ref="stepService" />
+		<property name="studyService" ref="studyService" />
 		<property name="repositoryService" ref="repositoryService" />
 	</bean>
 
 	<bean id="databaseIndexingAction"
-		class="org.splat.simer.admin.DatabaseIndexingAction"
-		scope="prototype" parent ="baseAction">
+		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" parent="baseAction">
+		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" />
@@ -268,18 +320,6 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
 	<bean id="knowledgeElementAction"
 		class="org.splat.simer.admin.KnowledgeElementAction"
-		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>
+		scope="prototype" />
 
 </beans>