From b532ad06b7172e5de3dc9aa7e27b80ebe272adaf Mon Sep 17 00:00:00 2001 From: Lukasz Lenart Date: Tue, 23 Jun 2015 17:39:39 +0200 Subject: [PATCH] WW-4518 Moves classes to proper packages --- .../{impl => factory}/PrefixBasedActionProxyFactory.java | 2 +- .../apache/struts2/{impl => factory}/StrutsActionProxy.java | 2 +- .../struts2/{impl => factory}/StrutsActionProxyFactory.java | 2 +- .../apache/struts2/interceptor/ServletConfigInterceptor.java | 2 +- .../servlet}/ServletPrincipalProxy.java | 2 +- core/src/main/resources/struts-default.xml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) rename core/src/main/java/org/apache/struts2/{impl => factory}/PrefixBasedActionProxyFactory.java (99%) rename core/src/main/java/org/apache/struts2/{impl => factory}/StrutsActionProxy.java (98%) rename core/src/main/java/org/apache/struts2/{impl => factory}/StrutsActionProxyFactory.java (97%) rename core/src/main/java/org/apache/struts2/{servlet/interceptor => interceptor/servlet}/ServletPrincipalProxy.java (97%) diff --git a/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java b/core/src/main/java/org/apache/struts2/factory/PrefixBasedActionProxyFactory.java similarity index 99% rename from core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java rename to core/src/main/java/org/apache/struts2/factory/PrefixBasedActionProxyFactory.java index 02f39a81d..5aa165066 100644 --- a/core/src/main/java/org/apache/struts2/impl/PrefixBasedActionProxyFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/PrefixBasedActionProxyFactory.java @@ -1,4 +1,4 @@ -package org.apache.struts2.impl; +package org.apache.struts2.factory; import com.opensymphony.xwork2.ActionProxy; import com.opensymphony.xwork2.ActionProxyFactory; diff --git a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java b/core/src/main/java/org/apache/struts2/factory/StrutsActionProxy.java similarity index 98% rename from core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java rename to core/src/main/java/org/apache/struts2/factory/StrutsActionProxy.java index 3b60387f8..52f2efbf0 100644 --- a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxy.java +++ b/core/src/main/java/org/apache/struts2/factory/StrutsActionProxy.java @@ -21,7 +21,7 @@ // Copyright 2006 Google Inc. All Rights Reserved. -package org.apache.struts2.impl; +package org.apache.struts2.factory; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; diff --git a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java b/core/src/main/java/org/apache/struts2/factory/StrutsActionProxyFactory.java similarity index 97% rename from core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java rename to core/src/main/java/org/apache/struts2/factory/StrutsActionProxyFactory.java index 7df930d49..5d00ddee9 100644 --- a/core/src/main/java/org/apache/struts2/impl/StrutsActionProxyFactory.java +++ b/core/src/main/java/org/apache/struts2/factory/StrutsActionProxyFactory.java @@ -21,7 +21,7 @@ // Copyright 2006 Google Inc. All Rights Reserved. -package org.apache.struts2.impl; +package org.apache.struts2.factory; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.ActionProxy; diff --git a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java index df45347b0..12f3cbfdf 100644 --- a/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java +++ b/core/src/main/java/org/apache/struts2/interceptor/ServletConfigInterceptor.java @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.struts2.StrutsStatics; -import org.apache.struts2.servlet.interceptor.ServletPrincipalProxy; +import org.apache.struts2.interceptor.servlet.ServletPrincipalProxy; import org.apache.struts2.util.ServletContextAware; import com.opensymphony.xwork2.ActionContext; diff --git a/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java b/core/src/main/java/org/apache/struts2/interceptor/servlet/ServletPrincipalProxy.java similarity index 97% rename from core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java rename to core/src/main/java/org/apache/struts2/interceptor/servlet/ServletPrincipalProxy.java index 953ef5e82..59eb9acfd 100644 --- a/core/src/main/java/org/apache/struts2/servlet/interceptor/ServletPrincipalProxy.java +++ b/core/src/main/java/org/apache/struts2/interceptor/servlet/ServletPrincipalProxy.java @@ -19,7 +19,7 @@ * under the License. */ -package org.apache.struts2.servlet.interceptor; +package org.apache.struts2.interceptor.servlet; import org.apache.struts2.interceptor.PrincipalProxy; diff --git a/core/src/main/resources/struts-default.xml b/core/src/main/resources/struts-default.xml index 33057cb42..ca2a6544f 100644 --- a/core/src/main/resources/struts-default.xml +++ b/core/src/main/resources/struts-default.xml @@ -65,8 +65,8 @@ - - + +