You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2015/02/14 11:51:51 UTC

svn commit: r1659774 - in /felix/trunk/http/base/src: main/java/org/apache/felix/http/base/internal/ main/java/org/apache/felix/http/base/internal/context/ main/java/org/apache/felix/http/base/internal/dispatch/ main/java/org/apache/felix/http/base/int...

Author: cziegeler
Date: Sat Feb 14 10:51:50 2015
New Revision: 1659774

URL: http://svn.apache.org/r1659774
Log:
FELIX-4060 : Implement HTTP Service Update (RFC-189) - Refactor http service related classes in according packages

Added:
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/HttpServiceRuntimeImpl.java
      - copied, changed from r1659548, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java
      - copied, changed from r1659618, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java
      - copied, changed from r1659548, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/AbstractListenerManager.java
      - copied, changed from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/AbstractListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionAttributeListenerManager.java
      - copied, changed from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionAttributeListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionListenerManager.java
      - copied, changed from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletContextAttributeListenerManager.java
      - copied, changed from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletContextAttributeListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestAttributeListenerManager.java
      - copied, changed from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestAttributeListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestListenerManager.java
      - copied, changed from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestListenerManager.java
Removed:
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/AbstractListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionAttributeListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletContextAttributeListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestAttributeListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestListenerManager.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java
Modified:
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java
    felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java
    felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
    felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java?rev=1659774&r1=1659773&r2=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java Sat Feb 14 10:51:50 2015
@@ -28,8 +28,8 @@ import javax.servlet.http.HttpServletReq
 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
 {

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java?rev=1659774&r1=1659773&r2=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java Sat Feb 14 10:51:50 2015
@@ -28,13 +28,13 @@ import org.apache.felix.http.base.intern
 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;

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java?rev=1659774&r1=1659773&r2=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/ServletContextWrapper.java Sat Feb 14 10:51:50 2015
@@ -22,7 +22,7 @@ package org.apache.felix.http.base.inter
 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>

Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/HttpServiceRuntimeImpl.java (from r1659548, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/HttpServiceRuntimeImpl.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/HttpServiceRuntimeImpl.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java&r1=1659548&r2=1659774&rev=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceRuntimeImpl.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/runtime/HttpServiceRuntimeImpl.java Sat Feb 14 10:51:50 2015
@@ -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;

Modified: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java?rev=1659774&r1=1659773&r2=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/HttpServiceImpl.java Sat Feb 14 10:51:50 2015
@@ -32,7 +32,6 @@ import javax.servlet.ServletException;
 
 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;

Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java (from r1659618, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java)
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java&r1=1659618&r2=1659774&rev=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextImpl.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextImpl.java Sat Feb 14 10:51:50 2015
@@ -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.HttpServletRes
 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;

Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java (from r1659548, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextManager.java&r1=1659548&r2=1659774&rev=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/context/ServletContextManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/ServletContextManager.java Sat Feb 14 10:51:50 2015
@@ -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 java.util.WeakHashMap;
 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;
 

Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/AbstractListenerManager.java (from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/AbstractListenerManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/AbstractListenerManager.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/AbstractListenerManager.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/AbstractListenerManager.java&r1=1659549&r2=1659774&rev=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/AbstractListenerManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/AbstractListenerManager.java Sat Feb 14 10:51:50 2015
@@ -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;

Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionAttributeListenerManager.java (from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionAttributeListenerManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionAttributeListenerManager.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionAttributeListenerManager.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionAttributeListenerManager.java&r1=1659549&r2=1659774&rev=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionAttributeListenerManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionAttributeListenerManager.java Sat Feb 14 10:51:50 2015
@@ -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;
 

Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionListenerManager.java (from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionListenerManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionListenerManager.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionListenerManager.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionListenerManager.java&r1=1659549&r2=1659774&rev=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/HttpSessionListenerManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/HttpSessionListenerManager.java Sat Feb 14 10:51:50 2015
@@ -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;
 

Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletContextAttributeListenerManager.java (from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletContextAttributeListenerManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletContextAttributeListenerManager.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletContextAttributeListenerManager.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletContextAttributeListenerManager.java&r1=1659549&r2=1659774&rev=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletContextAttributeListenerManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletContextAttributeListenerManager.java Sat Feb 14 10:51:50 2015
@@ -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;
 

Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestAttributeListenerManager.java (from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestAttributeListenerManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestAttributeListenerManager.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestAttributeListenerManager.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestAttributeListenerManager.java&r1=1659549&r2=1659774&rev=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestAttributeListenerManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestAttributeListenerManager.java Sat Feb 14 10:51:50 2015
@@ -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;
 

Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestListenerManager.java (from r1659549, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestListenerManager.java)
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestListenerManager.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestListenerManager.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestListenerManager.java&r1=1659549&r2=1659774&rev=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/listener/ServletRequestListenerManager.java (original)
+++ felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/service/listener/ServletRequestListenerManager.java Sat Feb 14 10:51:50 2015
@@ -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;
 

Modified: felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java?rev=1659774&r1=1659773&r2=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java (original)
+++ felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextImplTest.java Sat Feb 14 10:51:50 2015
@@ -43,6 +43,7 @@ import javax.servlet.descriptor.JspConfi
 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;

Modified: felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java?rev=1659774&r1=1659773&r2=1659774&view=diff
==============================================================================
--- felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java (original)
+++ felix/trunk/http/base/src/test/java/org/apache/felix/http/base/internal/context/ServletContextManagerTest.java Sat Feb 14 10:51:50 2015
@@ -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;