Refactoring of Database, replacing SQL by DAOs calls. Methods for search by criteria...

[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 16e6b0a4d3b27881d7240c5dd44759a9cc5cc825..ad3192f2f21a9d87d008fee9822407b168161240 100644 (file)
--- a/Workspace/Siman/src/spring/applicationContext.xml
+++ b/Workspace/Siman/src/spring/applicationContext.xml
@@ -2,7 +2,7 @@
 <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:context="http://www.springframework.org/schema/context"
+       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
 http://www.springframework.org/schema/aop  
@@ -10,14 +10,13 @@ http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
 http://www.springframework.org/schema/context
 http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-           
-    <context:property-placeholder
-        location="classpath:siman.properties,classpath:jdbc.properties"
-        ignore-unresolvable="true" />
 
-       <!-- configuration i18n -->
-       <bean id="i18nUtils"
-               class="org.splat.i18n.I18nUtils">
+       <context:property-placeholder
+               location="classpath:siman.properties,classpath:jdbc.properties"
+               ignore-unresolvable="true" />
+
+       <!-- configuration i18n -->
+       <bean id="i18nUtils" class="org.splat.i18n.I18nUtils">
                <property name="resourceBundleMessageSource"
                        ref="messageSource" />
        </bean>
@@ -31,10 +30,10 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                        </list>
                </property>
        </bean>
-    <!-- ref 'baseMessageSource' into Siman-common\src\spring\globalContext.xml -->
+       <!-- ref 'baseMessageSource' into Siman-common\src\spring\globalContext.xml -->
        <!-- property name="parentMessageSource" ref="baseMessageSource"/-->
-       
-               <bean id="applicationSettings"
+
+       <bean id="applicationSettings"
                class="org.splat.simer.ApplicationSettings">
                <property name="projectSettings" ref="projectSettings" />
        </bean>
@@ -50,6 +49,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="publicationService" ref="publicationService" />
                <property name="scenarioService" ref="scenarioService" />
                <property name="stepService" ref="stepService" />
+               <property name="repositoryService" ref="repositoryService" />
        </bean>
 
        <bean id="openKnowledge" class="org.splat.simer.OpenKnowledge"
@@ -65,12 +65,14 @@ http://www.springframework.org/schema/context/spring-context-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>
+       <!--========= Inherited from baseAction =========-->
+
+       <bean id="newStudyAction" class="org.splat.simer.NewStudyAction"
+               parent="baseAction" scope="prototype">
+               <property name="simulationContextService"
+                       ref="simulationContextService" />
+               <property name="studyService" ref="studyService" />
+       </bean>
 
        <bean id="displayStudyStepAction"
                class="org.splat.simer.DisplayStudyStepAction" parent="baseAction"
@@ -78,8 +80,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="studyService" ref="studyService" />
        </bean>
 
-    <!--========= Inherited from displayStudyStepAction =========-->
-    
+       <!--========= Inherited from displayStudyStepAction =========-->
+
        <bean id="studyPropertiesAction"
                class="org.splat.simer.StudyPropertiesAction" scope="prototype"
                parent="displayStudyStepAction">
@@ -101,12 +103,15 @@ 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" />
        </bean>
 
        <bean id="editDocumentAction"
                class="org.splat.simer.EditDocumentAction" scope="prototype"
                parent="displayStudyStepAction">
                <property name="publicationService" ref="publicationService" />
+               <property name="repositoryService" ref="repositoryService" />
        </bean>
 
        <bean id="editKnowledgeElementAction"
@@ -117,8 +122,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="scenarioService" ref="scenarioService" />
        </bean>
 
-    <!-- End of Inherited from displayStudyStepAction -->
-    
+       <!-- End of Inherited from displayStudyStepAction -->
+
        <bean id="startAction" class="org.splat.simer.StartAction"
                scope="prototype">
                <property name="applicationSettings" ref="applicationSettings" />
@@ -140,11 +145,15 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                class="org.splat.simer.SearchStudyAction" scope="prototype">
                <property name="projectSettings" ref="projectSettings" />
                <property name="searchService" ref="searchService" />
+               <property name="simulationContextService"
+                       ref="simulationContextService" />
        </bean>
 
        <bean id="searchKnowledgeAction"
                class="org.splat.simer.SearchKnowledgeAction" scope="prototype">
                <property name="searchService" ref="searchService" />
+               <property name="simulationContextService"
+                       ref="simulationContextService" />
        </bean>
 
        <bean id="searchDocumentAction"
@@ -166,6 +175,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
        <bean id="uploadAction" class="org.splat.simer.UploadAction"
                scope="prototype">
+               <property name="repositoryService" ref="repositoryService" />
        </bean>
 
        <bean id="importDocumentAction"
@@ -173,6 +183,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="stepService" ref="stepService" />
                <property name="projectSettings" ref="projectSettings" />
                <property name="publicationService" ref="publicationService" />
+               <property name="repositoryService" ref="repositoryService" />
        </bean>
 
        <bean id="versionDocumentAction"
@@ -180,6 +191,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="repositoryService" ref="repositoryService" />
        </bean>
 
        <bean id="databaseIndexingAction"
@@ -192,6 +204,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
        <bean id="importUserAction"
                class="org.splat.simer.admin.ImportUserAction" scope="prototype">
+               <property name="repositoryService" ref="repositoryService" />
        </bean>
 
        <bean id="simulationContextAction"
@@ -201,6 +214,8 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                        ref="knowledgeElementService" />
                <property name="searchService" ref="searchService" />
                <property name="projectSettings" ref="projectSettings" />
+               <property name="simulationContextService"
+                       ref="simulationContextService" />
        </bean>
 
        <bean id="knowledgeElementAction"
@@ -211,8 +226,11 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        <bean id="saveDocumentAction"
                class="org.splat.module.SaveDocumentAction" scope="prototype">
                <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>