You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2013/11/11 06:26:02 UTC
svn commit: r1540613 - in /cxf/branches/2.6.x-fixes: ./ parent/pom.xml
rt/frontend/jaxrs/pom.xml
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/swagger/
Author: ffang
Date: Mon Nov 11 05:26:02 2013
New Revision: 1540613
URL: http://svn.apache.org/r1540613
Log:
[CXF-5379]revert changes on CXF 2.6.x branch
Removed:
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/swagger/
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/parent/pom.xml
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml
cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Reverse-merged /cxf/branches/2.7.x-fixes:r1539912
Reverse-merged /cxf/trunk:r1539911
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1540613&r1=1540612&r2=1540613&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Mon Nov 11 05:26:02 2013
@@ -149,7 +149,6 @@
<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.0</cxf.swagger.version>
<cxf.velocity.version>1.7</cxf.velocity.version>
<cxf.woodstox.core.version>4.2.0</cxf.woodstox.core.version>
<cxf.woodstox.stax2-api.version>3.1.1</cxf.woodstox.stax2-api.version>
@@ -1523,12 +1522,6 @@
<artifactId>msv-core</artifactId>
<version>${cxf.msv.version}</version>
</dependency>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-jaxrs_2.10</artifactId>
- <version>${cxf.swagger.version}</version>
- </dependency>
-
</dependencies>
</dependencyManagement>
Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1540613&r1=1540612&r2=1540613&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/pom.xml Mon Nov 11 05:26:02 2013
@@ -39,7 +39,6 @@
org.apache.aries*;version="${cxf.aries.version.range}",
org.springframework*;resolution:="optional";version="${cxf.osgi.spring.version}",
javax.ws.rs*;version="[1.0,3)"
- com.wordnik.swagger.jaxrs*;resolution:="optional";version="[1.3.0, 1.4.0)",
</cxf.osgi.import>
</properties>
@@ -155,9 +154,5 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>com.wordnik</groupId>
- <artifactId>swagger-jaxrs_2.10</artifactId>
- </dependency>
</dependencies>
</project>
Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java?rev=1540613&r1=1540612&r2=1540613&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java (original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java Mon Nov 11 05:26:02 2013
@@ -114,7 +114,6 @@ public class AbstractJAXRSFactoryBean ex
super.setBus(bus);
checkBindingFactory(bus);
serviceFactory.setBus(bus);
- bus.setProperty(JAXRSServiceFactoryBean.class.getName(), serviceFactory);
}
/*
@@ -208,7 +207,6 @@ public class AbstractJAXRSFactoryBean ex
*/
public void setServiceFactory(JAXRSServiceFactoryBean serviceFactory) {
this.serviceFactory = serviceFactory;
- getBus().setProperty(JAXRSServiceFactoryBean.class.getName(), serviceFactory);
}
protected Endpoint createEndpoint() throws BusException, EndpointException {