cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: Updating Swagger version, fixing typos
Date Wed, 17 Dec 2014 16:34:23 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes cc5a0385b -> c3b0fd181


Updating Swagger version, fixing typos


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

Branch: refs/heads/3.0.x-fixes
Commit: c3b0fd181cd21c5236442bcf5e545bb1d133babf
Parents: cc5a038
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Wed Dec 17 16:27:41 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Wed Dec 17 16:34:09 2014 +0000

----------------------------------------------------------------------
 parent/pom.xml                                               | 2 +-
 .../java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c3b0fd18/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 019e0e3..c176e6e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -155,7 +155,7 @@
         <cxf.spring.osgi.version>1.2.1</cxf.spring.osgi.version>
         <cxf.spring.ldap.version>1.3.1.RELEASE</cxf.spring.ldap.version>
         <cxf.spring.mock>spring-test</cxf.spring.mock>
-        <cxf.swagger.version>1.3.9</cxf.swagger.version>
+        <cxf.swagger.version>1.3.11</cxf.swagger.version>
         <cxf.velocity.version>1.7</cxf.velocity.version>
         <cxf.woodstox.core.version>4.4.1</cxf.woodstox.core.version>
         <cxf.woodstox.stax2-api.version>3.1.4</cxf.woodstox.stax2-api.version>

http://git-wip-us.apache.org/repos/asf/cxf/blob/c3b0fd18/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
index f63a2a0..383211c 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java
@@ -57,8 +57,8 @@ public class SwaggerFeature extends AbstractFeature {
     
     @Override
     public void initialize(Server server, Bus bus) {
-        calulateDefaultResourcePackage(server);
-        calulateDefaultBasePath(server);
+        calculateDefaultResourcePackage(server);
+        calculateDefaultBasePath(server);
         ApiListingResourceJSON apiListingResource = new ApiListingResourceJSON();
         if (!runAsFilter) {
             List<Object> serviceBeans = new ArrayList<Object>();
@@ -87,7 +87,7 @@ public class SwaggerFeature extends AbstractFeature {
         beanConfig.setScan(isScan());
         initializeProvider(server.getEndpoint(), bus);
     }
-    private void calulateDefaultResourcePackage(Server server) {
+    private void calculateDefaultResourcePackage(Server server) {
         JAXRSServiceFactoryBean serviceFactoryBean = 
             (JAXRSServiceFactoryBean)server.getEndpoint().get(JAXRSServiceFactoryBean.class.getName());
         AbstractResourceInfo resourceInfo = serviceFactoryBean.getClassResourceInfo().get(0);
@@ -98,7 +98,7 @@ public class SwaggerFeature extends AbstractFeature {
         }
     }
     
-    private void calulateDefaultBasePath(Server server) {
+    private void calculateDefaultBasePath(Server server) {
         if (getBasePath() == null || getBasePath().length() == 0) {
             String address = server.getEndpoint().getEndpointInfo().getAddress();
             setBasePath(address);


Mime
View raw message