Actions menu properties are refactored, unnecessary code is removed.

[tools/siman.git] / Workspace / Siman / src / struts.xml

diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index 65f7873257f33127f5c323274d8569d82708be0c..bc90fe82e5e54ef260427a2b0ff3259e81f7d34e 100644 (file)
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -8,36 +8,42 @@
        <constant name="struts.objectFactory" value="spring" />
     <constant name="struts.enable.DynamicMethodInvocation" value="false" />
     <constant name="struts.devMode" value="true" />
-    <constant name="struts.custom.i18n.resources" value="labels,som" />
+    <constant name="struts.custom.i18n.resources" value="log-messages,labels,som" />
     <constant name="struts.i18n.encoding" value="ISO-8859-1" />
+    <constant name="struts.multipart.maxSize" value="100485760" />
 
     <package name="simer-default" namespace="/" extends="struts-default">
     </package>
 
     <package name="default" namespace="/" extends="simer-default">
+       
+       <result-types>
+               <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
+       </result-types>
 
         <default-action-ref name="index" />
 
         <action name="index" class="startAction" method="initialize">
-            <result name="success">/welcome.jsp</result>
-            <result name="error">/error.jsp?error=initialization</result>
+            <result name="success" type="tiles">page.welcome</result>
+            <result name="error" type="tiles">page.exception</result>
         </action>        
         <action name="login" class="connectionAction" method="login">
-            <result name="none">/home.jsp</result>
+            <result name="none" type="tiles">page.home</result>
             <result name="open"      type="redirectAction">select?menu=search</result>
             <result name="study"     type="redirectAction">study/step-study</result>
             <result name="knowledge" type="redirectAction">study/step-knowledge</result>
-            <result name="input">/login.jsp</result>
-            <result name="error">/home.jsp?error=login</result>
+            <!--result name="input">/login.jsp</result-->
+            <result name="input" type="tiles">page.login</result>
+            <result name="error" type="tiles">page.home</result>
         </action>
         <action name="logout" class="connectionAction" method="logout">
-            <result name="none">/home.jsp</result>
-            <result name="create">/home.jsp</result>
+            <result name="none" type="tiles">page.home</result>
+            <result name="create" type="tiles">page.home</result>
             <result name="open"      type="redirectAction">select?menu=search</result>
             <result name="study"     type="redirectAction">study/step-study</result>
             <result name="knowledge" type="redirectAction">study/step-knowledge</result>
-            <result name="datadmin">/home.jsp</result>
-            <result name="sysadmin">/home.jsp</result>
+            <result name="datadmin" type="tiles">page.home</result>
+            <result name="sysadmin" type="tiles">page.home</result>
         </action>
         <action name="select" class="menuAction" method="selectItem">
             <result name="new-empty"        type="redirectAction">study/new-empty</result>
@@ -50,48 +56,57 @@
             <result name="admin-importuser" type="redirectAction">sadmin/select-file?nextAction=importuser</result>
             <result name="admin-scontext"   type="redirectAction">sadmin/scontext</result>
             <result name="admin-knowelm"    type="redirectAction">sadmin/knowlelm</result>
-            <result name="none">/menu.jsp?menu=%{menu}</result>
+            <!-- If no menu item is selected then go to home page -->
+            <result name="none" type="tiles">page.home</result>
         </action>
 
     </package>
 
     <package name="study" namespace="/study" extends="simer-default">
+    
+        <result-types>
+               <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
+       </result-types>
 
         <action name="notyetimplemented" class="notYetImplementedAction" method="initialize">
-            <result name="success">/study/error.jsp?message=notyetimplemented</result>
+            <result name="success" type="tiles">page.error.study</result>
+        </action>
+
+        <action name="checkout" class="checkoutAction" method="checkout">
+            <result name="success">/study/jsonCheckoutRes.jsp</result>
         </action>
 
         <!-- Creation of a study
           -->        
         <action name="new-empty" class="newStudyAction" method="initialize">
-            <result name="success">/study/newStudy.jsp</result>
+            <result name="success" type="tiles">page.newstudy</result>
         </action>
         <action name="valid-new" class="newStudyAction" method="create">
             <result name="success" type="redirectAction">open-study?selection=0.1</result>
-            <result name="input">/study/newStudy.jsp</result>
-            <result name="error">/home.jsp?error=newstudy</result>
+            <result name="input" type="tiles">page.newstudy</result>
+            <result name="error" type="tiles">page.home</result>
         </action>
 
         <!-- Search for studies, knowledge elements and documents
           -->
         <action name="search-study" class="searchStudyAction" method="initialize">
