Author: mrdon
Date: Sat Jul 5 20:54:31 2008
New Revision: 674254
URL: http://svn.apache.org/viewvc?rev=674254&view=rev
Log:
Choosing better package name for next-generation dispatchers
WW-2193
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/
- copied from r674251,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/
- copied from r674251,
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/filter/
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/dispatcher/ng/
- copied from r674251,
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/dispatcher/filter/
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/filter/
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/filter/
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/dispatcher/filter/
Modified:
struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsExecuteFilter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareFilter.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/package-info.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilterIntegrationTest.java
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/TwoFilterIntegrationTest.java
Modified: struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml?rev=674254&r1=674253&r2=674254&view=diff
==============================================================================
--- struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml (original)
+++ struts/struts2/trunk/apps/blank/src/main/webapp/WEB-INF/web.xml Sat Jul 5
20:54:31 2008
@@ -5,7 +5,7 @@
<filter>
<filter-name>struts2</filter-name>
-
<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
+
<filter-class>org.apache.struts2.dispatcher.ng.StrutsPrepareAndExecuteFilter</filter-class>
</filter>
<filter-mapping>
Modified: struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml?rev=674254&r1=674253&r2=674254&view=diff
==============================================================================
--- struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml
(original)
+++ struts/struts2/trunk/apps/mailreader/src/main/webapp/WEB-INF/web.xml Sat
Jul 5 20:54:31 2008
@@ -7,7 +7,7 @@
<filter>
<filter-name>Struts2</filter-name>
<filter-class>
- org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
+ org.apache.struts2.dispatcher.ng.StrutsPrepareAndExecuteFilter
</filter-class>
</filter>
Modified: struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml?rev=674254&r1=674253&r2=674254&view=diff
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml
(original)
+++ struts/struts2/trunk/apps/showcase/src/main/webapp/WEB-INF/web.xml Sat Jul
5 20:54:31 2008
@@ -8,7 +8,7 @@
<filter>
<filter-name>struts-prepare</filter-name>
-
<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</filter-class>
+
<filter-class>org.apache.struts2.dispatcher.ng.StrutsPrepareFilter</filter-class>
<init-param>
<param-name>actionPackages</param-name>
<param-value>org.apache.struts2.showcase.person</param-value>
@@ -17,7 +17,7 @@
<filter>
<filter-name>struts-execute</filter-name>
-
<filter-class>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</filter-class>
+
<filter-class>org.apache.struts2.dispatcher.ng.StrutsExecuteFilter</filter-class>
</filter>
<filter>
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java?rev=674254&r1=674253&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ActionContextCleanUp.java
Sat Jul 5 20:54:31 2008
@@ -59,13 +59,13 @@
* <!-- SNIPPET END: description -->
*
*
- * @deprecated Since Struts 2.1.3, use [EMAIL PROTECTED]
org.apache.struts2.dispatcher.filter.StrutsPrepareFilter} and
- * [EMAIL PROTECTED] org.apache.struts2.dispatcher.filter.StrutsExecuteFilter}
to use other Servlet filters that need access to
+ * @deprecated Since Struts 2.1.3, use [EMAIL PROTECTED]
org.apache.struts2.dispatcher.ng.StrutsPrepareFilter} and
+ * [EMAIL PROTECTED] org.apache.struts2.dispatcher.ng.StrutsExecuteFilter} to
use other Servlet filters that need access to
* the ActionContext
* @see FilterDispatcher
* @see Dispatcher
- * @see org.apache.struts2.dispatcher.filter.StrutsPrepareFilter
- * @see org.apache.struts2.dispatcher.filter.StrutsExecuteFilter
+ * @see org.apache.struts2.dispatcher.ng.StrutsPrepareFilter
+ * @see org.apache.struts2.dispatcher.ng.StrutsExecuteFilter
*
* @version $Date$ $Id$
*/
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java?rev=674254&r1=674253&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/FilterDispatcher.java
Sat Jul 5 20:54:31 2008
@@ -22,16 +22,9 @@
package org.apache.struts2.dispatcher;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URLDecoder;
-import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Enumeration;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.StringTokenizer;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
@@ -44,7 +37,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.struts2.RequestUtils;
-import org.apache.struts2.StrutsConstants;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.dispatcher.mapper.ActionMapper;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
@@ -52,10 +44,8 @@
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.config.Configuration;
-import com.opensymphony.xwork2.config.ConfigurationException;
import com.opensymphony.xwork2.config.ConfigurationProvider;
import com.opensymphony.xwork2.inject.Inject;
-import com.opensymphony.xwork2.util.ClassLoaderUtil;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
import com.opensymphony.xwork2.util.logging.Logger;
@@ -146,15 +136,15 @@
* the subclass.
*
* @version $Date$ $Id$
- * @deprecated Since Struts 2.1.3, use [EMAIL PROTECTED]
org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter} instead or
- * [EMAIL PROTECTED] org.apache.struts2.dispatcher.filter.StrutsPrepareFilter}
and [EMAIL PROTECTED] org.apache.struts2.dispatcher.filter.StrutsExecuteFilter}
+ * @deprecated Since Struts 2.1.3, use [EMAIL PROTECTED]
org.apache.struts2.dispatcher.ng.StrutsPrepareAndExecuteFilter} instead or
+ * [EMAIL PROTECTED] org.apache.struts2.dispatcher.ng.StrutsPrepareFilter} and
[EMAIL PROTECTED] org.apache.struts2.dispatcher.ng.StrutsExecuteFilter}
* if needing using the [EMAIL PROTECTED] ActionContextCleanUp} filter in
addition to this one
*
* @see ActionMapper
* @see ActionContextCleanUp
- * @see org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
- * @see org.apache.struts2.dispatcher.filter.StrutsPrepareFilter
- * @see org.apache.struts2.dispatcher.filter.StrutsExecuteFilter
+ * @see org.apache.struts2.dispatcher.ng.StrutsPrepareAndExecuteFilter
+ * @see org.apache.struts2.dispatcher.ng.StrutsPrepareFilter
+ * @see org.apache.struts2.dispatcher.ng.StrutsExecuteFilter
*/
public class FilterDispatcher implements StrutsStatics, Filter {
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java?rev=674254&r1=674251&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/ExecuteOperations.java
Sat Jul 5 20:54:31 2008
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.filter;
+package org.apache.struts2.dispatcher.ng;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.StaticContentLoader;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java?rev=674254&r1=674251&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.java
Sat Jul 5 20:54:31 2008
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.filter;
+package org.apache.struts2.dispatcher.ng;
import com.opensymphony.xwork2.util.logging.LoggerFactory;
import com.opensymphony.xwork2.ActionContext;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java?rev=674254&r1=674251&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
Sat Jul 5 20:54:31 2008
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.filter;
+package org.apache.struts2.dispatcher.ng;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsExecuteFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsExecuteFilter.java?rev=674254&r1=674251&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsExecuteFilter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsExecuteFilter.java
Sat Jul 5 20:54:31 2008
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.filter;
+package org.apache.struts2.dispatcher.ng;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.dispatcher.Dispatcher;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilter.java?rev=674254&r1=674251&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilter.java
Sat Jul 5 20:54:31 2008
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.filter;
+package org.apache.struts2.dispatcher.ng;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.dispatcher.Dispatcher;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareFilter.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareFilter.java?rev=674254&r1=674251&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareFilter.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/StrutsPrepareFilter.java
Sat Jul 5 20:54:31 2008
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.filter;
+package org.apache.struts2.dispatcher.ng;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.dispatcher.Dispatcher;
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/package-info.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/package-info.java?rev=674254&r1=674251&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/package-info.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/package-info.java
Sat Jul 5 20:54:31 2008
@@ -67,4 +67,4 @@
* </pre>
*
*/
-package org.apache.struts2.dispatcher.filter;
\ No newline at end of file
+package org.apache.struts2.dispatcher.ng;
\ No newline at end of file
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilterIntegrationTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilterIntegrationTest.java?rev=674254&r1=674251&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilterIntegrationTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilterIntegrationTest.java
Sat Jul 5 20:54:31 2008
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.filter;
+package org.apache.struts2.dispatcher.ng;
import com.opensymphony.xwork2.ActionContext;
import junit.framework.TestCase;
Modified:
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/TwoFilterIntegrationTest.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/TwoFilterIntegrationTest.java?rev=674254&r1=674251&r2=674254&view=diff
==============================================================================
---
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/TwoFilterIntegrationTest.java
(original)
+++
struts/struts2/trunk/core/src/test/java/org/apache/struts2/dispatcher/ng/TwoFilterIntegrationTest.java
Sat Jul 5 20:54:31 2008
@@ -18,11 +18,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.filter;
+package org.apache.struts2.dispatcher.ng;
import com.opensymphony.xwork2.ActionContext;
-import com.opensymphony.xwork2.util.ValueStack;
-import com.opensymphony.xwork2.util.ValueStackFactory;
import junit.framework.TestCase;
import org.apache.struts2.dispatcher.Dispatcher;
import org.springframework.mock.web.*;
@@ -31,8 +29,6 @@
import java.io.IOException;
import java.util.LinkedList;
import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Collections;
/**
* Integration tests for the filter
