emptyList().iterator();
+ }
+
+ public ServletContext getServletContext() {
+ return servletContext;
+ }
+}
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java b/core/src/main/java/org/apache/struts2/dispatcher/listener/StrutsListener.java
similarity index 86%
rename from core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java
rename to core/src/main/java/org/apache/struts2/dispatcher/listener/StrutsListener.java
index 92c49ac39..b0098939b 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ng/listener/StrutsListener.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/listener/StrutsListener.java
@@ -1,62 +1,62 @@
-/*
- * $Id$
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.struts2.dispatcher.ng.listener;
-
-import org.apache.struts2.StrutsStatics;
-import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.ng.InitOperations;
-import org.apache.struts2.dispatcher.ng.PrepareOperations;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-/**
- * Servlet listener for Struts. The preferred way to use Struts is as a filter via the
- * {@link org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter} and its variants.
- * This might be useful if Struts config information is needed from other servlet listeners, like
- * Sitemesh or OSGi
- */
-public class StrutsListener implements ServletContextListener {
- private PrepareOperations prepare;
-
- public void contextInitialized(ServletContextEvent sce) {
- InitOperations init = new InitOperations();
- Dispatcher dispatcher = null;
- try {
- ListenerHostConfig config = new ListenerHostConfig(sce.getServletContext());
- init.initLogging(config);
- dispatcher = init.initDispatcher(config);
- init.initStaticContentLoader(config, dispatcher);
-
- prepare = new PrepareOperations(dispatcher);
- sce.getServletContext().setAttribute(StrutsStatics.SERVLET_DISPATCHER, dispatcher);
- } finally {
- if (dispatcher != null) {
- dispatcher.cleanUpAfterInit();
- }
- init.cleanup();
- }
- }
-
- public void contextDestroyed(ServletContextEvent sce) {
- prepare.cleanupDispatcher();
- }
-}
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.struts2.dispatcher.listener;
+
+import org.apache.struts2.StrutsStatics;
+import org.apache.struts2.dispatcher.Dispatcher;
+import org.apache.struts2.dispatcher.InitOperations;
+import org.apache.struts2.dispatcher.PrepareOperations;
+
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+/**
+ * Servlet listener for Struts. The preferred way to use Struts is as a filter via the
+ * {@link org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter} and its variants.
+ * This might be useful if Struts config information is needed from other servlet listeners, like
+ * Sitemesh or OSGi
+ */
+public class StrutsListener implements ServletContextListener {
+ private PrepareOperations prepare;
+
+ public void contextInitialized(ServletContextEvent sce) {
+ InitOperations init = new InitOperations();
+ Dispatcher dispatcher = null;
+ try {
+ ListenerHostConfig config = new ListenerHostConfig(sce.getServletContext());
+ init.initLogging(config);
+ dispatcher = init.initDispatcher(config);
+ init.initStaticContentLoader(config, dispatcher);
+
+ prepare = new PrepareOperations(dispatcher);
+ sce.getServletContext().setAttribute(StrutsStatics.SERVLET_DISPATCHER, dispatcher);
+ } finally {
+ if (dispatcher != null) {
+ dispatcher.cleanUpAfterInit();
+ }
+ init.cleanup();
+ }
+ }
+
+ public void contextDestroyed(ServletContextEvent sce) {
+ prepare.cleanupDispatcher();
+ }
+}
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/package-info.java b/core/src/main/java/org/apache/struts2/dispatcher/package-info.java
similarity index 87%
rename from core/src/main/java/org/apache/struts2/dispatcher/ng/package-info.java
rename to core/src/main/java/org/apache/struts2/dispatcher/package-info.java
index 1f3fba4ef..eb22fd9f7 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ng/package-info.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/package-info.java
@@ -28,7 +28,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>
@@ -41,7 +41,7 @@
*
* <filter>
* <filter-name>struts2-prepare</filter-name>
- * <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter</filter-class>
+ * <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareFilter</filter-class>
* </filter>
* <filter>
* <filter-name>sitemesh</filter-name>
@@ -49,7 +49,7 @@
* </filter>
* <filter>
* <filter-name>struts2-execute</filter-name>
- * <filter-class>org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter</filter-class>
+ * <filter-class>org.apache.struts2.dispatcher.filter.StrutsExecuteFilter</filter-class>
* </filter>
*
* <filter-mapping>
@@ -67,4 +67,4 @@
*
*
*/
-package org.apache.struts2.dispatcher.ng;
\ No newline at end of file
+package org.apache.struts2.dispatcher;
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/package.html b/core/src/main/java/org/apache/struts2/dispatcher/package.html
deleted file mode 100644
index c8be14572..000000000
--- a/core/src/main/java/org/apache/struts2/dispatcher/package.html
+++ /dev/null
@@ -1,23 +0,0 @@
-
-Classes for action dispatching in Struts (the Controller part of MVC).
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/ServletHostConfig.java b/core/src/main/java/org/apache/struts2/dispatcher/servlet/ServletHostConfig.java
similarity index 94%
rename from core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/ServletHostConfig.java
rename to core/src/main/java/org/apache/struts2/dispatcher/servlet/ServletHostConfig.java
index 098f6cd7b..b449304b7 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/ServletHostConfig.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/servlet/ServletHostConfig.java
@@ -18,7 +18,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.ng.servlet;
+package org.apache.struts2.dispatcher.servlet;
import org.apache.struts2.util.MakeIterator;
@@ -26,7 +26,7 @@ import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import java.util.Iterator;
-import org.apache.struts2.dispatcher.ng.HostConfig;
+import org.apache.struts2.dispatcher.HostConfig;
/**
* Host configuration that wraps a ServletConfig
diff --git a/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java b/core/src/main/java/org/apache/struts2/dispatcher/servlet/StrutsServlet.java
similarity index 89%
rename from core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java
rename to core/src/main/java/org/apache/struts2/dispatcher/servlet/StrutsServlet.java
index 19c8c73b3..6a7e36473 100644
--- a/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/StrutsServlet.java
+++ b/core/src/main/java/org/apache/struts2/dispatcher/servlet/StrutsServlet.java
@@ -18,13 +18,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.struts2.dispatcher.ng.servlet;
+package org.apache.struts2.dispatcher.servlet;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.mapper.ActionMapping;
-import org.apache.struts2.dispatcher.ng.ExecuteOperations;
-import org.apache.struts2.dispatcher.ng.InitOperations;
-import org.apache.struts2.dispatcher.ng.PrepareOperations;
+import org.apache.struts2.dispatcher.ExecuteOperations;
+import org.apache.struts2.dispatcher.InitOperations;
+import org.apache.struts2.dispatcher.PrepareOperations;
+import org.apache.struts2.dispatcher.servlet.ServletHostConfig;
import javax.servlet.ServletConfig;
import javax.servlet.ServletException;
@@ -35,7 +36,7 @@ import java.io.IOException;
/**
* Servlet dispatcher for Struts. The preferred way to use Struts is as a filter via the
- * {@link org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter} and its variants. This servlet dispatcher
+ * {@link org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter} and its variants. This servlet dispatcher
* is only for those that really know what they are doing as it may not support every feature of Struts, particularly
* static resource serving.
*/
diff --git a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
index 43752cec4..33b19f4f8 100644
--- a/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
+++ b/core/src/main/java/org/apache/struts2/interceptor/debugging/DebuggingInterceptor.java
@@ -32,7 +32,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.dispatcher.ng.PrepareOperations;
+import org.apache.struts2.dispatcher.PrepareOperations;
import org.apache.struts2.views.freemarker.FreemarkerManager;
import org.apache.struts2.views.freemarker.FreemarkerResult;
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/StaticContentLoaderTest.java b/core/src/test/java/org/apache/struts2/dispatcher/StaticContentLoaderTest.java
index 607394f9a..693a52fab 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/StaticContentLoaderTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/StaticContentLoaderTest.java
@@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletResponse;
import junit.framework.TestCase;
-import org.apache.struts2.dispatcher.ng.HostConfig;
import org.springframework.mock.web.MockHttpServletRequest;
import org.springframework.mock.web.MockHttpServletResponse;
import org.springframework.mock.web.MockServletContext;
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilterIntegrationTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilterIntegrationTest.java
index 9cd9bcf41..564f0f9fd 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilterIntegrationTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ng/StrutsPrepareAndExecuteFilterIntegrationTest.java
@@ -23,7 +23,7 @@ package org.apache.struts2.dispatcher.ng;
import com.opensymphony.xwork2.ActionContext;
import junit.framework.TestCase;
import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.ng.filter.StrutsPrepareAndExecuteFilter;
+import org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter;
import org.springframework.mock.web.MockFilterChain;
import org.springframework.mock.web.MockFilterConfig;
import org.springframework.mock.web.MockHttpServletRequest;
diff --git a/core/src/test/java/org/apache/struts2/dispatcher/ng/TwoFilterIntegrationTest.java b/core/src/test/java/org/apache/struts2/dispatcher/ng/TwoFilterIntegrationTest.java
index 52c98a5d4..e39215567 100644
--- a/core/src/test/java/org/apache/struts2/dispatcher/ng/TwoFilterIntegrationTest.java
+++ b/core/src/test/java/org/apache/struts2/dispatcher/ng/TwoFilterIntegrationTest.java
@@ -23,8 +23,9 @@ package org.apache.struts2.dispatcher.ng;
import com.opensymphony.xwork2.ActionContext;
import junit.framework.TestCase;
import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter;
-import org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter;
+import org.apache.struts2.dispatcher.PrepareOperations;
+import org.apache.struts2.dispatcher.filter.StrutsExecuteFilter;
+import org.apache.struts2.dispatcher.filter.StrutsPrepareFilter;
import org.springframework.mock.web.*;
import javax.servlet.*;
@@ -145,4 +146,4 @@ public class TwoFilterIntegrationTest extends TestCase {
}
-}
\ No newline at end of file
+}
diff --git a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
index f81609fa7..553f08cfe 100644
--- a/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
+++ b/plugins/json/src/main/java/org/apache/struts2/json/JSONInterceptor.java
@@ -31,7 +31,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsConstants;
-import org.apache.struts2.dispatcher.ng.PrepareOperations;
+import org.apache.struts2.dispatcher.PrepareOperations;
import org.apache.struts2.json.annotations.SMDMethod;
import org.apache.struts2.json.rpc.RPCError;
import org.apache.struts2.json.rpc.RPCErrorCode;
diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java
index 573fe6102..b2d9ef51f 100644
--- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java
+++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/FreemarkerDecoratorServlet.java
@@ -31,7 +31,7 @@ import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.dispatcher.Dispatcher;
import org.apache.struts2.dispatcher.StrutsRequestWrapper;
-import org.apache.struts2.dispatcher.ng.listener.StrutsListener;
+import org.apache.struts2.dispatcher.listener.StrutsListener;
import org.apache.struts2.views.freemarker.FreemarkerManager;
import org.apache.struts2.views.freemarker.ScopesHashModel;
diff --git a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
index 5ddcdd5d7..416dfd59d 100644
--- a/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
+++ b/plugins/sitemesh/src/main/java/org/apache/struts2/sitemesh/VelocityDecoratorServlet.java
@@ -31,7 +31,7 @@ import com.opensymphony.xwork2.ActionContext;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsStatics;
import org.apache.struts2.dispatcher.Dispatcher;
-import org.apache.struts2.dispatcher.ng.listener.StrutsListener;
+import org.apache.struts2.dispatcher.listener.StrutsListener;
import org.apache.struts2.views.velocity.VelocityManager;
import org.apache.velocity.Template;
import org.apache.velocity.context.Context;