X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Workspace%2FSiman%2Fsrc%2Fstruts.xml;h=add83ea64d212facfac6f3b4c59e174557c5c3d2;hb=92211fb733030a36267ccc496d9ed508a4f2b7fa;hp=172ee38e3a6edf933e4260018b0b6ccbf5b95445;hpb=d0f7e95389f08ff3dfec5961d9f19866e0ee956b;p=tools%2Fsiman.git

diff --git a/Workspace/Siman/src/struts.xml b/Workspace/Siman/src/struts.xml
index 172ee38..add83ea 100644
--- a/Workspace/Siman/src/struts.xml
+++ b/Workspace/Siman/src/struts.xml
@@ -97,11 +97,12 @@
 		</action>
 		<action name="login" class="connectionAction" method="login">
 			<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
+				study/open-study
 			</result>
 			<result name="knowledge" type="redirectAction">
 				study/step-knowledge
@@ -117,19 +118,15 @@
 			<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="study" type="tiles">page.home</result>
+			<result name="knowledge" type="tiles">page.home</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>
+			<result name="new-empty" type="redirectAction">
+				study/new-empty
+			</result>
             <result name="new-copy" type="redirectAction">
                 study/new-copy
             </result>
@@ -185,21 +182,22 @@
 			<result name="success">/study/jsonCheckoutRes.jsp</result>
 		</action>
 
-        <!-- Creation of a study
-        -->
-        <action name="new-empty" class="newStudyAction"
-            method="initialize">
-            <result name="success" type="tiles">page.newstudy</result>
-        </action>
-        <action name="valid-new" class="newStudyAction"
-            method="create">
-            <!--interceptor-ref name="siman-validation" /-->
-            <result name="success" type="redirectAction">
-                open-study?selection=0.1
-            </result>
-            <result name="input" type="tiles">page.newstudy</result>
-            <result name="error" type="tiles">page.home</result>
-        </action>
+		<!-- Creation of a study
+		-->
+		<action name="new-empty" class="newStudyAction"
+			method="initialize">
+			<result name="success" type="tiles">page.newstudy</result>
+		</action>
+		<action name="valid-new" class="newStudyAction"
+			method="create">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
+			<result name="success" type="redirectAction">
+				open-study?selection=0.1
+			</result>
+			<result name="input" type="tiles">page.newstudy</result>
+			<result name="error" type="tiles">page.home</result>
+		</action>
 
         <!-- Creation of a new study from existing one
         -->
@@ -209,6 +207,8 @@
         </action>
         <action name="valid-copy" class="copyStudyAction"
             method="create">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
             <result name="success" type="redirectAction">
                 open-study?selection=0.1
             </result>
@@ -225,6 +225,15 @@
 			</result>
 			<result name="error" type="tiles">page.home</result>
 		</action>
+		<action name="setStudyOrder" class="searchStudyAction"
+		    method="setOrder">
+            <result name="success" type="tiles">
+                page.searchstudy
+            </result>
+            <result name="error" type="tiles">
+                page.searchstudy
+            </result>
+		</action>
 		<action name="refresh-study" class="searchStudyAction"
 			method="submitForm">
 			<result name="selectype" type="tiles">
@@ -245,6 +254,15 @@
 				page.searchknowledge
 			</result>
 		</action>
+		<action name="setKnowledgeOrder" class="searchKnowledgeAction"
+            method="setOrder">
+            <result name="success" type="tiles">
+                page.searchknowledge
+            </result>
+            <result name="error" type="tiles">
+                page.searchknowledge
+            </result>
+        </action>
 		<action name="refresh-knowledge" class="searchKnowledgeAction"
 			method="submitForm">
 			<result name="selectype" type="tiles">
@@ -273,6 +291,7 @@
 			<result name="success" type="tiles">
 				page.displaystudy
 			</result>
+            <result name="error" type="tiles">page.home</result>
 		</action>
 		<action name="step-study" class="displayStudyStepAction"
 			method="selectStep">
@@ -363,15 +382,23 @@
 				page.displaystudy
 			</result>
 		</action>
-		
 		<action name="valid-rename" class="editScenarioPropertiesAction"
 			method="editScenarioTitle">
 			<interceptor-ref name="simanBasicStack" />
