FELIX-4060 : Implement HTTP Service Update (RFC-189) - Refactor http service related classes in according packages
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1659774 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java b/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java
index a8b3188..25c2722 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java
@@ -28,8 +28,8 @@
import javax.servlet.http.HttpServletRequestWrapper;
import javax.servlet.http.HttpServletResponse;
-import org.apache.felix.http.base.internal.listener.ServletRequestAttributeListenerManager;
-import org.apache.felix.http.base.internal.listener.ServletRequestListenerManager;
+import org.apache.felix.http.base.internal.service.listener.ServletRequestAttributeListenerManager;
+import org.apache.felix.http.base.internal.service.listener.ServletRequestListenerManager;
public final class DispatcherServlet extends HttpServlet
{
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
index 81a3149..9141b48 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
@@ -28,13 +28,13 @@
import org.apache.felix.http.base.internal.handler.HandlerRegistry;
import org.apache.felix.http.base.internal.handler.HttpServicePlugin;
import org.apache.felix.http.base.internal.handler.HttpSessionWrapper;
-import org.apache.felix.http.base.internal.listener.HttpSessionAttributeListenerManager;
-import org.apache.felix.http.base.internal.listener.HttpSessionListenerManager;
-import org.apache.felix.http.base.internal.listener.ServletContextAttributeListenerManager;
-import org.apache.felix.http.base.internal.listener.ServletRequestAttributeListenerManager;
-import org.apache.felix.http.base.internal.listener.ServletRequestListenerManager;
+import org.apache.felix.http.base.internal.runtime.HttpServiceRuntimeImpl;
import org.apache.felix.http.base.internal.service.HttpServiceFactory;
-import org.apache.felix.http.base.internal.service.HttpServiceRuntimeImpl;
+import org.apache.felix.http.base.internal.service.listener.HttpSessionAttributeListenerManager;
+import org.apache.felix.http.base.internal.service.listener.HttpSessionListenerManager;
+import org.apache.felix.http.base.internal.service.listener.ServletContextAttributeListenerManager;
+import org.apache.felix.http.base.internal.service.listener.ServletRequestAttributeListenerManager;
+import org.apache.felix.http.base.internal.service.listener.ServletRequestListenerManager;
import org.apache.felix.http.base.internal.whiteboard.WhiteboardHttpService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java
index 3ccf78c..2bf1eff 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java
@@ -22,7 +22,7 @@
import javax.servlet.RequestDispatcher;
import org.apache.felix.http.base.internal.context.ExtServletContext;
-import org.apache.felix.http.base.internal.context.ServletContextImpl;
+import org.apache.felix.http.base.internal.service.ServletContextImpl;
/**
* @author <a href="mailto:dev@felix.apache.org">Felix Project Team</a>
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/HttpServiceRuntimeImpl.java
similarity index 97%
rename from http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java
rename to http/base/src/main/java/org/apache/felix/http/base/internal/runtime/HttpServiceRuntimeImpl.java
index 1c54bd2..11e1e7f 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/HttpServiceRuntimeImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.http.base.internal.service;
+package org.apache.felix.http.base.internal.runtime;
import org.osgi.service.http.runtime.HttpServiceRuntime;
import org.osgi.service.http.runtime.dto.ErrorPageDTO;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java
index 255c3a8..30b3172 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java
@@ -32,7 +32,6 @@
import org.apache.felix.http.api.ExtHttpService;
import org.apache.felix.http.base.internal.context.ExtServletContext;
-import org.apache.felix.http.base.internal.context.ServletContextManager;
import org.apache.felix.http.base.internal.handler.FilterHandler;
import org.apache.felix.http.base.internal.handler.PerContextHandlerRegistry;
import org.apache.felix.http.base.internal.handler.ServletHandler;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
similarity index 98%
rename from http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java
rename to http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
index 2f8d866..3dd59e8 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.http.base.internal.context;
+package org.apache.felix.http.base.internal.service;
import java.io.IOException;
import java.io.InputStream;
@@ -46,6 +46,7 @@
import javax.servlet.http.HttpSessionAttributeListener;
import javax.servlet.http.HttpSessionListener;
+import org.apache.felix.http.base.internal.context.ExtServletContext;
import org.apache.felix.http.base.internal.logger.SystemLogger;
import org.apache.felix.http.base.internal.util.MimeTypes;
import org.osgi.framework.Bundle;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
similarity index 95%
rename from http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextManager.java
rename to http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
index 9f6aec6..322c949 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.felix.http.base.internal.context;
+package org.apache.felix.http.base.internal.service;
import java.util.Map;
import java.util.WeakHashMap;
@@ -22,6 +22,7 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletContextAttributeListener;
+import org.apache.felix.http.base.internal.context.ExtServletContext;
import org.osgi.framework.Bundle;
import org.osgi.service.http.HttpContext;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/AbstractListenerManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/AbstractListenerManager.java
similarity index 97%
rename from http/base/src/main/java/org/apache/felix/http/base/internal/listener/AbstractListenerManager.java
rename to http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/AbstractListenerManager.java
index 10bfeb1..22687a1 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/AbstractListenerManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/AbstractListenerManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.http.base.internal.listener;
+package org.apache.felix.http.base.internal.service.listener;
import java.util.ArrayList;
import java.util.Iterator;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionAttributeListenerManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionAttributeListenerManager.java
similarity index 97%
rename from http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionAttributeListenerManager.java
rename to http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionAttributeListenerManager.java
index 81ef246..74a1a1f 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionAttributeListenerManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionAttributeListenerManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.http.base.internal.listener;
+package org.apache.felix.http.base.internal.service.listener;
import java.util.Iterator;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionListenerManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionListenerManager.java
similarity index 97%
rename from http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionListenerManager.java
rename to http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionListenerManager.java
index 9887003..b7c3b6c 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionListenerManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionListenerManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.http.base.internal.listener;
+package org.apache.felix.http.base.internal.service.listener;
import java.util.Iterator;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletContextAttributeListenerManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletContextAttributeListenerManager.java
similarity index 97%
rename from http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletContextAttributeListenerManager.java
rename to http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletContextAttributeListenerManager.java
index e071be6..8af09d1 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletContextAttributeListenerManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletContextAttributeListenerManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.http.base.internal.listener;
+package org.apache.felix.http.base.internal.service.listener;
import java.util.Iterator;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestAttributeListenerManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestAttributeListenerManager.java
similarity index 97%
rename from http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestAttributeListenerManager.java
rename to http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestAttributeListenerManager.java
index 3faa0db..856e5cd 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestAttributeListenerManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestAttributeListenerManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.http.base.internal.listener;
+package org.apache.felix.http.base.internal.service.listener;
import java.util.Iterator;
diff --git a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestListenerManager.java b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestListenerManager.java
similarity index 97%
rename from http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestListenerManager.java
rename to http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestListenerManager.java
index 3ecd699..85c89fb 100644
--- a/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestListenerManager.java
+++ b/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestListenerManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.http.base.internal.listener;
+package org.apache.felix.http.base.internal.service.listener;
import java.util.Iterator;
diff --git a/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java b/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
index 8792cf4..737e601 100644
--- a/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
+++ b/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
@@ -43,6 +43,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.apache.felix.http.base.internal.service.ServletContextImpl;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java b/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java
index 5f99e89..16d8bfd 100644
--- a/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java
+++ b/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.felix.http.base.internal.context;
+import org.apache.felix.http.base.internal.service.ServletContextManager;
import org.junit.Before;
import org.junit.Test;
import org.junit.Assert;