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 2016/09/20 05:46:10 UTC
svn commit: r1761523 - in
/felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal:
DispatcherServlet.java HttpServiceController.java
dispatch/DispatcherServlet.java
Author: cziegeler
Date: Tue Sep 20 05:46:09 2016
New Revision: 1761523
URL: http://svn.apache.org/viewvc?rev=1761523&view=rev
Log:
FELIX-5349 : add ManagedServiceFactory to HTTP service. Cleaning up code
Added:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java
- copied, changed from r1761522, felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java
Removed:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java
Modified:
felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/HttpServiceController.java
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=1761523&r1=1761522&r2=1761523&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 Tue Sep 20 05:46:09 2016
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpSessionIdL
import javax.servlet.http.HttpSessionListener;
import org.apache.felix.http.base.internal.dispatch.Dispatcher;
+import org.apache.felix.http.base.internal.dispatch.DispatcherServlet;
import org.apache.felix.http.base.internal.handler.HttpSessionWrapper;
import org.apache.felix.http.base.internal.registry.HandlerRegistry;
import org.apache.felix.http.base.internal.service.HttpServiceFactory;
Copied: felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java (from r1761522, 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/dispatch/DispatcherServlet.java?p2=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/dispatch/DispatcherServlet.java&p1=felix/trunk/http/base/src/main/java/org/apache/felix/http/base/internal/DispatcherServlet.java&r1=1761522&r2=1761523&rev=1761523&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/dispatch/DispatcherServlet.java Tue Sep 20 05:46:09 2016
@@ -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;
+package org.apache.felix.http.base.internal.dispatch;
import java.io.IOException;
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.felix.http.base.internal.dispatch.Dispatcher;
+import org.apache.felix.http.base.internal.HttpServiceController;
/**
* The dispatcher servlet is registered in the container.