Author: ffang Date: Fri Nov 8 03:49:19 2013 New Revision: 1539914 URL: http://svn.apache.org/r1539914 Log: Merged revisions 1539912 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1539912 | ffang | 2013-11-08 11:41:12 +0800 (五, 08 11 2013) | 9 lines Merged revisions 1539911 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1539911 | ffang | 2013-11-08 11:30:41 +0800 (五, 08 11 2013) | 1 line [CXF-5379]introduce cxf swagger feature ........ ................ Added: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/swagger/ - copied from r1539912, cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/swagger/ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java - copied unchanged from r1539912, cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/swagger/SwaggerFeature.java 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/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1539912 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=1539914&r1=1539913&r2=1539914&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.6.x-fixes/parent/pom.xml Fri Nov 8 03:49:19 2013 @@ -149,6 +149,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.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> @@ -1522,6 +1523,12 @@ <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=1539914&r1=1539913&r2=1539914&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 Fri Nov 8 03:49:19 2013 @@ -39,6 +39,7 @@ 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> @@ -154,5 +155,9 @@ </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=1539914&r1=1539913&r2=1539914&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 Fri Nov 8 03:49:19 2013 @@ -114,6 +114,7 @@ public class AbstractJAXRSFactoryBean ex super.setBus(bus); checkBindingFactory(bus); serviceFactory.setBus(bus); + bus.setProperty(JAXRSServiceFactoryBean.class.getName(), serviceFactory); } /* @@ -207,6 +208,7 @@ public class AbstractJAXRSFactoryBean ex */ public void setServiceFactory(JAXRSServiceFactoryBean serviceFactory) { this.serviceFactory = serviceFactory; + getBus().setProperty(JAXRSServiceFactoryBean.class.getName(), serviceFactory); } protected Endpoint createEndpoint() throws BusException, EndpointException {
