cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [09/29] cxf git commit: Minor Swagger 2 sample projects cleanup
Date Mon, 29 Aug 2016 23:22:55 GMT
Minor Swagger 2 sample projects cleanup


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

Branch: refs/heads/master-jaxrs-2.1
Commit: 9d3c46e0cfe87700d7105ee131c3e3e33f228e06
Parents: bf63cc1
Author: reta <drreta@gmail.com>
Authored: Sun Aug 28 18:41:26 2016 -0400
Committer: reta <drreta@gmail.com>
Committed: Sun Aug 28 18:41:26 2016 -0400

----------------------------------------------------------------------
 .../src/main/java/demo/jaxrs/swagger/server/Server.java           | 3 ++-
 distribution/src/main/release/samples/pom.xml                     | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/9d3c46e0/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
index 57b459e..d35ab2e 100644
--- a/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
+++ b/distribution/src/main/release/samples/jax_rs/description_swagger2/src/main/java/demo/jaxrs/swagger/server/Server.java
@@ -38,7 +38,8 @@ public class Server {
         context.setContextPath("/");
         context.addServlet(servletHolder, "/*");  
         servletHolder.setInitParameter("jaxrs.serviceClasses", Sample.class.getName());
-        servletHolder.setInitParameter("jaxrs.features", Swagger2Feature.class.getName());
+        servletHolder.setInitParameter("jaxrs.features", 
+            Swagger2Feature.class.getName() + "(basePath=/ usePathBasedConfig=true)");
         servletHolder.setInitParameter("jaxrs.providers", StringUtils.join(
             new String[] {
                 MultipartProvider.class.getName(),

http://git-wip-us.apache.org/repos/asf/cxf/blob/9d3c46e0/distribution/src/main/release/samples/pom.xml
----------------------------------------------------------------------
diff --git a/distribution/src/main/release/samples/pom.xml b/distribution/src/main/release/samples/pom.xml
index 687b99c..ca874f3 100644
--- a/distribution/src/main/release/samples/pom.xml
+++ b/distribution/src/main/release/samples/pom.xml
@@ -115,7 +115,6 @@
         <module>jax_rs/tracing_htrace</module>
         <module>clustering/failover_jaxws_osgi</module>
         <module>clustering/failover_server</module>
-        <module>jax_rs/description_swagger2_per_path_config</module>
         
         <!--
          These are removed from the build as they currently don't inherit the parent from



Mime
View raw message