-            <result name="success">/study/searchStudy.jsp</result>
-            <result name="error">/home.jsp</result>
+            <result name="success" type="tiles">page.searchstudy</result>
+            <result name="error" type="tiles">page.home</result>
         </action>
         <action name="refresh-study" class="searchStudyAction" method="submitForm">
-            <result name="selectype">/study/searchStudy.jsp?action=setContext</result>
-            <result name="refresh">/study/searchStudy.jsp</result>
-            <result name="wait">/study/searchStudy.jsp</result>
+            <result name="selectype" type="tiles">page.searchstudy</result>
+            <result name="refresh" type="tiles">page.searchstudy</result>
+            <result name="wait" type="tiles">page.searchstudy</result>
             <result name="error" type="redirectAction">search-study</result>
         </action>
 
         <action name="search-knowledge" class="searchKnowledgeAction" method="initialize">
-            <result name="success">/study/searchKnowledge.jsp</result>
+            <result name="success" type="tiles">page.searchknowledge</result>
         </action>
         <action name="refresh-knowledge" class="searchKnowledgeAction" method="submitForm">
-            <result name="selectype">/study/searchKnowledge.jsp?action=setContext</result>
-            <result name="refresh">/study/searchKnowledge.jsp</result>
-            <result name="wait">/study/searchKnowledge.jsp</result>
+            <result name="selectype" type="tiles">page.searchknowledge</result>
+            <result name="refresh" type="tiles">page.searchknowledge</result>
+            <result name="wait" type="tiles">page.searchknowledge</result>
             <result name="error" type="redirectAction">search-knowledge</result>
         </action>
 
@@ -102,187 +117,199 @@
         <!-- Display of studies
           -->
         <action name="open-study" class="displayStudyStepAction" method="open">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="step-study" class="displayStudyStepAction" method="selectStep">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="document-study" class="displayStudyStepAction" method="selectDocument">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="knowledge-study" class="displayStudyStepAction" method="selectKnowledge">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="close-study" class="displayStudyStepAction" method="close">
-            <result name="success">/home.jsp</result>
+            <result name="success" type="tiles">page.home</result>
         </action>
         <action name="prop-study" class="studyPropertiesAction" method="initialize">
-            <result name="display">/study/displayStudyProperties.jsp</result>
-            <result name="edit">/study/editStudyProperties.jsp</result>
+            <result name="display" type="tiles">page.displaystudyproperties</result>
+            <result name="edit" type="tiles">page.editstudyproperties</result>
         </action>
 
         <!-- Display of knowledge elements
           -->        
         <action name="open-knowledge" class="displayKnowledgeAction" method="open">
-            <result name="success">/study/displayKnowledge.jsp</result>
+            <result name="success" type="tiles">page.displayknowledge</result>
         </action>
         <action name="step-knowledge" class="displayKnowledgeAction" method="selectStep">
-            <result name="success">/study/displayKnowledge.jsp</result>
+            <result name="success" type="tiles">page.displayknowledge</result>
         </action>
         <action name="document-knowledge" class="displayKnowledgeAction" method="selectDocument">
-            <result name="success">/study/displayKnowledge.jsp</result>
+            <result name="success" type="tiles">page.displayknowledge</result>
         </action>
         <action name="knowledge-knowledge" class="displayKnowledgeAction" method="selectKnowledge">
-            <result name="success">/study/displayKnowledge.jsp</result>
+            <result name="success" type="tiles">page.displayknowledge</result>
         </action>
         <action name="close-knowledge" class="displayKnowledgeAction" method="close">
-            <result name="success">/home.jsp</result>
+            <result name="success" type="tiles">page.home</result>
         </action>
 
         <!-- Edition of study
           -->        
         <action name="edit-study" class="editStudyAction" method="edition">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="add-scenario" class="newScenarioAction" method="initialize">
-            <result name="success">/study/newScenario.jsp?init=focus</result>
+            <result name="success" type="tiles">page.newscenario</result>
         </action>
         <action name="edit-title" class="studyPropertiesAction" method="editTitle">
-            <result name="success">/study/editStudyProperties.jsp?action=edititle</result>
+            <result name="success" type="tiles">page.editstudyproperties</result>
         </action>
         <action name="edit-contributor" class="studyPropertiesAction" method="editContributors">
-            <result name="success">/study/editStudyProperties.jsp?action=edibutor</result>
+            <result name="success" type="tiles">page.editstudyproperties</result>
         </action>
         <action name="edit-cycle" class="studyPropertiesAction" method="editCycle">
-            <result name="success">/study/editStudyProperties.jsp?action=edicycle</result>
+            <result name="success" type="tiles">page.editstudyproperties</result>
         </action>
         <action name="select-step" class="newScenarioAction" method="selectStep">
