You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2015/08/25 08:47:15 UTC

[1/2] struts-examples git commit: Adds missing dependency

Repository: struts-examples
Updated Branches:
  refs/heads/master 56b22f011 -> cbe3f886d


Adds missing dependency


Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/10eac367
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/10eac367
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/10eac367

Branch: refs/heads/master
Commit: 10eac3678b2ed9b2af43dc266976e640dd31b875
Parents: 56b22f0
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Tue Aug 25 08:45:51 2015 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Tue Aug 25 08:45:51 2015 +0200

----------------------------------------------------------------------
 unit-testing/pom.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/10eac367/unit-testing/pom.xml
----------------------------------------------------------------------
diff --git a/unit-testing/pom.xml b/unit-testing/pom.xml
index 933e5ef..f31d155 100644
--- a/unit-testing/pom.xml
+++ b/unit-testing/pom.xml
@@ -34,7 +34,11 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>jsp-api</artifactId>
 			<version>2.0</version>
-			<type>jar</type>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.geronimo.specs</groupId>
+			<artifactId>geronimo-servlet_3.0_spec</artifactId>
+			<version>1.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>


[2/2] struts-examples git commit: Updates filter definition to reflect new filter's localtion

Posted by lu...@apache.org.
Updates filter definition to reflect new filter's localtion


Project: http://git-wip-us.apache.org/repos/asf/struts-examples/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts-examples/commit/cbe3f886
Tree: http://git-wip-us.apache.org/repos/asf/struts-examples/tree/cbe3f886
Diff: http://git-wip-us.apache.org/repos/asf/struts-examples/diff/cbe3f886

Branch: refs/heads/master
Commit: cbe3f886d595811d04f247650e0fc217b1c72326
Parents: 10eac36
Author: Lukasz Lenart <lu...@gmail.com>
Authored: Tue Aug 25 08:47:05 2015 +0200
Committer: Lukasz Lenart <lu...@gmail.com>
Committed: Tue Aug 25 08:47:05 2015 +0200

----------------------------------------------------------------------
 annotations/src/main/webapp/WEB-INF/web.xml               | 2 +-
 basic-struts/src/main/webapp/WEB-INF/web.xml              | 2 +-
 bean-validation/src/main/webapp/WEB-INF/web.xml           | 2 +-
 blank/src/main/webapp/WEB-INF/web.xml                     | 2 +-
 coding-actions/src/main/webapp/WEB-INF/web.xml            | 2 +-
 control-tags/src/main/webapp/WEB-INF/web.xml              | 2 +-
 debugging-struts/src/main/webapp/WEB-INF/web.xml          | 2 +-
 exception-handling/src/main/webapp/WEB-INF/web.xml        | 2 +-
 exclude-parameters/src/main/webapp/WEB-INF/web.xml        | 2 +-
 form-processing/src/main/webapp/WEB-INF/web.xml           | 2 +-
 form-tags/src/main/webapp/WEB-INF/web.xml                 | 2 +-
 form-validation/src/main/webapp/WEB-INF/web.xml           | 2 +-
 form-xml-validation/src/main/webapp/WEB-INF/web.xml       | 2 +-
 helloworld/src/main/webapp/WEB-INF/web.xml                | 2 +-
 http-session/src/main/webapp/WEB-INF/web.xml              | 2 +-
 interceptors/src/main/webapp/WEB-INF/web.xml              | 2 +-
 jboss-blank/src/main/webapp/WEB-INF/web.xml               | 2 +-
 mailreader/src/main/webapp/WEB-INF/web.xml                | 2 +-
 message-resource/src/main/webapp/WEB-INF/web.xml          | 2 +-
 preparable-interface/src/main/webapp/WEB-INF/web.xml      | 2 +-
 restful2actionmapper/src/main/webapp/WEB-INF/web.xml      | 2 +-
 spring-struts/src/main/webapp/WEB-INF/web.xml             | 2 +-
 themes-override/src/main/webapp/WEB-INF/web.xml           | 2 +-
 themes/src/main/webapp/WEB-INF/web.xml                    | 2 +-
 unit-testing/src/main/webapp/WEB-INF/web.xml              | 2 +-
 using-tags/src/main/webapp/WEB-INF/web.xml                | 2 +-
 wildcard-method-selection/src/main/webapp/WEB-INF/web.xml | 2 +-
 27 files changed, 27 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/annotations/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/annotations/src/main/webapp/WEB-INF/web.xml b/annotations/src/main/webapp/WEB-INF/web.xml
