Author: ningjiang
Date: Thu Feb 16 07:54:02 2012
New Revision: 1244877
URL: http://svn.apache.org/viewvc?rev=1244877&view=rev
Log:
Merged revisions 1244872 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1244872 | ningjiang | 2012-02-16 15:38:39 +0800 (Thu, 16 Feb 2012) | 1 line
CAMEL-5009 support resourceClass option in camel-cxfrs component
........
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/CxfRsEndpointTest.java
Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 07:54:02 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872
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=1244877&r1=1244876&r2=1244877&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
Thu Feb 16 07:54:02 2012
@@ -226,6 +226,10 @@ public class CxfRsEndpoint extends Defau
public void setResourceClasses(Class<?>... classes) {
setResourceClasses(Arrays.asList(classes));
}
+
+ public void setResourceClass(Class<?> clazz) {
+ setResourceClasses(clazz);
+ }
public void setAddress(String address) {
this.address = address;
Modified:
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.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/CxfRsEndpointTest.java?rev=1244877&r1=1244876&r2=1244877&view=diff
==============================================================================
---
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
(original)
+++
camel/branches/camel-2.9.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
Thu Feb 16 07:54:02 2012
@@ -54,5 +54,20 @@ public class CxfRsEndpointTest extends C
assertNotNull("The Parameter should not be null" +
endpoint.getParameters());
assertEquals("Get a wrong parameter map", "{q1=11, q2=12}",
endpoint.getParameters().toString());
}
+
+ @Test
+ public void testCxfRsEndpointResourceClass() throws Exception {
+ String endpointUri = "cxfrs://http://localhost:"; + CTX + ""
+ +
"?resourceClass=org.apache.camel.component.cxf.jaxrs.testbean.CustomerService";
+
+ CxfRsComponent component = new CxfRsComponent(context);
+ CxfRsEndpoint endpoint =
(CxfRsEndpoint)component.createEndpoint(endpointUri);
+
+ assertNotNull("The endpoint should not be null ", endpoint);
+ assertEquals("Get a wrong address ", endpointUri,
endpoint.getEndpointUri());
+ assertEquals("Get a wrong size of resouces classes", 1,
endpoint.getResourceClasses().size());
+ assertEquals("Get a wrong resources class", CustomerService.class,
endpoint.getResourceClasses().get(0));
+
+ }
}
