Menus are improved

[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 e23007a57e4c9bd09148bbfe40d8447a7813a36d..78dd1492c651e099d60b9421eb39d9513e1be5c4 100644 (file)
--- a/Workspace/Siman/src/spring/applicationContext.xml
+++ b/Workspace/Siman/src/spring/applicationContext.xml
@@ -38,6 +38,10 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                <property name="projectSettings" ref="projectSettings" />
                <property name="documentTypeService" ref="documentTypeService" />
        </bean>
+       
+       <bean id="menuBarSettings"
+               class="org.splat.simer.MenuBarSettings" scope="session">
+       </bean>
 
        <bean id="slidMenu" scope="session" abstract="true">
                <property name="projectElementService"
@@ -81,6 +85,7 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
                scope="prototype" abstract="true">
                <property name="openStudy" ref="openStudy" />
                <property name="openKnowledge" ref="openKnowledge" />
+               <property name="menuBarSettings" ref="menuBarSettings" />
        </bean>
 
        <!--========= Inherited from baseAction ========= -->
@@ -171,12 +176,12 @@ 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"
@@ -184,11 +189,13 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
        </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"
@@ -197,7 +204,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" />
@@ -211,18 +219,24 @@ 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" />
@@ -231,12 +245,13 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
        <bean id="databaseIndexingAction"
                class="org.splat.simer.admin.DatabaseIndexingAction"
-               scope="prototype">
+               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>