index f67db04..5faa02d 100644
--- a/annotations/src/main/webapp/WEB-INF/web.xml
+++ b/annotations/src/main/webapp/WEB-INF/web.xml
@@ -10,7 +10,7 @@
 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
         <init-param>
             <param-name>struts.devMode</param-name>
             <param-value>true</param-value>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/basic-struts/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/basic-struts/src/main/webapp/WEB-INF/web.xml b/basic-struts/src/main/webapp/WEB-INF/web.xml
index 51648d3..b2d5468 100644
--- a/basic-struts/src/main/webapp/WEB-INF/web.xml
+++ b/basic-struts/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/bean-validation/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/bean-validation/src/main/webapp/WEB-INF/web.xml b/bean-validation/src/main/webapp/WEB-INF/web.xml
index 392d030..f2fd98e 100755
--- a/bean-validation/src/main/webapp/WEB-INF/web.xml
+++ b/bean-validation/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/blank/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/blank/src/main/webapp/WEB-INF/web.xml b/blank/src/main/webapp/WEB-INF/web.xml
index 301bcb2..884eff9 100644
--- a/blank/src/main/webapp/WEB-INF/web.xml
+++ b/blank/src/main/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
     <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/coding-actions/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/coding-actions/src/main/webapp/WEB-INF/web.xml b/coding-actions/src/main/webapp/WEB-INF/web.xml
index 3afdf0e..4241d94 100644
--- a/coding-actions/src/main/webapp/WEB-INF/web.xml
+++ b/coding-actions/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/control-tags/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/control-tags/src/main/webapp/WEB-INF/web.xml b/control-tags/src/main/webapp/WEB-INF/web.xml
index 3ec15e2..2692584 100755
--- a/control-tags/src/main/webapp/WEB-INF/web.xml
+++ b/control-tags/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/debugging-struts/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/debugging-struts/src/main/webapp/WEB-INF/web.xml b/debugging-struts/src/main/webapp/WEB-INF/web.xml
index 8dfa91c..4daa5a2 100644
--- a/debugging-struts/src/main/webapp/WEB-INF/web.xml
+++ b/debugging-struts/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/exception-handling/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/exception-handling/src/main/webapp/WEB-INF/web.xml b/exception-handling/src/main/webapp/WEB-INF/web.xml
index abfd1f4..58d2ff9 100644
--- a/exception-handling/src/main/webapp/WEB-INF/web.xml
+++ b/exception-handling/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/exclude-parameters/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/exclude-parameters/src/main/webapp/WEB-INF/web.xml b/exclude-parameters/src/main/webapp/WEB-INF/web.xml
index 3e29883..07832e2 100644
--- a/exclude-parameters/src/main/webapp/WEB-INF/web.xml
+++ b/exclude-parameters/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/form-processing/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/form-processing/src/main/webapp/WEB-INF/web.xml b/form-processing/src/main/webapp/WEB-INF/web.xml
index 84fe881..1ab7137 100644
--- a/form-processing/src/main/webapp/WEB-INF/web.xml
+++ b/form-processing/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/form-tags/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/form-tags/src/main/webapp/WEB-INF/web.xml b/form-tags/src/main/webapp/WEB-INF/web.xml
index 7edd933..a0db30c 100644
--- a/form-tags/src/main/webapp/WEB-INF/web.xml
+++ b/form-tags/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/form-validation/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/form-validation/src/main/webapp/WEB-INF/web.xml b/form-validation/src/main/webapp/WEB-INF/web.xml
index 90c6644..63b1721 100644
--- a/form-validation/src/main/webapp/WEB-INF/web.xml
+++ b/form-validation/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/form-xml-validation/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/form-xml-validation/src/main/webapp/WEB-INF/web.xml b/form-xml-validation/src/main/webapp/WEB-INF/web.xml
index 452d0d7..fe966a8 100644
--- a/form-xml-validation/src/main/webapp/WEB-INF/web.xml
+++ b/form-xml-validation/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/helloworld/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/helloworld/src/main/webapp/WEB-INF/web.xml b/helloworld/src/main/webapp/WEB-INF/web.xml
index 76ef3cd..3bf270d 100755
--- a/helloworld/src/main/webapp/WEB-INF/web.xml
+++ b/helloworld/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/http-session/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/http-session/src/main/webapp/WEB-INF/web.xml b/http-session/src/main/webapp/WEB-INF/web.xml
index c80f689..f8f58df 100644
--- a/http-session/src/main/webapp/WEB-INF/web.xml
+++ b/http-session/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/interceptors/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/interceptors/src/main/webapp/WEB-INF/web.xml b/interceptors/src/main/webapp/WEB-INF/web.xml
index b181d24..fe900c9 100644
--- a/interceptors/src/main/webapp/WEB-INF/web.xml
+++ b/interceptors/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/jboss-blank/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/jboss-blank/src/main/webapp/WEB-INF/web.xml b/jboss-blank/src/main/webapp/WEB-INF/web.xml
index d1cf020..7f4ac3f 100644
--- a/jboss-blank/src/main/webapp/WEB-INF/web.xml
+++ b/jboss-blank/src/main/webapp/WEB-INF/web.xml
@@ -5,7 +5,7 @@
 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
     <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/mailreader/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/mailreader/src/main/webapp/WEB-INF/web.xml b/mailreader/src/main/webapp/WEB-INF/web.xml