-            <result name="success">/study/newScenario.jsp</result>
+            <result name="success" type="tiles">page.newscenario</result>
         </action>
         <action name="valid-add" class="newScenarioAction" method="create">
             <result name="cancel"  type="redirectAction">step-study</result>
             <result name="success" type="redirectAction">step-study</result>
-           <result name="error">/study/displayStudyStep.jsp?error=addScenario</result>
+           <result name="error" type="tiles">page.displaystudy</result>
         </action>
         <action name="valid-edit" class="studyPropertiesAction" method="edition">
-            <result name="success">/study/editStudyProperties.jsp</result>
+            <result name="success" type="tiles">page.editstudyproperties</result>
         </action>
         <action name="prop-scenario" class="editScenarioPropertiesAction" method="initialize">
-            <result name="success">/study/editScenarioProperties.jsp</result>
+            <result name="success" type="tiles">page.editscenarioproperties</result>
         </action>
 
         <!-- Edition of scenario
           -->
         <action name="checkin-scenario" class="editScenarioPropertiesAction" method="checkin">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
 
         <!-- Edition of simulation contexts
           -->        
         <action name="add-context" class="editSimulationContextAction" method="initialize">
-            <result name="create">/study/displayStudyStep.jsp?action=newContext</result>
-            <result name="select">/study/displayStudyStep.jsp?action=selectContext</result>
+            <result name="create" type="tiles">page.newcontext</result>
+            <result name="select" type="tiles">page.selectcontext</result>
         </action>
         <action name="selectContext" class="editSimulationContextAction" method="selectContext">
-            <result name="create">/study/displayStudyStep.jsp?action=newContext</result>
-            <result name="set">/study/displayStudyStep.jsp?action=setContext&amp;index=%{contextType.index}</result>
+            <result name="create" type="tiles">page.newcontext</result>
+            <result name="set"    type="tiles">page.setcontext</result>
         </action>
         <action name="newContext" class="editSimulationContextAction" method="createContext">
-            <result name="success">/study/displayStudyStep.jsp</result>
-            <result name="input">/study/displayStudyStep.jsp?action=newContext</result>
-            <result name="error">/study/displayStudyStep.jsp?error=addContext</result>
+            <result name="success" type="tiles">page.displaystudy</result>
+            <result name="input" type="tiles">page.newcontext</result>
+            <result name="error" type="tiles">page.displaystudy</result>
         </action>
         <action name="setContext" class="editSimulationContextAction" method="setContext">
-            <result name="success">/study/displayStudyStep.jsp</result>
-            <result name="input">/study/displayStudyStep.jsp?action=setContext&amp;index=%{contextType.index}</result>
-            <result name="error">/study/displayStudyStep.jsp?error=addContext</result>
+            <result name="success" type="tiles">page.displaystudy</result>
+            <result name="input" type="tiles">page.setcontext</result>
+            <result name="error" type="tiles">page.displaystudy</result>
         </action>
         <action name="remove-context" class="editSimulationContextAction" method="deleteContext">
-            <result name="success">/study/displayStudyStep.jsp</result>
-            <result name="error">/study/displayStudyStep.jsp?error=removeContext</result>
+            <result name="success" type="tiles">page.displaystudy</result>
+            <result name="error" type="tiles">page.displaystudy</result>
         </action>
 
         <!-- Edition of documents
           -->
         <action name="select-file" class="uploadAction" method="initialize">
-            <result name="success">/study/upload.jsp</result>
+            <result name="success" type="tiles">page.uploadstudy</result>
         </action>
         <action name="upload" class="uploadAction" method="upload">
             <result name="cancel"  type="redirectAction">step-study</result>
             <result name="import"  type="redirectAction">import-document?fileName=%{fileName}</result>
             <result name="version" type="redirectAction">version-document?index=%{index}&amp;fileName=%{fileName}</result>
             <result name="attach"  type="redirectAction">attach-document?index=%{index}&amp;fileName=%{fileName}</result>
-            <result name="outofmemory">/study/error.jsp?message=outofmemory</result>
+            <result name="outofmemory" type="tiles">page.error.study</result>
         </action>
         <action name="import-document" class="importDocumentAction" method="initialize">
-            <result name="success">/study/importDocument.jsp</result>
-            <result name="error">/study/importError.jsp?message=%{errorCode}</result>
+            <result name="success" type="tiles">page.importdocument</result>
+            <result name="error" type="tiles">page.importerror</result>
         </action>
         <action name="valid-import" class="importDocumentAction" method="import">
             <result name="success" type="redirectAction">step-study</result>
             <result name="cancel"  type="redirectAction">step-study</result>
-            <result name="error">/study/importError.jsp?message=%{errorCode}&amp;action=back</result>
+            <result name="error" type="tiles">page.importerror</result>
         </action>
         <action name="version-document" class="versionDocumentAction" method="initialize">