+            <interceptor-ref name="siman-validation" />
 			<result name="success" type="redirectAction">
 				open-study
 			</result>
 		</action>
-		
+		<action name="remove-scenario" class="editScenarioPropertiesAction"
+            method="removeScenario">
+            <result name="success" type="redirectAction">
+                open-study
+            </result>
+            <result name="error" type="redirectAction">
+                step-study
+            </result>
+        </action>	
 		<action name="add-scenario" class="newScenarioAction"
 			method="initialize">
 			<result name="success" type="tiles">
@@ -404,16 +431,20 @@
 		</action>
 		<action name="valid-add" class="newScenarioAction"
 			method="create">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
 			<result name="cancel" type="redirectAction">
 				step-study
 			</result>
 			<result name="success" type="redirectAction">
-				step-study
+				open-study
 			</result>
 			<result name="error" type="tiles">page.displaystudy</result>
 		</action>
 		<action name="valid-edit" class="studyPropertiesAction"
 			method="edition">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="validation"/>
 			<result name="success" type="tiles">
 				page.editstudyproperties
 			</result>
@@ -424,6 +455,12 @@
 				page.editscenarioproperties
 			</result>
 		</action>
+        <action name="init-edit-readers" class="studyPropertiesAction"
+            method="initEditReaders">
+            <result name="success" type="tiles">
+                page.editstudyproperties
+            </result>
+        </action>
 
 		<!-- Edition of scenario
 		-->
@@ -487,14 +524,17 @@
 				step-study
 			</result>
 			<result name="import" type="redirectAction">
-				import-document?fileName=%{fileName}
+				import-document?fileName=%{canceledFileName}
 			</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}
+				version-document?index=%{index}&amp;fileName=%{canceledFileName}
 			</result>
+            <result name="attach" type="redirectAction">
+                attach-document?index=%{index}&amp;fileName=%{canceledFileName}
+            </result>
+            <result name="replace" type="redirectAction">
+                replace-document?index=%{index}&amp;fileName=%{canceledFileName}
+            </result>
 			<result name="outofmemory" type="tiles">
 				page.error.study
 			</result>
@@ -506,13 +546,18 @@
 			</result>
 			<result name="error" type="tiles">page.importerror</result>
 		</action>
+		<action name="update-uses" class="importDocumentAction"
+			method="updateUsesList">
+			<result name="success"  type="dispatcher">
+				/study/usesList.jsp
+			</result>
+		</action>
 		<action name="valid-import" class="importDocumentAction"
 			method="import">
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
 			<result name="success" type="redirectAction">
-				step-study
-			</result>
-			<result name="cancel" type="redirectAction">
-				step-study
+				open-study
 			</result>
 			<result name="error" type="tiles">page.importerror</result>
 		</action>
@@ -525,6 +570,8 @@
 		</action>
 		<action name="valid-version" class="versionDocumentAction"
 			method="version">
+			<interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="siman-validation"/>
 			<result name="success" type="redirectAction">
 				step-study
 			</result>
@@ -533,12 +580,18 @@
 			</result>
 			<result name="error" type="tiles">page.importerror</result>
 		</action>
-		<action name="attach-document" class="editDocumentAction"
-			method="attach">
-			<result name="success" type="tiles">
-				page.displaystudy
-			</result>
-		</action>
+        <action name="attach-document" class="editDocumentAction"
+            method="attach">
+            <result name="success" type="tiles">
+                page.displaystudy
+            </result>
+        </action>
+        <action name="replace-document" class="editDocumentAction"
+            method="replace">
+            <result name="success" type="tiles">
+                page.displaystudy
+            </result>
+        </action>
 		<action name="edit-document" class="editDocumentAction"
 			method="initialize">
 			<result name="success" type="tiles">
@@ -576,9 +629,11 @@
 		</action>
 		<action name="setKnowledge" class="editKnowledgeElementAction"
 			method="setKnowledge">
-			<result name="success" type="tiles">
-				page.displaystudy
-			</result>
+            <interceptor-ref name="simanBasicStack"/>
+            <interceptor-ref name="validation"/>
+			<result name="success" type="redirectAction">
+                study/open-study
+            </result>
 		</action>
 		<action name="remove-knowledge"
 			class="editKnowledgeElementAction" method="deleteKnowledge">