From a27cf61551c129aee48ea533ad73f2ade37a757a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 19 Sep 2013 16:19:00 +0200
Subject: ConfigWebTool Version 0.9.5  --PVP2 Login  --PVP2 Users to
 UserDatabase functionality  --Mailaddress verification  --Mail status
 messages to users and admin  --add List with OpenRequests for admins 
 --change OA Target configuration  --add cleanUp Thread to remove old unused
 UserAccount requests  --update UserDatabase to support PVP2 logins  --add
 formID element validate received forms

 -- add first classes for STORK configuration

make some Bugfixes
---
 id/ConfigWebTool/src/main/resources/struts.xml | 56 +++++++++++++++++++++++---
 1 file changed, 51 insertions(+), 5 deletions(-)

(limited to 'id/ConfigWebTool/src/main/resources/struts.xml')

diff --git a/id/ConfigWebTool/src/main/resources/struts.xml b/id/ConfigWebTool/src/main/resources/struts.xml
index 3b33bffcb..ce4b408b4 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -25,11 +25,35 @@
 			  <interceptor-ref name="defaultStack"/>
 		 </action>
 		 
+ 		 <action name="pvp2login" method="pvp2login" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction"> 
+ 		    <result name="success" type="redirectAction">
+	          <param name="actionName">main</param>
+            <param name="namespace">/secure</param>
+	      </result>
+	      <result name="newuser">/jsp/newUserRequest.jsp</result>
+			  <result name="error">/index.jsp</result>
+			  <interceptor-ref name="defaultStack"/>
+		 </action>
+ 		 
+ 		 <action name="requestNewUser" method="requestNewUser" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
+ 		    <result name="newuser">/jsp/newUserRequest.jsp</result>
+			  <result name="success">/index.jsp</result>
+			  <result name="error">/index.jsp</result>
+			  <interceptor-ref name="defaultStack"/>
+		 </action>
+ 		 
+ 		  <action name="mailAddressVerification" method="mailAddressVerification" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
+ 		    <result name="error">/index.jsp</result>
+			  <result name="success">/index.jsp</result>
+			  <interceptor-ref name="defaultStack"/>
+		 </action>
+ 		 
  		 <action name="logout" method="logout" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
 			  <result name="success" type="redirectAction">
 	          <param name="actionName">index</param>
             <param name="namespace">/</param>
 	      </result>
+	      <result name="ssologout" type="redirect">${ssologouturl}</result>
 			  <interceptor-ref name="defaultStack"/>
 		 </action>
  		 
@@ -110,7 +134,7 @@
 		</action>
  		
  		 <action name="saveOA" method="saveOA" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
-			<result name="success" type="chain">main</result>
+			<result name="success" type="chain">${nextPage}</result>
 			<result name="error_validation">/jsp/editOAGeneral.jsp</result>
 			<result name="error">/error.jsp</result>
 			<result name="reauthentication" type="redirectAction">
@@ -121,7 +145,7 @@
 		</action>
 		
  		<action name="cancleandbackOA" method="cancleAndBackOA" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
-			<result type="chain">main</result>
+			<result type="chain">${nextPage}</result>
 			<result name="reauthentication" type="redirectAction">
 	          <param name="actionName">logout</param>
             <param name="namespace">/</param> 
@@ -130,7 +154,7 @@
 		</action> 		
  	
  		<action name="deleteOA" method="deleteOA" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
-			<result type="chain">main</result>
+			<result name="success" type="chain">${nextPage}</result>
 			<result name="error_validation">/jsp/editOAGeneral.jsp</result>
 			<result name="reauthentication" type="redirectAction">
 	          <param name="actionName">logout</param>
@@ -190,6 +214,7 @@
             <param name="namespace">/</param> 
 	     </result>
 			<result name="notallowed">/jsp/mainpage.jsp</result>
+			<result name="error">/error.jsp</result>
 			<interceptor-ref name="defaultStack"/>
 		</action>
 		
@@ -201,6 +226,7 @@
             <param name="namespace">/</param> 
 	     </result>
 			<result name="notallowed">/jsp/mainpage.jsp</result>
+			<result name="error">/error.jsp</result>
 			<interceptor-ref name="defaultStack"/>
 		</action>
  			
@@ -217,6 +243,7 @@
 	     </result>
 			<result name="error_validation">/jsp/importexport.jsp</result>
 			<result name="notallowed">/jsp/mainpage.jsp</result>
+			<result name="error">/error.jsp</result>
 			<interceptor-ref name="defaultStack"/>
 		</action>
 		
@@ -253,7 +280,7 @@
 		</action>
 		
 		<action name="deleteUser" method="deleteuser" class="at.gv.egovernment.moa.id.configuration.struts.action.UserManagementAction">
-			<result name="success" type="chain">usermanagementInit</result>
+			<result name="success" type="chain">${nextPage}</result>
 			<result name="notallowed" type="chain">main</result>
 			<result name="error">/error.jsp</result>
 			<result name="reauthentication" type="redirectAction">
@@ -264,7 +291,7 @@
 		</action>
 		
 		<action name="saveUser" method="saveuser" class="at.gv.egovernment.moa.id.configuration.struts.action.UserManagementAction">
-			<result name="success" type="chain">usermanagementInit</result>
+			<result name="success" type="chain">${nextPage}</result>
 			<result name="error_validation">/jsp/edituser.jsp</result>
 			<result name="notallowed" type="chain">main</result>
 			<result name="error">/error.jsp</result>
@@ -275,6 +302,25 @@
 			<interceptor-ref name="defaultStack"/>
 		</action>
 		
+		<action name="sendVerificationMail" method="sendVerificationMail" class="at.gv.egovernment.moa.id.configuration.struts.action.UserManagementAction">
+			<result type="stream">
+    		<param name="contentType">text/html</param>
+    		<param name="inputName">stream</param>
+    	</result>
+			<interceptor-ref name="defaultStack"/>
+		</action>
+		
+		<action name="adminRequestsInit" method="init" class="at.gv.egovernment.moa.id.configuration.struts.action.OpenAdminRequestsAction">
+			<result name="success">/jsp/openadminrequests.jsp</result>
+			<result name="notallowed" type="chain">main</result>
+			<result name="error">/error.jsp</result>
+			<result name="reauthentication" type="redirectAction">
+	          <param name="actionName">logout</param>
+            <param name="namespace">/</param> 
+	     </result>
+			<interceptor-ref name="defaultStack"/>
+		</action>
+		
  	</package>
 			
 </struts>
\ No newline at end of file
-- 
cgit v1.2.3