You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2012/02/16 09:27:39 UTC
svn commit: r1244888 - in /camel/branches/camel-2.8.x: ./
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
Author: ningjiang
Date: Thu Feb 16 08:27:39 2012
New Revision: 1244888
URL: http://svn.apache.org/viewvc?rev=1244888&view=rev
Log:
Merged revisions 1244877 via svnmerge from
https://svn.apache.org/repos/asf/camel/branches/camel-2.9.x
................
r1244877 | ningjiang | 2012-02-16 15:54:02 +0800 (Thu, 16 Feb 2012) | 9 lines
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.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb 16 08:27:39 2012
@@ -1,2 +1,2 @@
-/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875
-/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870
+/camel/branches/camel-2.9.x:1227549,1228229,1229567,1234054,1236672,1238942,1240157,1241006,1241489,1243052,1243058,1244875,1244877
+/camel/trunk:1226860,1227540,1228223,1229565,1234043,1236667,1238937,1240025,1240950,1240967,1241482,1243046,1243057,1244870,1244872
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.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.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1244888&r1=1244887&r2=1244888&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java Thu Feb 16 08:27:39 2012
@@ -216,6 +216,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.8.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.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java?rev=1244888&r1=1244887&r2=1244888&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpointTest.java Thu Feb 16 08:27:39 2012
@@ -47,5 +47,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:9000"
+ + "?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));
+
+ }
}