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 7C6C6200B76 for ; Tue, 16 Aug 2016 00:06:53 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7B020160AB8; Mon, 15 Aug 2016 22:06:53 +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 C1E87160AA7 for ; Tue, 16 Aug 2016 00:06:52 +0200 (CEST) Received: (qmail 470 invoked by uid 500); 15 Aug 2016 22:06:52 -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 461 invoked by uid 99); 15 Aug 2016 22:06:52 -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; Mon, 15 Aug 2016 22:06:52 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C3743DFFC0; Mon, 15 Aug 2016 22:06:51 +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: <0376d6e855af43a58212542e0023580c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-7010] Making setting a version for OSGI optional, trying to get a default bus in the formatted service list handler if the bus is null Date: Mon, 15 Aug 2016 22:06:51 +0000 (UTC) archived-at: Mon, 15 Aug 2016 22:06:53 -0000 Repository: cxf Updated Branches: refs/heads/master 276017a4f -> 557f3b9e8 [CXF-7010] Making setting a version for OSGI optional, trying to get a default bus in the formatted service list handler if the bus is null Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/557f3b9e Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/557f3b9e Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/557f3b9e Branch: refs/heads/master Commit: 557f3b9e880ea8025ab11b1a4cc519103ca4ec70 Parents: 276017a Author: Sergey Beryozkin Authored: Mon Aug 15 23:06:31 2016 +0100 Committer: Sergey Beryozkin Committed: Mon Aug 15 23:06:31 2016 +0100 ---------------------------------------------------------------------- .../org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java | 7 ++++++- .../servlet/servicelist/FormattedServiceListWriter.java | 9 +++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/557f3b9e/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java ---------------------------------------------------------------------- diff --git a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java index 4435a87..f52b991 100644 --- a/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java +++ b/rt/rs/description-swagger/src/main/java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java @@ -39,7 +39,12 @@ public class OsgiSwaggerUiResolver extends SwaggerUiResolver { } for (Bundle b : bundle.getBundleContext().getBundles()) { String location = b.getLocation(); - if (location.equals(LOCATION + swaggerUiVersion)) { + if (swaggerUiVersion != null) { + if (location.equals(LOCATION + swaggerUiVersion)) { + return getSwaggerUiRoot(b, swaggerUiVersion); + } + } else if (location.startsWith(LOCATION)) { + swaggerUiVersion = location.substring(LOCATION.length()); return getSwaggerUiRoot(b, swaggerUiVersion); } } http://git-wip-us.apache.org/repos/asf/cxf/blob/557f3b9e/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java index 0c25519..ae9a4d4 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java @@ -24,6 +24,7 @@ import java.net.URI; import java.util.Map; import org.apache.cxf.Bus; +import org.apache.cxf.BusFactory; import org.apache.cxf.common.util.PropertyUtils; import org.apache.cxf.helpers.CastUtils; import org.apache.cxf.service.model.OperationInfo; @@ -44,8 +45,12 @@ public class FormattedServiceListWriter implements ServiceListWriter { this.title = title; this.showForeignContexts = showForeignContexts; this.bus = bus; - if (bus != null) { - this.atomMap = CastUtils.cast((Map)bus.getProperty("org.apache.cxf.extensions.logging.atom.pull")); + if (this.bus == null) { + this.bus = BusFactory.getDefaultBus(false); + } + if (this.bus != null) { + this.atomMap = + CastUtils.cast((Map)this.bus.getProperty("org.apache.cxf.extensions.logging.atom.pull")); } }