You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2015/08/13 16:16:16 UTC

cxf git commit: [CXF-6530] put the service under some path

Repository: cxf
Updated Branches:
  refs/heads/master e1e3b2c7a -> 36eced5b2


[CXF-6530] put the service under some path


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

Branch: refs/heads/master
Commit: 36eced5b219afc67fe8b31825b50722da2128825
Parents: e1e3b2c
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Thu Aug 13 16:15:20 2015 +0200
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Thu Aug 13 16:16:10 2015 +0200

----------------------------------------------------------------------
 .../description_swagger2_web/src/main/webapp/WEB-INF/context.xml | 4 ++--
 .../jax_rs/description_swagger2_web/src/main/webapp/index.html   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/36eced5b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/WEB-INF/context.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/WEB-INF/context.xml b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/WEB-INF/context.xml
index 7adc4ad..545cc5b 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/WEB-INF/context.xml
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/WEB-INF/context.xml
@@ -36,7 +36,7 @@
 
     <!-- CXF Swagger2Feature -->  
     <bean id="swagger2Feature" class="org.apache.cxf.jaxrs.swagger.Swagger2Feature">
-        <property name="basePath" value="/app"/>
+        <property name="basePath" value="/app/swaggerSample"/>
     </bean>
 
     <cxf:bus>
@@ -45,7 +45,7 @@
         </cxf:features>
     </cxf:bus>
 
-    <jaxrs:server id="sampleServer" address="/">
+    <jaxrs:server id="sampleServer" address="/swaggerSample">
         <jaxrs:serviceBeans>
             <ref bean="sampleResource" />
         </jaxrs:serviceBeans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/36eced5b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/index.html b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/index.html
index 19d5cf2..b32bb69 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/index.html
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2_web/src/main/webapp/index.html
@@ -21,7 +21,7 @@
 
   <script type="text/javascript">
     $(function () {
-      var url = "/app/swagger.json";
+      var url = "/app/swaggerSample/swagger.json";
       window.swaggerUi = new SwaggerUi({
         url: url,
         dom_id: "swagger-ui-container",