cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-7043] Applying a 3.0.x test fix with thanks to Tadayoshi Sato, This closes #165
Date Thu, 08 Sep 2016 08:49:42 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 93ff39c1d -> f3bc1f4f8


[CXF-7043] Applying a 3.0.x test fix with thanks to Tadayoshi Sato, This closes #165


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f3bc1f4f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f3bc1f4f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f3bc1f4f

Branch: refs/heads/3.0.x-fixes
Commit: f3bc1f4f85a7e136938faab3b976675628407168
Parents: 93ff39c
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Thu Sep 8 09:49:05 2016 +0100
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Thu Sep 8 09:49:05 2016 +0100

----------------------------------------------------------------------
 .../systest/jaxrs/BookCxfContinuationServlet3Server.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/f3bc1f4f/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationServlet3Server.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationServlet3Server.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationServlet3Server.java
index 06ae8a5..09abace 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationServlet3Server.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookCxfContinuationServlet3Server.java
@@ -26,7 +26,7 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
 import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
 import org.apache.cxf.transport.servlet.CXFNonSpringServlet;
 import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 
 public class BookCxfContinuationServlet3Server extends AbstractBusTestServerBase {
@@ -52,9 +52,10 @@ public class BookCxfContinuationServlet3Server extends AbstractBusTestServerBase
 
     private Server httpServer(CXFNonSpringServlet cxf) {
         Server server = new Server(Integer.parseInt(PORT));
-        ServletHandler handler = new ServletHandler();
-        server.setHandler(handler);
-        handler.addServletWithMapping(new ServletHolder(cxf), "/*");
+        ServletContextHandler context = new ServletContextHandler(ServletContextHandler.SESSIONS);
+        context.setContextPath("/");
+        context.addServlet(new ServletHolder(cxf), "/*");
+        server.setHandler(context);
         return server;
     }
 


Mime
View raw message