aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Lenz <thomas.lenz@egiz.gv.at>2014-04-01 18:56:00 +0200
committerThomas Lenz <thomas.lenz@egiz.gv.at>2014-04-01 18:56:00 +0200
commit7700a426db02fe0e44d8ff1e19595f45dc337806 (patch)
tree9910d4476d9954e5b2e4ae28a11b587028ba2911
parent779030ed2d7091183b3faf13fec57fa270d46c3a (diff)
downloadmoa-id-spss-7700a426db02fe0e44d8ff1e19595f45dc337806.tar.gz
moa-id-spss-7700a426db02fe0e44d8ff1e19595f45dc337806.tar.bz2
moa-id-spss-7700a426db02fe0e44d8ff1e19595f45dc337806.zip
solve problems with Struts 2.3.16.1
-rw-r--r--id/ConfigWebTool/src/main/resources/struts.xml25
-rw-r--r--id/server/pom.xml2
-rw-r--r--pom.xml4
3 files changed, 26 insertions, 5 deletions
diff --git a/id/ConfigWebTool/src/main/resources/struts.xml b/id/ConfigWebTool/src/main/resources/struts.xml
index 9a098da5a..1c5dc83d3 100644
--- a/id/ConfigWebTool/src/main/resources/struts.xml
+++ b/id/ConfigWebTool/src/main/resources/struts.xml
@@ -6,10 +6,22 @@
<struts>
<constant name="struts.custom.i18n.resources" value="webpages" />
+ <constant name="struts.mapper.action.prefix.enabled" value="true" />
<package name="default" namespace="/" extends="struts-default">
- <default-interceptor-ref name="defaultStack"/>
+
+
+ <interceptors>
+ <interceptor-stack name="OwnStack">
+ <interceptor-ref name="defaultStack" />
+ <interceptor-ref name="params">
+ <param
+ name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param>
+ </interceptor-ref>
+ </interceptor-stack>
+ </interceptors>
+ <default-interceptor-ref name="OwnStack"/>
<action name="index" method="start" class="at.gv.egovernment.moa.id.configuration.struts.action.IndexAction">
<result name="success">/index.jsp</result>
@@ -69,7 +81,16 @@
<package name="secure" namespace="/secure" extends="struts-default">
- <default-interceptor-ref name="defaultStack"/>
+ <interceptors>
+ <interceptor-stack name="OwnStack">
+ <interceptor-ref name="defaultStack" />
+ <interceptor-ref name="params">
+ <param
+ name="excludeParams">^class\..*,^dojo\..*,^struts\..*,^session\..*,^request\..*,^application\..*,^servlet(Request|Response)\..*,^parameters\..*,^method:.*</param>
+ </interceptor-ref>
+ </interceptor-stack>
+ </interceptors>
+ <default-interceptor-ref name="OwnStack"/>
<action name="index">
<result type="redirectAction">
diff --git a/id/server/pom.xml b/id/server/pom.xml
index d748c01eb..f4b92fbd5 100644
--- a/id/server/pom.xml
+++ b/id/server/pom.xml
@@ -19,7 +19,7 @@
<module>auth</module>
<module>moa-id-commons</module>
<module>stork2-saml-engine</module>
- <module>stork2-commons</module>
+ <!-- <module>stork2-commons</module> -->
</modules>
<properties>
diff --git a/pom.xml b/pom.xml
index 83d686eae..6352b8ebc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,8 +47,8 @@
<fork>true</fork>
<executable>${env.BUILD_EXECUTEABLE}</executable>
<compilerVersion>${env.BUILD_VERSION}</compilerVersion>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>