Author: mrdon
Date: Mon Jul 7 07:10:42 2008
New Revision: 674498
URL: http://svn.apache.org/viewvc?rev=674498&view=rev
Log:
Repackaging new dispatchers, adding "unsupported" servlet dispatcher, fixing a
spring issue where
it was needlessly tied to WebApplicationContext and a rest issue where the
autowiring of returned
result objects wasn't copied into the rest plugin from xwork
WW-2193
Added:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/HostConfig.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/FilterHostConfig.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/StrutsExecuteFilter.java
- copied, changed from r674291,
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/filter/StrutsPrepareAndExecuteFilter.java
- copied, changed from r674291,
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/filter/StrutsPrepareFilter.java
- copied, changed from r674291,
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/servlet/
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/ServletHostConfig.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java
Removed:
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
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/rest-showcase/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/DefaultStaticContentLoader.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/StaticContentLoader.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/InitOperations.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
struts/struts2/trunk/plugins/rest/src/main/java/org/apache/struts2/rest/RestActionInvocation.java
struts/struts2/trunk/plugins/spring/src/main/java/org/apache/struts2/spring/StrutsSpringObjectFactory.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=674498&r1=674497&r2=674498&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 Mon Jul 7
07:10:42 2008
@@ -5,7 +5,7 @@
struts2
-
org.apache.struts2.dispatcher.ng.StrutsPrepareAndExecuteFilter
+
org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
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=674498&r1=674497&r2=674498&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 Mon
Jul 7 07:10:42 2008
@@ -7,7 +7,7 @@
Struts2
-org.apache.struts2.dispatcher.ng.StrutsPrepareAndExecuteFilter
+
org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
Modified:
struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/rest-showcase/src/main/webapp/WEB-INF/web.xml?rev=674498&r1=674497&r2=674498&view=diff
===