Author: ningjiang Date: Wed Jul 11 08:21:27 2012 New Revision: 1360057 URL: http://svn.apache.org/viewvc?rev=1360057&view=rev Log: Merged revisions 1360041 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
................ r1360041 | ningjiang | 2012-07-11 15:44:09 +0800 (Wed, 11 Jul 2012) | 9 lines Merged revisions 1360031 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1360031 | ningjiang | 2012-07-11 14:31:35 +0800 (Wed, 11 Jul 2012) | 1 line CAMEL-4014 supports to use Interface as the service class ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java camel/branches/camel-2.9.x/components/camel-http/ (props changed) Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1360031 Merged /camel/branches/camel-2.10.x:r1360041 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1360057&r1=1360056&r2=1360057&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java Wed Jul 11 08:21:27 2012 @@ -139,7 +139,11 @@ public class CxfRsEndpoint extends Defau sfb.setAddress(getAddress()); } if (getResourceClasses() != null) { - List res = CastUtils.cast(getResourceClasses()); + List<Class<?>> res = CastUtils.cast(getResourceClasses()); + // setup the resource providers + for(Class<?>clazz : res) { + sfb.setResourceProvider(clazz, new CamelResourceProvider(clazz)); + } sfb.setResourceClasses(res); } sfb.setStart(false); Modified: camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java?rev=1360057&r1=1360056&r2=1360057&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java (original) +++ camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/testbean/CustomerServiceResource.java Wed Jul 11 08:21:27 2012 @@ -22,27 +22,17 @@ import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.core.Response; -/** - * - * @version - */ + // START SNIPPET: example @Path("/customerservice/") -public class CustomerServiceResource { - - public CustomerServiceResource() { - } +public interface CustomerServiceResource { @GET @Path("/customers/{id}/") - public Customer getCustomer(@PathParam("id") String id) { - return null; - } + public Customer getCustomer(@PathParam("id") String id); @PUT @Path("/customers/") - public Response updateCustomer(Customer customer) { - return null; - } + public Response updateCustomer(Customer customer); } // END SNIPPET: example Propchange: camel/branches/camel-2.9.x/components/camel-http/ ('svn:mergeinfo' removed)