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 DA67C200C06 for ; Fri, 27 Jan 2017 15:17:16 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id D9068160B5B; Fri, 27 Jan 2017 14:17:16 +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 2B925160B47 for ; Fri, 27 Jan 2017 15:17:16 +0100 (CET) Received: (qmail 95542 invoked by uid 500); 27 Jan 2017 14:17:15 -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 95532 invoked by uid 99); 27 Jan 2017 14:17:15 -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; Fri, 27 Jan 2017 14:17:15 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3DDEBDFA68; Fri, 27 Jan 2017 14:17:15 +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: <11478c6aea39491cb87df18b6837ea55@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: Fix Swagger-UI for Karaf wrap feature with parameters, patch from Christian Lutz applied, This closes #228 Date: Fri, 27 Jan 2017 14:17:15 +0000 (UTC) archived-at: Fri, 27 Jan 2017 14:17:17 -0000 Repository: cxf Updated Branches: refs/heads/master 7da059f88 -> eccca31cc Fix Swagger-UI for Karaf wrap feature with parameters, patch from Christian Lutz applied, This closes #228 Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eccca31c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eccca31c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eccca31c Branch: refs/heads/master Commit: eccca31ccbaae506fec99642c5320c3bf312af55 Parents: 7da059f Author: Sergey Beryozkin Authored: Fri Jan 27 14:16:56 2017 +0000 Committer: Sergey Beryozkin Committed: Fri Jan 27 14:16:56 2017 +0000 ---------------------------------------------------------------------- .../java/org/apache/cxf/jaxrs/swagger/OsgiSwaggerUiResolver.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/eccca31c/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 434595c..0272407 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 @@ -50,7 +50,9 @@ public class OsgiSwaggerUiResolver extends SwaggerUiResolver { return getSwaggerUiRoot(b, swaggerUiVersion); } } else if (location.startsWith(pattern)) { - swaggerUiVersion = location.substring(pattern.length()); + int dollarIndex = location.indexOf("$"); + swaggerUiVersion = location.substring(pattern.length(), + dollarIndex > pattern.length() ? dollarIndex : location.length()); return getSwaggerUiRoot(b, swaggerUiVersion); } }