commit 02a1ca6819aa355574930285a0990a8b080bdd4a
author Stefaan Dutry <stefaan.dutry@gmail.com> Tue Mar 28 08:23:12 2017 +0200
committer Stefaan Dutry <stefaan.dutry@gmail.com> Tue Mar 28 08:23:12 2017 +0200
tree eed2925798f12007df51b03118ec91f60c49bd17
parent 7879bafe58fd7d82d8e31f34dd88736e337f0a12

fixed struts version

struts2-custom-results-plugin/pom.xml

diff --git a/struts2-custom-results-plugin/pom.xml b/struts2-custom-results-plugin/pom.xml
index 44eadde..b0efc2d 100644
--- a/struts2-custom-results-plugin/pom.xml
+++ b/struts2-custom-results-plugin/pom.xml
@@ -70,7 +70,7 @@
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-core</artifactId>
-            <version>2.3.20.1</version>
+            <version>2.5.10.1</version>
         </dependency>
 
         <dependency>

struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/HttpsOffloadAwareServletRedirectResult.java

diff --git a/struts2-custom-results-plugin/src/main/java/org/apache/struts2/dispatcher/HttpsOffloadAwareServletRedirectResult.java b/struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/HttpsOffloadAwareServletRedirectResult.java
similarity index 96%
rename from struts2-custom-results-plugin/src/main/java/org/apache/struts2/dispatcher/HttpsOffloadAwareServletRedirectResult.java
rename to struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/HttpsOffloadAwareServletRedirectResult.java
index b3ee26a..201eb3b 100644
--- a/struts2-custom-results-plugin/src/main/java/org/apache/struts2/dispatcher/HttpsOffloadAwareServletRedirectResult.java
+++ b/struts2-custom-results-plugin/src/main/java/org/apache/struts2/result/HttpsOffloadAwareServletRedirectResult.java
@@ -19,7 +19,7 @@
  * under the License.
  */
 
-package org.apache.struts2.dispatcher;
+package org.apache.struts2.result;
 
 import java.util.Collection;
 import java.util.List;
@@ -31,9 +31,9 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.struts2.ServletActionContext;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.ServletRedirectResult;
 import org.apache.struts2.dispatcher.mapper.ActionMapping;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.result.ServletRedirectResult;
 import org.apache.struts2.views.util.UrlHelper;
 
 import com.opensymphony.xwork2.ActionContext;
@@ -70,8 +70,7 @@
 
         if (isPathUrl(finalLocation)) {
             if (!finalLocation.startsWith("/")) {
-                ActionMapping mapping = actionMapper.getMapping(request,
-                        Dispatcher.getInstance().getConfigurationManager());
+                ActionMapping mapping = actionMapper.getMapping(request, Dispatcher.getInstance().getConfigurationManager());
                 String namespace = null;
                 if (mapping != null) {
                     namespace = mapping.getNamespace();