svn commit: r1330643 - in /camel/trunk/components/camel-cxf/src: main/java/org/apache/camel/component/cxf/jaxrs/ test/java/org/apache/camel/component/cxf/jaxrs/ test/resources/org/apache/camel/component/cxf/jaxrs/

[ni...@apache.org]

Author: ningjiang
Date: Thu Apr 26 03:54:40 2012
New Revision: 1330643

URL: http://svn.apache.org/viewvc?rev=1330643&view=rev
Log:
clean up the code of camel-cxf

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java
    camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java?rev=1330643&r1=1330642&r2=1330643&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java (original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsComponent.java Thu Apr 26 03:54:40 2012
@@ -81,7 +81,7 @@ public class CxfRsComponent extends Head
         }
 
         String resourceClasses = getAndRemoveParameter(parameters, "resourceClasses", String.class);
-        Iterator<Object> it = ObjectHelper.createIterator(resourceClasses);
+        Iterator<?> it = ObjectHelper.createIterator(resourceClasses);
         while (it.hasNext()) {
             String name = (String) it.next();
             Class<?> clazz = getCamelContext().getClassResolver().resolveMandatoryClass(name);

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java?rev=1330643&r1=1330642&r2=1330643&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java (original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfOperationExceptionTest.java Thu Apr 26 03:54:40 2012
@@ -53,10 +53,10 @@ public class CxfOperationExceptionTest e
         input.setName("Donald Duck");
 
         // we cannot convert directly to Customer as we need camel-jaxb
-        String response = template.requestBodyAndHeader("cxfrs:http://localhost:" + PORT1 + "/CxfOperationExceptionTest/customerservice/customers?throwExceptionOnFailure=false", input,
+        String response = template.requestBodyAndHeader("cxfrs:bean:rsClient?throwExceptionOnFailure=false", input,
             Exchange.HTTP_METHOD, "POST", String.class);
 
         assertNotNull(response);
-        assertTrue(response.contains("Problem accessing /CxfOperationExceptionTest/customerservice/customers"));
+        assertTrue(response.contains("Problem accessing /CxfOperationExceptionTest/rest"));
     }
 }

Modified: camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml?rev=1330643&r1=1330642&r2=1330643&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml (original)
+++ camel/trunk/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfOperationException.xml Thu Apr 26 03:54:40 2012
@@ -46,8 +46,8 @@
   <cxf:rsServer id="rsServer" address="http://localhost:${CXFTestSupport.port1}/CxfOperationExceptionTest/route"
     serviceClass="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService" />
 
-  <!-- Defined the client endpoint to create the cxf-rs consumer -->
-  <cxf:rsClient id="rsClient" address="http://localhost:${CXFTestSupport.port2}/CxfOperationExceptionTest/rest"
+  <!-- Defined the client endpoint to create the cxf-rs producer -->
+  <cxf:rsClient id="rsClient" address="http://localhost:${CXFTestSupport.port1}/CxfOperationExceptionTest/rest"
     serviceClass="org.apache.camel.component.cxf.jaxrs.testbean.CustomerService"/>
   
   <!-- The camel route context -->