diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2019-02-27 10:08:31 +0100 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2019-02-27 10:08:31 +0100 |
| commit | d23e3745dd4a40196b03f937b9ba8c4ed840a108 (patch) | |
| tree | 2195fbe110c392728b3009aa545363540a94294e /id/ConfigWebTool/src/main/webapp/WEB-INF | |
| parent | 86aa898406f539fd06129360c58c654afc62e904 (diff) | |
| parent | f923a89436377f581c6e2ab6637024aa068bf9fb (diff) | |
| download | moa-id-spss-d23e3745dd4a40196b03f937b9ba8c4ed840a108.tar.gz moa-id-spss-d23e3745dd4a40196b03f937b9ba8c4ed840a108.tar.bz2 moa-id-spss-d23e3745dd4a40196b03f937b9ba8c4ed840a108.zip | |
Merge tag 'MOA-ID-3.4.2'
Diffstat (limited to 'id/ConfigWebTool/src/main/webapp/WEB-INF')
| -rw-r--r-- | id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml index 4118c94f4..b94368ac6 100644 --- a/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml +++ b/id/ConfigWebTool/src/main/webapp/WEB-INF/web.xml @@ -27,17 +27,6 @@ <param-value>^.*((/index.action.*)|(/error.action.*)|(/authenticate.action.*)|(/pvp2login.action.*)|(/mailAddressVerification.action.*)|(/logout.action)|(/jsp/.*)|(/css/.*)|(/servlet/.*)|(/images/.*)|(/js/.*))$</param-value> </init-param> </filter> - <filter-mapping> - <filter-name>AuthenicationFiler</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - -<!-- - <filter> - <filter-name>sitemash</filter-name> - <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> - </filter> --> <filter> <filter-name>struts2</filter-name> @@ -105,21 +94,23 @@ <url-pattern>/servlet/sloBackChannel</url-pattern> </servlet-mapping> -<!-- <filter-mapping> - <filter-name>sitemash</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> --> - + +<!-- Set filter order --> <filter-mapping> - <filter-name>struts2</filter-name> - <url-pattern>*.action</url-pattern> + <filter-name>AuthenicationFiler</filter-name> + <url-pattern>/*</url-pattern> </filter-mapping> - + <filter-mapping> <filter-name>EncodingFilter</filter-name> <url-pattern>/*</url-pattern> - </filter-mapping> - + </filter-mapping> + + <filter-mapping> + <filter-name>struts2</filter-name> + <url-pattern>*.action</url-pattern> + </filter-mapping> + <session-config> <session-timeout>45</session-timeout> </session-config> |