From 6bc99ab9399591b0caac113d95601acda2ca8b69 Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 23 Jun 2015 17:14:27 +0200 Subject: [PATCH] WW-4518 Moves results to dedicated package --- .../main/webapp/WEB-INF/decorators/main.jsp | 5 +- .../interceptor/MessageStoreInterceptor.java | 2 +- .../HttpHeaderResult.java | 2 +- .../PlainTextResult.java | 4 +- .../PostbackResult.java | 2 +- .../ServletActionRedirectResult.java | 2 +- .../ServletDispatcherResult.java | 2 +- .../ServletRedirectResult.java | 3 +- .../{dispatcher => result}/StreamResult.java | 4 +- .../StrutsResultSupport.java | 2 +- .../VelocityResult.java | 2 +- .../views/freemarker/FreemarkerResult.java | 2 +- core/src/main/resources/struts-default.xml | 16 +++--- .../struts2/TestConfigurationProvider.java | 2 +- .../mapper/DefaultActionMapperTest.java | 2 +- .../MessageStoreInterceptorTest.java | 2 +- .../HttpHeaderResultTest.java | 3 +- .../PlainTextResultTest.java | 2 +- .../ServletActionRedirectResultTest.java | 3 +- .../ServletDispatcherResultTest.java | 3 +- .../ServletRedirectResultTest.java | 3 +- .../StreamResultTest.java | 2 +- .../StrutsResultSupportTest.java | 3 +- .../VelocityResultTest.java | 4 +- .../ConventionUnknownHandlerTest.java | 2 +- .../DefaultResultMapBuilderTest.java | 50 +++++++++---------- .../PackageBasedActionConfigBuilderTest.java | 2 +- .../org/apache/struts2/EmbeddedJSPResult.java | 2 +- .../jasperreports/JasperReportsResult.java | 3 +- .../struts2/dispatcher/ChartResult.java | 3 +- .../views/tiles/PortletTilesResult.java | 2 +- .../result/PortletActionRedirectResult.java | 2 +- .../struts2/portlet/result/PortletResult.java | 2 +- .../portlet/result/PortletVelocityResult.java | 4 +- .../freemarker/PortletFreemarkerResult.java | 2 +- .../struts2/rest/RestActionInvocation.java | 2 +- .../rest/src/main/resources/struts-plugin.xml | 4 +- .../rest/RestActionInvocationTest.java | 6 +-- .../struts2/views/tiles/TilesResult.java | 2 +- .../struts2/views/tiles/TilesResult.java | 2 +- 40 files changed, 88 insertions(+), 79 deletions(-) rename core/src/main/java/org/apache/struts2/{dispatcher => result}/HttpHeaderResult.java (99%) rename core/src/main/java/org/apache/struts2/{dispatcher => result}/PlainTextResult.java (97%) rename core/src/main/java/org/apache/struts2/{dispatcher => result}/PostbackResult.java (99%) rename core/src/main/java/org/apache/struts2/{dispatcher => result}/ServletActionRedirectResult.java (99%) rename core/src/main/java/org/apache/struts2/{dispatcher => result}/ServletDispatcherResult.java (99%) rename core/src/main/java/org/apache/struts2/{dispatcher => result}/ServletRedirectResult.java (99%) rename core/src/main/java/org/apache/struts2/{dispatcher => result}/StreamResult.java (98%) rename core/src/main/java/org/apache/struts2/{dispatcher => result}/StrutsResultSupport.java (99%) rename core/src/main/java/org/apache/struts2/{dispatcher => result}/VelocityResult.java (99%) rename core/src/test/java/org/apache/struts2/{dispatcher => result}/HttpHeaderResultTest.java (98%) rename core/src/test/java/org/apache/struts2/{dispatcher => result}/PlainTextResultTest.java (99%) rename core/src/test/java/org/apache/struts2/{dispatcher => result}/ServletActionRedirectResultTest.java (98%) rename core/src/test/java/org/apache/struts2/{dispatcher => result}/ServletDispatcherResultTest.java (97%) rename core/src/test/java/org/apache/struts2/{dispatcher => result}/ServletRedirectResultTest.java (99%) rename core/src/test/java/org/apache/struts2/{dispatcher => result}/StreamResultTest.java (99%) rename core/src/test/java/org/apache/struts2/{dispatcher => result}/StrutsResultSupportTest.java (98%) rename core/src/test/java/org/apache/struts2/{dispatcher => result}/VelocityResultTest.java (97%) diff --git a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp index d4a6187c2..22ffc60f5 100644 --- a/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp +++ b/apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp @@ -1,3 +1,4 @@ +<%@ page import="org.apache.struts2.result.StrutsResultSupport" %> <%@ page language="java" @@ -21,8 +22,8 @@ } sourceUrl += "&className=" + inv.getProxy().getConfig().getClassName(); - if (inv.getResult() != null && inv.getResult() instanceof org.apache.struts2.dispatcher.StrutsResultSupport) { - sourceUrl += "&page=" + mapping.getNamespace() + "/" + ((org.apache.struts2.dispatcher.StrutsResultSupport) inv.getResult()).getLastFinalLocation(); + if (inv.getResult() != null && inv.getResult() instanceof StrutsResultSupport) { + sourceUrl += "&page=" + mapping.getNamespace() + "/" + ((StrutsResultSupport) inv.getResult()).getLastFinalLocation(); } } else { sourceUrl += "?page=" + request.getServletPath(); diff --git a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java index 82d2a551a..f10cd4842 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java @@ -27,7 +27,7 @@ import com.opensymphony.xwork2.interceptor.ValidationAware; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.apache.struts2.dispatcher.ServletRedirectResult; +import org.apache.struts2.result.ServletRedirectResult; import java.util.ArrayList; import java.util.Collection; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java b/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java similarity index 99% rename from core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java rename to core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java index 3613502a3..47454757f 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/HttpHeaderResult.java +++ b/core/src/main/java/org/apache/struts2/result/HttpHeaderResult.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java b/core/src/main/java/org/apache/struts2/result/PlainTextResult.java similarity index 97% rename from core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java rename to core/src/main/java/org/apache/struts2/result/PlainTextResult.java index 8d36bf661..44d930224 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/PlainTextResult.java +++ b/core/src/main/java/org/apache/struts2/result/PlainTextResult.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionInvocation; import org.apache.logging.log4j.LogManager; @@ -110,7 +110,7 @@ public class PlainTextResult extends StrutsResultSupport { } /* (non-Javadoc) - * @see org.apache.struts2.dispatcher.StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.result.StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation) */ protected void doExecute(String finalLocation, ActionInvocation invocation) throws Exception { // verify charset diff --git a/core/src/main/java/org/apache/struts2/dispatcher/PostbackResult.java b/core/src/main/java/org/apache/struts2/result/PostbackResult.java similarity index 99% rename from core/src/main/java/org/apache/struts2/dispatcher/PostbackResult.java rename to core/src/main/java/org/apache/struts2/result/PostbackResult.java index 89e340048..ee14384cd 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/PostbackResult.java +++ b/core/src/main/java/org/apache/struts2/result/PostbackResult.java @@ -18,7 +18,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java b/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java similarity index 99% rename from core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java rename to core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java index 5e0f835b5..2d126064c 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletActionRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletActionRedirectResult.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.util.reflection.ReflectionExceptionHandler; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java similarity index 99% rename from core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java rename to core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java index 52d4f6787..8d20e99c2 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletDispatcherResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletDispatcherResult.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.inject.Inject; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java b/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java similarity index 99% rename from core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java rename to core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java index 99317f31c..c3fe70b60 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/ServletRedirectResult.java +++ b/core/src/main/java/org/apache/struts2/result/ServletRedirectResult.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; @@ -30,6 +30,7 @@ import com.opensymphony.xwork2.util.reflection.ReflectionExceptionHandler; 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.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.views.util.UrlHelper; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java b/core/src/main/java/org/apache/struts2/result/StreamResult.java similarity index 98% rename from core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java rename to core/src/main/java/org/apache/struts2/result/StreamResult.java index 4d512237b..5574cc1fb 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StreamResult.java +++ b/core/src/main/java/org/apache/struts2/result/StreamResult.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.util.ValueStack; @@ -214,7 +214,7 @@ public class StreamResult extends StrutsResultSupport { } /** - * @see org.apache.struts2.dispatcher.StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation) + * @see StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation) */ protected void doExecute(String finalLocation, ActionInvocation invocation) throws Exception { diff --git a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java b/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java similarity index 99% rename from core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java rename to core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java index f8f4ee170..bdb1b93f8 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/StrutsResultSupport.java +++ b/core/src/main/java/org/apache/struts2/result/StrutsResultSupport.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.Result; diff --git a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java b/core/src/main/java/org/apache/struts2/result/VelocityResult.java similarity index 99% rename from core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java rename to core/src/main/java/org/apache/struts2/result/VelocityResult.java index ff9d9dfde..810d191fb 100644 --- a/core/src/main/java/org/apache/struts2/dispatcher/VelocityResult.java +++ b/core/src/main/java/org/apache/struts2/result/VelocityResult.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java index e5258e6e0..0775f554f 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java @@ -38,7 +38,7 @@ import freemarker.template.TemplateModelException; import org.apache.commons.lang3.ObjectUtils; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsStatics; -import org.apache.struts2.dispatcher.StrutsResultSupport; +import org.apache.struts2.result.StrutsResultSupport; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 5b82fe057..33057cb42 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -168,16 +168,16 @@ - + - - - - - + + + + + - - + + diff --git a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java index 180657373..aee8473fb 100644 --- a/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java +++ b/core/src/test/java/org/apache/struts2/TestConfigurationProvider.java @@ -39,7 +39,7 @@ import com.opensymphony.xwork2.security.DefaultExcludedPatternsChecker; import com.opensymphony.xwork2.security.ExcludedPatternsChecker; import com.opensymphony.xwork2.util.location.LocatableProperties; import com.opensymphony.xwork2.validator.ValidationInterceptor; -import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.struts2.result.ServletDispatcherResult; import org.apache.struts2.interceptor.TokenInterceptor; import org.apache.struts2.interceptor.TokenSessionStoreInterceptor; import org.apache.struts2.views.jsp.ui.DoubleValidationAction; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java index 29bf8add9..43146721a 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java +++ b/core/src/test/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapperTest.java @@ -31,7 +31,7 @@ import com.opensymphony.xwork2.config.entities.PackageConfig; import com.opensymphony.xwork2.config.impl.DefaultConfiguration; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; -import org.apache.struts2.dispatcher.StrutsResultSupport; +import org.apache.struts2.result.StrutsResultSupport; import org.apache.struts2.views.jsp.StrutsMockHttpServletRequest; import java.util.Arrays; diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java index 3ba76c292..a419a18e2 100644 --- a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java +++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import org.apache.struts2.StrutsInternalTestCase; -import org.apache.struts2.dispatcher.ServletActionRedirectResult; +import org.apache.struts2.result.ServletActionRedirectResult; import org.easymock.EasyMock; import com.opensymphony.xwork2.Action; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java b/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java similarity index 98% rename from core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java rename to core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java index f4287d0c9..85849f190 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/HttpHeaderResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/HttpHeaderResultTest.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; @@ -28,6 +28,7 @@ import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.util.reflection.ReflectionProvider; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; +import org.apache.struts2.result.HttpHeaderResult; import javax.servlet.http.HttpServletResponse; import java.util.HashMap; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java b/core/src/test/java/org/apache/struts2/result/PlainTextResultTest.java similarity index 99% rename from core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java rename to core/src/test/java/org/apache/struts2/result/PlainTextResultTest.java index 959458a0d..faa631f20 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/PlainTextResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/PlainTextResultTest.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.mock.MockActionInvocation; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java b/core/src/test/java/org/apache/struts2/result/ServletActionRedirectResultTest.java similarity index 98% rename from core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java rename to core/src/test/java/org/apache/struts2/result/ServletActionRedirectResultTest.java index 168ea0449..2bea0a1db 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/ServletActionRedirectResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/ServletActionRedirectResultTest.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; @@ -31,6 +31,7 @@ import com.opensymphony.xwork2.util.ValueStack; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.dispatcher.mapper.ActionMapper; +import org.apache.struts2.result.ServletActionRedirectResult; import org.apache.struts2.views.util.DefaultUrlHelper; import org.easymock.IMocksControl; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java similarity index 97% rename from core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java rename to core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java index 2d93b8cc0..d9d878d31 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/ServletDispatcherResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/ServletDispatcherResultTest.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import javax.servlet.RequestDispatcher; import javax.servlet.http.HttpServletRequest; @@ -34,6 +34,7 @@ import org.apache.struts2.StrutsStatics; import com.mockobjects.dynamic.C; import com.mockobjects.dynamic.Mock; import com.opensymphony.xwork2.ActionContext; +import org.apache.struts2.result.ServletDispatcherResult; /** diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java b/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java similarity index 99% rename from core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java rename to core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java index ab40dfc7b..cdf410439 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/ServletRedirectResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/ServletRedirectResultTest.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import static javax.servlet.http.HttpServletResponse.SC_SEE_OTHER; import static org.easymock.EasyMock.createControl; @@ -43,6 +43,7 @@ import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsInternalTestCase; import org.apache.struts2.StrutsStatics; import org.apache.struts2.dispatcher.mapper.ActionMapper; +import org.apache.struts2.result.ServletRedirectResult; import org.apache.struts2.views.util.DefaultUrlHelper; import org.easymock.IMocksControl; import org.springframework.mock.web.MockHttpServletRequest; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java b/core/src/test/java/org/apache/struts2/result/StreamResultTest.java similarity index 99% rename from core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java rename to core/src/test/java/org/apache/struts2/result/StreamResultTest.java index 147823db9..fbb2525a0 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/StreamResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/StreamResultTest.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import com.opensymphony.xwork2.Action; import com.opensymphony.xwork2.ActionContext; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java b/core/src/test/java/org/apache/struts2/result/StrutsResultSupportTest.java similarity index 98% rename from core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java rename to core/src/test/java/org/apache/struts2/result/StrutsResultSupportTest.java index cc4bf6c55..6a8f90aeb 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/StrutsResultSupportTest.java +++ b/core/src/test/java/org/apache/struts2/result/StrutsResultSupportTest.java @@ -19,12 +19,13 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.apache.struts2.StrutsInternalTestCase; +import org.apache.struts2.result.StrutsResultSupport; import org.easymock.EasyMock; import com.opensymphony.xwork2.ActionContext; diff --git a/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java b/core/src/test/java/org/apache/struts2/result/VelocityResultTest.java similarity index 97% rename from core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java rename to core/src/test/java/org/apache/struts2/result/VelocityResultTest.java index 383e2c7f2..0a945ec76 100644 --- a/core/src/test/java/org/apache/struts2/dispatcher/VelocityResultTest.java +++ b/core/src/test/java/org/apache/struts2/result/VelocityResultTest.java @@ -19,9 +19,11 @@ * under the License. */ -package org.apache.struts2.dispatcher; +package org.apache.struts2.result; import org.apache.struts2.StrutsInternalTestCase; +import org.apache.struts2.result.StrutsResultSupport; +import org.apache.struts2.result.VelocityResult; import org.apache.velocity.Template; import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.exception.ParseErrorException; diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/ConventionUnknownHandlerTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/ConventionUnknownHandlerTest.java index 10733af21..ad40e598b 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/ConventionUnknownHandlerTest.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/ConventionUnknownHandlerTest.java @@ -27,7 +27,7 @@ import com.opensymphony.xwork2.config.entities.PackageConfig; import com.opensymphony.xwork2.config.entities.ResultTypeConfig; import com.opensymphony.xwork2.inject.Container; import junit.framework.TestCase; -import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.struts2.result.ServletDispatcherResult; import org.easymock.EasyMock; import javax.servlet.ServletContext; diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java index 502b202f2..abda7b355 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/DefaultResultMapBuilderTest.java @@ -29,7 +29,7 @@ import org.apache.struts2.convention.actions.NoAnnotationAction; import org.apache.struts2.convention.actions.result.*; import org.apache.struts2.convention.actions.resultpath.ClassLevelResultPathAction; import org.apache.struts2.convention.annotation.Action; -import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.struts2.result.ServletDispatcherResult; import org.easymock.EasyMock; import org.easymock.IAnswer; @@ -205,7 +205,7 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals(4, results.size()); assertEquals("success", results.get("success").getName()); assertEquals(3, results.get("success").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("success").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("success").getClassName()); assertEquals("/WEB-INF/location/namespace/no-annotation-success.jsp", results.get("success").getParams().get("location")); assertEquals(1, results.get("input").getParams().size()); assertEquals("org.apache.struts2.views.freemarker.FreemarkerResult", results.get("input").getClassName()); @@ -214,7 +214,7 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals("org.apache.struts2.views.freemarker.FreemarkerResult", results.get("error").getClassName()); assertEquals("/WEB-INF/location/namespace/no-annotation.ftl", results.get("error").getParams().get("location")); assertEquals(3, results.get("failure").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("success").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("success").getClassName()); assertEquals("/WEB-INF/location/namespace/no-annotation-failure.jsp", results.get("failure").getParams().get("location")); EasyMock.verify(context); @@ -243,7 +243,7 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals("success", results.get("success").getName()); assertEquals(3, results.get("success").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("success").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("success").getClassName()); assertEquals("/WEB-INF/location/namespace/no-annotation/success.jsp", results.get("success").getParams().get("location")); assertEquals(1, results.get("index").getParams().size()); @@ -251,7 +251,7 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals("/WEB-INF/location/namespace/no-annotation/index.ftl", results.get("index").getParams().get("location")); assertEquals(3, results.get("failure").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("success").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("success").getClassName()); assertEquals("/WEB-INF/location/namespace/no-annotation/failure.jsp", results.get("failure").getParams().get("location")); EasyMock.verify(context); } @@ -274,7 +274,7 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals(1, results.size()); assertEquals("success", results.get("success").getName()); assertEquals(3, results.get("success").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("success").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("success").getClassName()); assertEquals("/WEB-INF/location/namespace/no-annotation-success.jsp", results.get("success").getParams().get("location")); EasyMock.verify(context); @@ -296,7 +296,7 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals(1, results.size()); assertEquals("error", results.get("error").getName()); assertEquals(3, results.get("error").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("error").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("error").getClassName()); assertEquals("/WEB-INF/location/namespace/error.jsp", results.get("error").getParams().get("location")); assertEquals("value", results.get("error").getParams().get("key")); assertEquals("value1", results.get("error").getParams().get("key1")); @@ -319,7 +319,7 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals(1, results.size()); assertEquals("error", results.get("error").getName()); assertEquals(3, results.get("error").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("error").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("error").getClassName()); assertEquals("/WEB-INF/location/namespace/error.jsp", results.get("error").getParams().get("location")); assertEquals("value", results.get("error").getParams().get("key")); assertEquals("value1", results.get("error").getParams().get("key1")); @@ -342,7 +342,7 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals(1, results.size()); assertEquals("error", results.get("error").getName()); assertEquals(5, results.get("error").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("error").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("error").getClassName()); assertEquals("/WEB-INF/location/namespace/error.jsp", results.get("error").getParams().get("location")); assertEquals("value", results.get("error").getParams().get("key")); assertEquals("value1", results.get("error").getParams().get("key1")); @@ -370,21 +370,21 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals("success", results.get("success").getName()); assertEquals("failure", results.get("failure").getName()); assertEquals(3, results.get("error").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("error").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("error").getClassName()); assertEquals("/WEB-INF/location/namespace/error.jsp", results.get("error").getParams().get("location")); assertEquals("ann-value", results.get("error").getParams().get("key")); assertEquals("ann-value1", results.get("error").getParams().get("key1")); assertEquals(1, results.get("input").getParams().size()); assertEquals("foo.action", results.get("input").getParams().get("actionName")); - assertEquals("org.apache.struts2.dispatcher.ServletActionRedirectResult", results.get("input").getClassName()); + assertEquals("org.apache.struts2.result.ServletActionRedirectResult", results.get("input").getClassName()); assertEquals(3, results.get("failure").getParams().size()); assertEquals("/WEB-INF/location/namespace/action-failure.jsp", results.get("failure").getParams().get("location")); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("failure").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("failure").getClassName()); assertEquals("value", results.get("failure").getParams().get("key")); assertEquals("value1", results.get("failure").getParams().get("key1")); assertEquals(3, results.get("success").getParams().size()); assertEquals("/WEB-INF/location/namespace/action-success.jsp", results.get("success").getParams().get("location")); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("success").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("success").getClassName()); assertEquals("value", results.get("success").getParams().get("key")); assertEquals("value1", results.get("success").getParams().get("key1")); EasyMock.verify(context); @@ -409,21 +409,21 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals("success", results.get("success").getName()); assertEquals("failure", results.get("failure").getName()); assertEquals(3, results.get("error").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("error").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("error").getClassName()); assertEquals("/WEB-INF/location/namespace/error.jsp", results.get("error").getParams().get("location")); assertEquals("ann-value", results.get("error").getParams().get("key")); assertEquals("ann-value1", results.get("error").getParams().get("key1")); assertEquals(1, results.get("input").getParams().size()); assertEquals("foo.action", results.get("input").getParams().get("actionName")); - assertEquals("org.apache.struts2.dispatcher.ServletActionRedirectResult", results.get("input").getClassName()); + assertEquals("org.apache.struts2.result.ServletActionRedirectResult", results.get("input").getClassName()); assertEquals(3, results.get("failure").getParams().size()); assertEquals("/WEB-INF/location/namespace/action-failure.jsp", results.get("failure").getParams().get("location")); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("failure").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("failure").getClassName()); assertEquals("value", results.get("failure").getParams().get("key")); assertEquals("value1", results.get("failure").getParams().get("key1")); assertEquals(3, results.get("success").getParams().size()); assertEquals("/WEB-INF/location/namespace/action-success.jsp", results.get("success").getParams().get("location")); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("success").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("success").getClassName()); assertEquals("value", results.get("success").getParams().get("key")); assertEquals("value1", results.get("success").getParams().get("key1")); EasyMock.verify(context); @@ -445,7 +445,7 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals(1, results.size()); assertEquals("success", results.get("success").getName()); assertEquals(3, results.get("success").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("success").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("success").getClassName()); assertEquals("/WEB-INF/location/namespace/action-success.jsp", results.get("success").getParams().get("location")); assertEquals("value", results.get("success").getParams().get("key")); assertEquals("value1", results.get("success").getParams().get("key1")); @@ -471,26 +471,26 @@ public class DefaultResultMapBuilderTest extends TestCase { assertEquals("success", results.get("success").getName()); assertEquals("failure", results.get("failure").getName()); assertEquals(3, results.get("error").getParams().size()); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("error").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("error").getClassName()); assertEquals("/WEB-INF/location/namespace/error.jsp", results.get("error").getParams().get("location")); assertEquals("value", results.get("success").getParams().get("key")); assertEquals("value1", results.get("success").getParams().get("key1")); assertEquals(1, results.get("input").getParams().size()); assertEquals("foo.action", results.get("input").getParams().get("actionName")); - assertEquals("org.apache.struts2.dispatcher.ServletActionRedirectResult", results.get("input").getClassName()); + assertEquals("org.apache.struts2.result.ServletActionRedirectResult", results.get("input").getClassName()); assertEquals(3, results.get("failure").getParams().size()); assertEquals("/WEB-INF/location/namespace/action-failure.jsp", results.get("failure").getParams().get("location")); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("failure").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("failure").getClassName()); assertEquals(3, results.get("success").getParams().size()); assertEquals("/WEB-INF/location/namespace/action-success.jsp", results.get("success").getParams().get("location")); - assertEquals("org.apache.struts2.dispatcher.ServletDispatcherResult", results.get("success").getClassName()); + assertEquals("org.apache.struts2.result.ServletDispatcherResult", results.get("success").getClassName()); EasyMock.verify(context); } public void testClassPath() throws Exception { ServletContext context = EasyMock.createNiceMock(ServletContext.class); - ResultTypeConfig resultType = new ResultTypeConfig.Builder("freemarker", "org.apache.struts2.dispatcher.ServletDispatcherResult"). + ResultTypeConfig resultType = new ResultTypeConfig.Builder("freemarker", "org.apache.struts2.result.ServletDispatcherResult"). defaultResultParam("location").build(); PackageConfig packageConfig = new PackageConfig.Builder("package"). defaultResultType("dispatcher").addResultTypeConfig(resultType).build(); @@ -514,11 +514,11 @@ public class DefaultResultMapBuilderTest extends TestCase { } private PackageConfig createPackageConfigBuilder(String namespace) { - ResultTypeConfig resultType = new ResultTypeConfig.Builder("dispatcher", "org.apache.struts2.dispatcher.ServletDispatcherResult"). + ResultTypeConfig resultType = new ResultTypeConfig.Builder("dispatcher", "org.apache.struts2.result.ServletDispatcherResult"). addParam("key", "value").addParam("key1", "value1").defaultResultParam("location").build(); ResultTypeConfig redirect = new ResultTypeConfig.Builder("redirectAction", - "org.apache.struts2.dispatcher.ServletActionRedirectResult").defaultResultParam("actionName").build(); + "org.apache.struts2.result.ServletActionRedirectResult").defaultResultParam("actionName").build(); ResultTypeConfig ftlResultType = new ResultTypeConfig.Builder("freemarker", "org.apache.struts2.views.freemarker.FreemarkerResult").defaultResultParam("location").build(); diff --git a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java index 7fbd420a3..38403a035 100644 --- a/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java +++ b/plugins/convention/src/test/java/org/apache/struts2/convention/PackageBasedActionConfigBuilderTest.java @@ -65,7 +65,7 @@ import org.apache.struts2.convention.actions.transactions.TransNameAction; import org.apache.struts2.convention.annotation.Action; import org.apache.struts2.convention.annotation.Actions; import org.apache.struts2.convention.dontfind.DontFindMeAction; -import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.struts2.result.ServletDispatcherResult; import org.easymock.EasyMock; import javax.servlet.ServletContext; diff --git a/plugins/embeddedjsp/src/main/java/org/apache/struts2/EmbeddedJSPResult.java b/plugins/embeddedjsp/src/main/java/org/apache/struts2/EmbeddedJSPResult.java index c402cb541..7be09103f 100644 --- a/plugins/embeddedjsp/src/main/java/org/apache/struts2/EmbeddedJSPResult.java +++ b/plugins/embeddedjsp/src/main/java/org/apache/struts2/EmbeddedJSPResult.java @@ -22,7 +22,7 @@ package org.apache.struts2; import com.opensymphony.xwork2.ActionInvocation; import org.apache.commons.lang3.StringUtils; -import org.apache.struts2.dispatcher.StrutsResultSupport; +import org.apache.struts2.result.StrutsResultSupport; /** * Can render jsps from the classpath. "includes" in the jsps must not use relative paths diff --git a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java index 56cd4b06f..a8492af4a 100644 --- a/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java +++ b/plugins/jasperreports/src/main/java/org/apache/struts2/views/jasperreports/JasperReportsResult.java @@ -32,11 +32,10 @@ import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; -import org.apache.struts2.dispatcher.StrutsResultSupport; +import org.apache.struts2.result.StrutsResultSupport; import javax.servlet.ServletContext; import javax.servlet.ServletException; -import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; diff --git a/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java b/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java index 76c2936c9..4a1886efc 100644 --- a/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java +++ b/plugins/jfreechart/src/main/java/org/apache/struts2/dispatcher/ChartResult.java @@ -25,6 +25,7 @@ import org.apache.struts2.ServletActionContext; import com.opensymphony.xwork2.ActionInvocation; import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; +import org.apache.struts2.result.StrutsResultSupport; import org.jfree.chart.ChartUtilities; import org.jfree.chart.JFreeChart; @@ -247,4 +248,4 @@ public class ChartResult extends StrutsResultSupport { } } -} \ No newline at end of file +} diff --git a/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java b/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java index c08a99bb3..d10693ceb 100644 --- a/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java +++ b/plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java @@ -3,7 +3,7 @@ package org.apache.struts2.views.tiles; import com.opensymphony.xwork2.ActionInvocation; import freemarker.template.TemplateException; import org.apache.struts2.ServletActionContext; -import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.struts2.result.ServletDispatcherResult; import org.apache.struts2.portlet.PortletConstants; import org.apache.struts2.portlet.context.PortletActionContext; import org.apache.tiles.TilesContainer; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java index 04729c1f5..5ef5a1a95 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletActionRedirectResult.java @@ -23,7 +23,7 @@ package org.apache.struts2.portlet.result; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.config.entities.ResultConfig; import com.opensymphony.xwork2.inject.Inject; -import org.apache.struts2.dispatcher.ServletActionRedirectResult; +import org.apache.struts2.result.ServletActionRedirectResult; import org.apache.struts2.dispatcher.mapper.ActionMapper; import org.apache.struts2.dispatcher.mapper.ActionMapping; import org.apache.struts2.portlet.PortletConstants; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java index 7fa233678..50fa2230a 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletResult.java @@ -26,7 +26,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.apache.commons.lang3.StringUtils; import org.apache.struts2.ServletActionContext; -import org.apache.struts2.dispatcher.StrutsResultSupport; +import org.apache.struts2.result.StrutsResultSupport; import org.apache.struts2.portlet.PortletConstants; import org.apache.struts2.portlet.PortletPhase; import org.apache.struts2.portlet.context.PortletActionContext; diff --git a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java index 2d43c2781..ccfec82fa 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/portlet/result/PortletVelocityResult.java @@ -28,7 +28,7 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsConstants; -import org.apache.struts2.dispatcher.StrutsResultSupport; +import org.apache.struts2.result.StrutsResultSupport; import org.apache.struts2.portlet.PortletConstants; import org.apache.struts2.portlet.PortletPhase; import org.apache.struts2.portlet.context.PortletActionContext; @@ -115,7 +115,7 @@ public class PortletVelocityResult extends StrutsResultSupport { } /* (non-Javadoc) - * @see org.apache.struts2.dispatcher.StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation) + * @see org.apache.struts2.result.StrutsResultSupport#doExecute(java.lang.String, com.opensymphony.xwork2.ActionInvocation) */ public void doExecute(String location, ActionInvocation invocation) throws Exception { PortletPhase phase = PortletActionContext.getPhase(); diff --git a/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java b/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java index 71d0cee64..036bd1454 100644 --- a/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java +++ b/plugins/portlet/src/main/java/org/apache/struts2/views/freemarker/PortletFreemarkerResult.java @@ -30,7 +30,7 @@ import freemarker.template.TemplateException; import freemarker.template.TemplateModel; import freemarker.template.TemplateModelException; import org.apache.struts2.ServletActionContext; -import org.apache.struts2.dispatcher.StrutsResultSupport; +import org.apache.struts2.result.StrutsResultSupport; import org.apache.struts2.portlet.PortletConstants; import org.apache.struts2.portlet.PortletPhase; import org.apache.struts2.portlet.context.PortletActionContext; diff --git a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java index 65e608487..c5a687f5b 100644 --- a/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java +++ b/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java @@ -32,7 +32,7 @@ import org.apache.commons.lang3.BooleanUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.struts2.ServletActionContext; -import org.apache.struts2.dispatcher.HttpHeaderResult; +import org.apache.struts2.result.HttpHeaderResult; import org.apache.struts2.rest.handler.ContentTypeHandler; import org.apache.struts2.rest.handler.HtmlHandler; diff --git a/plugins/rest/src/main/resources/struts-plugin.xml b/plugins/rest/src/main/resources/struts-plugin.xml index 1e95d4eaf..0f0937e11 100644 --- a/plugins/rest/src/main/resources/struts-plugin.xml +++ b/plugins/rest/src/main/resources/struts-plugin.xml @@ -48,10 +48,10 @@ - + 303 - + 303 diff --git a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java index 6db05f159..1ebdc94ef 100644 --- a/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java +++ b/plugins/rest/src/test/java/org/apache/struts2/rest/RestActionInvocationTest.java @@ -14,7 +14,7 @@ import com.opensymphony.xwork2.ognl.OgnlUtil; import com.opensymphony.xwork2.util.XWorkTestCaseHelper; import junit.framework.TestCase; import org.apache.struts2.ServletActionContext; -import org.apache.struts2.dispatcher.HttpHeaderResult; +import org.apache.struts2.result.HttpHeaderResult; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -174,7 +174,7 @@ public class RestActionInvocationTest extends TestCase { restActionInvocation.setDefaultErrorResultName("default-error"); ResultConfig resultConfig = new ResultConfig.Builder("default-error", - "org.apache.struts2.dispatcher.HttpHeaderResult") + "org.apache.struts2.result.HttpHeaderResult") .addParam("status", "123").build(); ActionConfig actionConfig = new ActionConfig.Builder("org.apache.rest", "RestAction", "org.apache.rest.RestAction") @@ -219,7 +219,7 @@ public class RestActionInvocationTest extends TestCase { // Define result 'success' ResultConfig resultConfig = new ResultConfig.Builder("success", - "org.apache.struts2.dispatcher.HttpHeaderResult") + "org.apache.struts2.result.HttpHeaderResult") .addParam("status", "123").build(); ActionConfig actionConfig = new ActionConfig.Builder("org.apache.rest", "RestAction", "org.apache.rest.RestAction") diff --git a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java index 6135302a9..490de7966 100644 --- a/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java +++ b/plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts2.ServletActionContext; -import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.struts2.result.ServletDispatcherResult; import org.apache.tiles.TilesContainer; import org.apache.tiles.access.TilesAccess; diff --git a/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java b/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java index a774edbe7..6bc15bb4e 100644 --- a/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java +++ b/plugins/tiles3/src/main/java/org/apache/struts2/views/tiles/TilesResult.java @@ -23,7 +23,7 @@ package org.apache.struts2.views.tiles; import com.opensymphony.xwork2.ActionInvocation; import org.apache.struts2.ServletActionContext; -import org.apache.struts2.dispatcher.ServletDispatcherResult; +import org.apache.struts2.result.ServletDispatcherResult; import org.apache.tiles.TilesContainer; import org.apache.tiles.access.TilesAccess; import org.apache.tiles.request.ApplicationContext;