index b01d864..da4a0e1 100644
--- a/mailreader/src/main/webapp/WEB-INF/web.xml
+++ b/mailreader/src/main/webapp/WEB-INF/web.xml
@@ -7,7 +7,7 @@
     <filter>
         <filter-name>Struts2</filter-name>
         <filter-class>
-            org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter
+            org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter
         </filter-class>
     </filter>
 

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/message-resource/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/message-resource/src/main/webapp/WEB-INF/web.xml b/message-resource/src/main/webapp/WEB-INF/web.xml
index 315ec50..70f9274 100644
--- a/message-resource/src/main/webapp/WEB-INF/web.xml
+++ b/message-resource/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/preparable-interface/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/preparable-interface/src/main/webapp/WEB-INF/web.xml b/preparable-interface/src/main/webapp/WEB-INF/web.xml
index 1790bae..f513ed5 100644
--- a/preparable-interface/src/main/webapp/WEB-INF/web.xml
+++ b/preparable-interface/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/restful2actionmapper/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/restful2actionmapper/src/main/webapp/WEB-INF/web.xml b/restful2actionmapper/src/main/webapp/WEB-INF/web.xml
index 278b0ea..f12db2b 100755
--- a/restful2actionmapper/src/main/webapp/WEB-INF/web.xml
+++ b/restful2actionmapper/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/spring-struts/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/spring-struts/src/main/webapp/WEB-INF/web.xml b/spring-struts/src/main/webapp/WEB-INF/web.xml
index e8cb9ce..cc11b7d 100644
--- a/spring-struts/src/main/webapp/WEB-INF/web.xml
+++ b/spring-struts/src/main/webapp/WEB-INF/web.xml
@@ -14,7 +14,7 @@
 
 	<filter>
 		<filter-name>struts2</filter-name>
-		<filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+		<filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
 	</filter>
 
 	<filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/themes-override/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/themes-override/src/main/webapp/WEB-INF/web.xml b/themes-override/src/main/webapp/WEB-INF/web.xml
index a5fcf75..68d7de0 100644
--- a/themes-override/src/main/webapp/WEB-INF/web.xml
+++ b/themes-override/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/themes/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/themes/src/main/webapp/WEB-INF/web.xml b/themes/src/main/webapp/WEB-INF/web.xml
index a5fcf75..68d7de0 100644
--- a/themes/src/main/webapp/WEB-INF/web.xml
+++ b/themes/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/unit-testing/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/unit-testing/src/main/webapp/WEB-INF/web.xml b/unit-testing/src/main/webapp/WEB-INF/web.xml
index 794e993..937eeda 100644
--- a/unit-testing/src/main/webapp/WEB-INF/web.xml
+++ b/unit-testing/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/using-tags/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/using-tags/src/main/webapp/WEB-INF/web.xml b/using-tags/src/main/webapp/WEB-INF/web.xml
index ac8a81b..57c9b48 100644
--- a/using-tags/src/main/webapp/WEB-INF/web.xml
+++ b/using-tags/src/main/webapp/WEB-INF/web.xml
@@ -8,7 +8,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>

http://git-wip-us.apache.org/repos/asf/struts-examples/blob/cbe3f886/wildcard-method-selection/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/wildcard-method-selection/src/main/webapp/WEB-INF/web.xml b/wildcard-method-selection/src/main/webapp/WEB-INF/web.xml
index 9be994d..4dba10f 100644
--- a/wildcard-method-selection/src/main/webapp/WEB-INF/web.xml
+++ b/wildcard-method-selection/src/main/webapp/WEB-INF/web.xml
@@ -9,7 +9,7 @@
   					 
     <filter>
         <filter-name>struts2</filter-name>
-        <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter</filter-class>
+        <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class>
     </filter>
 
      <filter-mapping>