diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-11-03 11:13:38 +0100 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-11-03 11:13:38 +0100 |
commit | a3e59e5011e16271dab6cc8299a1d1241b4a7fb2 (patch) | |
tree | aae2f450b7296a286c09a8c51d423aec4bedd0dd /id/ConfigWebTool/src/main/resources/struts.xml | |
parent | 83dc74e60a4d9031285ac27aa0661fe0c26485e0 (diff) | |
parent | 1fbff5f5a86733bc6a75c8ae901153baa0963441 (diff) | |
download | moa-id-spss-a3e59e5011e16271dab6cc8299a1d1241b4a7fb2.tar.gz moa-id-spss-a3e59e5011e16271dab6cc8299a1d1241b4a7fb2.tar.bz2 moa-id-spss-a3e59e5011e16271dab6cc8299a1d1241b4a7fb2.zip |
Merge branch 'moa-2.1-Snapshot'MOA-SPSS-2.0.3MOA-ID-2.1.2
Conflicts:
.gitignore
Diffstat (limited to 'id/ConfigWebTool/src/main/resources/struts.xml')
-rw-r--r-- | id/ConfigWebTool/src/main/resources/struts.xml | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/id/ConfigWebTool/src/main/resources/struts.xml b/id/ConfigWebTool/src/main/resources/struts.xml index 68cd85b2f..39c38ae43 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> @@ -149,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> @@ -379,6 +385,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"> @@ -391,6 +398,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 +420,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> |