From 79867a72c06e4230428d3755509f1bf7b50f9914 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 22 Oct 2014 14:43:55 +0200
Subject: add PVP gateway configuration into configWebTool

---
 id/ConfigWebTool/src/main/resources/struts.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(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 68cd85b2f..180877494 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -391,6 +391,7 @@
  		<action name="newIDP" method="newIDP" class="at.gv.egovernment.moa.id.configuration.struts.action.InterfederationIDPAction">
 			<result name="editOA-VIDP">/jsp/interfederation/vidp.jsp</result>
 			<result name="editOA-MOAIDP">/jsp/interfederation/moa_idp.jsp</result>
+			<result name="editOA-IDPGATEWAY">/jsp/interfederation/pvpgateway.jsp</result>
 			<result name="success" type="chain">main</result>
 			<result name="error">/error.jsp</result>
 			<result name="reauthentication" type="redirectAction">
@@ -412,6 +413,17 @@
 			<interceptor-ref name="OwnStack"/>
 		</action>
 		
+		<action name="saveIDPGateway" method="saveIDP" class="at.gv.egovernment.moa.id.configuration.struts.action.IDPGatewayAction">
+			<result name="success" type="chain">main</result>
+			<result name="error_validation">/jsp/interfederation/pvpgateway.jsp</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="OwnStack"/>
+		</action>
+		
 		<action name="saveVIDP" method="saveIDP" class="at.gv.egovernment.moa.id.configuration.struts.action.VIDPAction">
 			<result name="success" type="chain">main</result>
 			<result name="error_validation">/jsp/interfederation/vidp.jsp</result>
-- 
cgit v1.2.3


From 479f2dc2f37b0bcdc9317e6d740d1e173b34bbb4 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 24 Oct 2014 13:42:13 +0200
Subject: update configtool for STORK-PVP gateway configuration

---
 id/ConfigWebTool/src/main/resources/struts.xml | 1 +
 1 file changed, 1 insertion(+)

(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 180877494..f383ad524 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -379,6 +379,7 @@
 		<action name="loadIDP" method="loadIDPInformation" class="at.gv.egovernment.moa.id.configuration.struts.action.InterfederationIDPAction">
 			<result name="success-VIDP">/jsp/interfederation/vidp.jsp</result>
 			<result name="success-MOAIDP">/jsp/interfederation/moa_idp.jsp</result>
+			<result name="success-IDPGATEWAY">/jsp/interfederation/pvpgateway.jsp</result>
 			<result name="notallowed" type="chain">main</result>
 			<result name="error">/error.jsp</result>
 			<result name="reauthentication" type="redirectAction">
-- 
cgit v1.2.3


From 576f0cd61a686576267c05792d42b69ecbaf4b53 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 28 Oct 2014 12:39:57 +0100
Subject: add STRUTS2 interceptor for hibernate session management

---
 id/ConfigWebTool/src/main/resources/struts.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(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 68cd85b2f..74ef3be10 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -16,7 +16,10 @@
 	
 		
  		<interceptors>
+ 				<interceptor name="HibernateSessionInterceptor" class="at.gv.egovernment.moa.id.configuration.struts.interceptor.HibernateSessionInterceptor"/>
+ 		
 	    	<interceptor-stack name="OwnStack">
+	    		<interceptor-ref name="HibernateSessionInterceptor" />
  	  			<interceptor-ref name="params">
   					<param
 							name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param>
@@ -85,7 +88,10 @@
 	<package name="secure" namespace="/secure" extends="struts-default">
 	    
 	   	<interceptors>
+	   		<interceptor name="HibernateSessionInterceptor" class="at.gv.egovernment.moa.id.configuration.struts.interceptor.HibernateSessionInterceptor"/>
+	   	
 	    	<interceptor-stack name="OwnStack">
+	    		<interceptor-ref name="HibernateSessionInterceptor" />
 	  			<interceptor-ref name="params">
   					<param
 						name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param>
-- 
cgit v1.2.3


From def91ef4b2e19c18aa1f17de391fe08f165292a8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 30 Oct 2014 14:40:28 +0100
Subject: fix problems with non-admin user

---
 id/ConfigWebTool/src/main/resources/struts.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(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 31f3889de..39c38ae43 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -155,7 +155,7 @@
  		  
  		<action name="newOA" method="newOA" class="at.gv.egovernment.moa.id.configuration.struts.action.EditOAAction">
 			<result name="editOA">/jsp/editOAGeneral.jsp</result>
-			<result name="success" type="chain">main</result>
+			<result name="success">/jsp/mainpage.jsp</result>
 			<result name="error">/error.jsp</result>
 			<result name="reauthentication" type="redirectAction">
 	          <param name="actionName">logout</param>
-- 
cgit v1.2.3