-            <result name="success">/study/versionDocument.jsp</result>
-            <result name="error">/study/importError.jsp?message=%{errorCode}</result>
+            <result name="success" type="tiles">page.versiondocument</result>
+            <result name="error" type="tiles">page.importerror</result>
         </action>
         <action name="valid-version" class="versionDocumentAction" method="version">
             <result name="success" type="redirectAction">step-study</result>
             <result name="cancel"  type="redirectAction">step-study</result>
-            <result name="error">/study/importError.jsp?message=%{errorCode}&amp;action=back</result>
+            <result name="error" type="tiles">page.importerror</result>
         </action>
         <action name="attach-document" class="editDocumentAction" method="attach">
-            <result name="success">/study/displayStudyStep.jsp?action=display</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="edit-document" class="editDocumentAction" method="initialize">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="setDocument" class="editDocumentAction" method="setDocument">
-            <result name="success">/study/displayStudyStep.jsp?action=display</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="remove-document" class="editDocumentAction" method="deleteDocument">
-            <result name="success">/study/displayStudyStep.jsp</result>
-            <result name="error">/study/displayStudyStep.jsp?error=removeDocument</result>
+            <result name="success" type="tiles">page.displaystudy</result>
+            <result name="error" type="tiles">page.displaystudy</result>
         </action>
 
         <!-- Edition of knowledge elements
           -->        
         <action name="add-knowledge" class="editKnowledgeElementAction" method="initialize">
-            <result name="success">/study/displayStudyStep.jsp?action=addKnowledge&amp;index=%{knowledgeType}</result>
+<!--             <result name="success">/study/displayStudy.jsp?action=addKnowledge&amp;index=%{knowledgeType}</result>-->
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="edit-knowledge" class="editKnowledgeElementAction" method="initialize">
-            <result name="success">/study/displayStudyStep.jsp</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="setKnowledge" class="editKnowledgeElementAction" method="setKnowledge">
-            <result name="success">/study/displayStudyStep.jsp?action=display</result>
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
         <action name="remove-knowledge" class="editKnowledgeElementAction" method="deleteKnowledge">
-            <result name="success">/study/displayStudyStep.jsp</result>
-            <result name="error">/study/displayStudyStep.jsp?error=removeKnowledge</result>
+            <result name="success" type="tiles">page.displaystudy</result>
+            <result name="error" type="tiles">page.displaystudy</result>
+        </action>
+        <action name="promote-knowledge" class="editKnowledgeElementAction" method="promoteKnowledge">
+            <result name="success" type="tiles">page.displaystudy</result>
+        </action>
+        <action name="demote-knowledge" class="editKnowledgeElementAction" method="demoteKnowledge">
+            <result name="success" type="tiles">page.displaystudy</result>
         </action>
 
     </package>
 
 
     <package name="sadmin" namespace="/sadmin" extends="simer-default">
+    
+        <result-types>
+               <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
+       </result-types>
 
         <!-- Menus of database administration
           -->        
         <action name="indexing" class="databaseIndexingAction" method="initialize">
-            <result name="success">/sadmin/indexStudies.jsp</result>
+            <result name="success" type="tiles">page.indexstudies</result>
         </action>
         <action name="valid-indexing" class="databaseIndexingAction" method="indexing">
             <result name="success" type="redirectAction">../study/search-study</result>
         </action>
         <action name="select-file" class="uploadAction" method="initialize">
-            <result name="success">/sadmin/upload.jsp</result>
+            <result name="success" type="tiles">page.uploadsadmin</result>
         </action>
         <action name="upload"      class="uploadAction" method="upload">
+            <result name="cancel" type="tiles">page.home</result>
             <result name="importuser" type="redirectAction">importuser?fileName=%{fileName}</result>
         </action>
         <action name="importuser" class="importUserAction" method="import">
-            <result name="success">/sadmin/displayUser.jsp</result>
+            <result name="success" type="tiles">page.displayuser</result>
         </action>
 
         <!-- Menus of knowledge administration
@@ -299,6 +326,10 @@
     </package>
 
     <package name="sgeom" namespace="/sgeom" extends="simer-default">
+    
+       <result-types>
+               <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
+       </result-types>
 
         <action name="valid-save"    class="saveDocumentAction" method="save">
             <result name="success">/sgeom/index.jsp</result>
@@ -314,6 +345,10 @@
 
 
     <package name="smesh" namespace="/smesh" extends="simer-default">
+    
+        <result-types>
+               <result-type name="tiles" class="org.apache.struts2.views.tiles.TilesResult" />
+       </result-types>
 
         <action name="valid-save"    class="saveDocumentAction" method="save">
             <result name="success">/smesh/index.jsp</result>