We can't have one runtime as a Servlet anymore
Project: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/commit/0e631d57 Tree: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/tree/0e631d57 Diff: http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/diff/0e631d57 Branch: refs/heads/master Commit: 0e631d57fcfe422811719045c3a11933badaad2c Parents: f8f6baa Author: Carlos Sierra <[email protected]> Authored: Mon Aug 14 14:20:11 2017 +0200 Committer: Carlos Sierra <[email protected]> Committed: Fri Aug 18 15:59:21 2017 +0200 ---------------------------------------------------------------------- .../internal/AriesJaxRSServiceRuntime.java | 37 ++------------------ 1 file changed, 2 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-jax-rs-whiteboard/blob/0e631d57/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java ---------------------------------------------------------------------- diff --git a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java index 536cd23..80d99ff 100644 --- a/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java +++ b/jax-rs.whiteboard/src/main/java/org/apache/aries/jax/rs/whiteboard/internal/AriesJaxRSServiceRuntime.java @@ -17,35 +17,15 @@ package org.apache.aries.jax.rs.whiteboard.internal; -import java.io.IOException; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.apache.cxf.Bus; -import org.apache.cxf.transport.servlet.CXFNonSpringServlet; import org.osgi.service.jaxrs.runtime.JaxRSServiceRuntime; import org.osgi.service.jaxrs.runtime.dto.RequestInfoDTO; import org.osgi.service.jaxrs.runtime.dto.RuntimeDTO; -public class AriesJaxRSServiceRuntime - extends HttpServlet implements JaxRSServiceRuntime { +public class AriesJaxRSServiceRuntime implements JaxRSServiceRuntime { private static final long serialVersionUID = 1L; - private final Bus _bus; - private final CXFNonSpringServlet _cxfNonSpringServlet; - - public AriesJaxRSServiceRuntime(Bus bus) { - _bus = bus; - - CXFNonSpringServlet cxfNonSpringServlet = new CXFNonSpringServlet(); - cxfNonSpringServlet.setBus(_bus); - - _cxfNonSpringServlet = cxfNonSpringServlet; + public AriesJaxRSServiceRuntime() { } @Override @@ -58,17 +38,4 @@ public class AriesJaxRSServiceRuntime return null; } - @Override - public void init(ServletConfig config) throws ServletException { - _cxfNonSpringServlet.init(config); - } - - @Override - protected void service( - HttpServletRequest request, HttpServletResponse response) - throws ServletException, IOException { - - _cxfNonSpringServlet.service(request, response); - } - } \ No newline at end of file
