From commits-return-50449-archive-asf-public=cust-asf.ponee.io@cxf.apache.org Sat Nov 10 18:12:09 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 1E84A180668 for ; Sat, 10 Nov 2018 18:12:08 +0100 (CET) Received: (qmail 29757 invoked by uid 500); 10 Nov 2018 17:12:08 -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 29748 invoked by uid 99); 10 Nov 2018 17:12:08 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 10 Nov 2018 17:12:08 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 59BEF81E79; Sat, 10 Nov 2018 17:12:07 +0000 (UTC) Date: Sat, 10 Nov 2018 17:12:07 +0000 To: "commits@cxf.apache.org" Subject: [cxf] branch master updated: CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing jax_rs/sse_tomcat MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154186992727.27235.13377250273119934294@gitbox.apache.org> From: reta@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: cxf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: ab47feecfc1070ee6dcb0f198474d9668c83e767 X-Git-Newrev: e62decbe89bd412f1178ed62738fe234262020a5 X-Git-Rev: e62decbe89bd412f1178ed62738fe234262020a5 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/master by this push: new e62decb CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing jax_rs/sse_tomcat e62decb is described below commit e62decbe89bd412f1178ed62738fe234262020a5 Author: reta AuthorDate: Sat Nov 10 12:11:41 2018 -0500 CXF-7889: ensure all samples from CXF kit can work with JDK11 OOTB. Fixing jax_rs/sse_tomcat --- distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- .../jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java | 1 + .../jax_rs/sse_tomcat/src/main/resources/WEB-INF/applicationContext.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml index c5ee789..92a1ff5 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml @@ -13,7 +13,7 @@ UTF-8 - 8.0.32 + 8.0.53 diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java index b98af99..d69e561 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java +++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/java/demo/jaxrs/sse/StatsServer.java @@ -48,6 +48,7 @@ public final class StatsServer { context.addApplicationListener(ContextLoaderListener.class.getName()); context.setAddWebinfClassesResources(true); context.setResources(resourcesFrom(context, "target/classes")); + context.setParentClassLoader(Thread.currentThread().getContextClassLoader()); final Wrapper cxfServlet = Tomcat.addServlet(context, "cxfServlet", new CXFServlet()); cxfServlet.setAsyncSupported(true); diff --git a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/WEB-INF/applicationContext.xml b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/WEB-INF/applicationContext.xml index 0c290a5..d61c4a7 100644 --- a/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/WEB-INF/applicationContext.xml +++ b/distribution/src/main/release/samples/jax_rs/sse_tomcat/src/main/resources/WEB-INF/applicationContext.xml @@ -27,7 +27,7 @@ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd"> - +