Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4DB71200B7C for ; Thu, 8 Sep 2016 10:49:44 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4C543160ABD; Thu, 8 Sep 2016 08:49:44 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 9385C160AA5 for ; Thu, 8 Sep 2016 10:49:43 +0200 (CEST) Received: (qmail 9087 invoked by uid 500); 8 Sep 2016 08:49:42 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 9078 invoked by uid 99); 8 Sep 2016 08:49:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Sep 2016 08:49:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8DD7DFC7E; Thu, 8 Sep 2016 08:49:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: <7968ab262ee64df59f2082c27b6ea49d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-7043] Applying a 3.0.x test fix with thanks to Tadayoshi Sato, This closes #165 Date: Thu, 8 Sep 2016 08:49:42 +0000 (UTC) archived-at: Thu, 08 Sep 2016 08:49:44 -0000 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 Authored: Thu Sep 8 09:49:05 2016 +0100 Committer: Sergey Beryozkin 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; }