diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-09-07 09:10:03 +0200 | 
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2017-09-07 09:10:03 +0200 | 
| commit | 02ea379722e57b38a185b7886eb4e39421fb4371 (patch) | |
| tree | 029bcbede9e899a460618517df0dfa725ef28977 | |
| parent | 98e5c09745c58ef1b04132a9c92c60143332540e (diff) | |
| download | moa-id-spss-02ea379722e57b38a185b7886eb4e39421fb4371.tar.gz moa-id-spss-02ea379722e57b38a185b7886eb4e39421fb4371.tar.bz2 moa-id-spss-02ea379722e57b38a185b7886eb4e39421fb4371.zip | |
update Struts2 to current version
| -rw-r--r-- | id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter/AuthenticationFilter.java | 10 | ||||
| -rw-r--r-- | pom.xml | 6 | 
2 files changed, 9 insertions, 7 deletions
| diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter/AuthenticationFilter.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter/AuthenticationFilter.java index 67fef3b1d..c69998fa2 100644 --- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter/AuthenticationFilter.java +++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/filter/AuthenticationFilter.java @@ -28,9 +28,6 @@ import java.util.Date;  import java.util.StringTokenizer;  import java.util.regex.Pattern; -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -  import javax.servlet.Filter;  import javax.servlet.FilterChain;  import javax.servlet.FilterConfig; @@ -42,6 +39,9 @@ import javax.servlet.http.HttpServletRequest;  import javax.servlet.http.HttpServletResponse;  import javax.servlet.http.HttpSession; +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +  import at.gv.egovernment.moa.id.config.webgui.exception.ConfigurationException;  import at.gv.egovernment.moa.id.configuration.Constants;  import at.gv.egovernment.moa.id.configuration.auth.AuthenticatedUser; @@ -205,7 +205,9 @@ public class AuthenticationFilter implements Filter{  				filterchain.doFilter(req, resp);  			} catch (Exception e) { -						 + +				log.error("Servlet filter catchs an unhandled exception! Msg: " + e.getMessage(), e); +				  				//String redirectURL = "./index.action";  				//HttpServletResponse httpResp = (HttpServletResponse) resp;  				//redirectURL = httpResp.encodeRedirectURL(redirectURL); @@ -47,7 +47,7 @@  			<cxf.version>3.1.12</cxf.version>			 -			<struts.version>2.5.10.1</struts.version> <!-- 2.5.12 --> +			<struts.version>2.5.13</struts.version> <!-- 2.5.10.1 -->  			<egovutils.version>2.0.0</egovutils.version> @@ -62,7 +62,7 @@  			<junit.version>4.12</junit.version>			  			<org.apache.commons.io.version>2.5</org.apache.commons.io.version> -			<org.apache.commons.lang3.version>3.5</org.apache.commons.lang3.version> +			<org.apache.commons.lang3.version>3.6</org.apache.commons.lang3.version>  			<org.apache.commons.collections4.version>4.1</org.apache.commons.collections4.version>  			<org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version>  			<jodatime.version>2.9.4</jodatime.version> @@ -574,7 +574,7 @@              <dependency>                  <groupId>iaik.prod</groupId>                  <artifactId>iaik_jce_full</artifactId> -                <version>5.5_MOA_RC3</version> +                <version>5.5_MOA</version>                  <scope>compile</scope>              </dependency> | 
