You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/12/17 17:27:57 UTC
cxf git commit: Updating Swagger version, fixing typos
Repository: cxf
Updated Branches:
refs/heads/master 9dd4194ce -> 5b017782e
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/5b017782
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5b017782
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5b017782
Branch: refs/heads/master
Commit: 5b017782ea4c118cf15983717587b386e0e182e4
Parents: 9dd4194
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Wed Dec 17 16:27:41 2014 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Wed Dec 17 16:27:41 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/5b017782/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 37c1054..57a5fba 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -142,7 +142,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/5b017782/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);