camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject svn commit: r1463377 - in /camel/trunk/components: camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/ camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/ camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/ came...
Date Tue, 02 Apr 2013 04:12:47 GMT
Author: hadrian
Date: Tue Apr  2 04:12:47 2013
New Revision: 1463377

URL: http://svn.apache.org/r1463377
Log:
CS fixes in preparation of 2.11.0 release

Modified:
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
    camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
    camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java?rev=1463377&r1=1463376&r2=1463377&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/simplebinding/CxfRsConsumerSimpleBindingTest.java
Tue Apr  2 04:12:47 2013
@@ -58,7 +58,8 @@ import org.junit.Test;
  */
 public class CxfRsConsumerSimpleBindingTest extends CamelTestSupport {
     private static final String PORT_PATH = CXFTestSupport.getPort1() + "/CxfRsConsumerTest";
-    private static final String CXF_RS_ENDPOINT_URI = "cxfrs://http://localhost:" + PORT_PATH
+ "/rest?resourceClasses=org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.CustomerServiceResource&bindingStyle=SimpleConsumer";
+    private static final String CXF_RS_ENDPOINT_URI = "cxfrs://http://localhost:" + PORT_PATH
+        + "/rest?resourceClasses=org.apache.camel.component.cxf.jaxrs.simplebinding.testbean.CustomerServiceResource&bindingStyle=SimpleConsumer";
     
     private JAXBContext jaxb;
     private HttpClient httpclient;
@@ -75,10 +76,8 @@ public class CxfRsConsumerSimpleBindingT
     }
     
     protected RouteBuilder createRouteBuilder() throws Exception {
-                
         return new RouteBuilder() {
             public void configure() {
-                
                 from(CXF_RS_ENDPOINT_URI)
                     .recipientList(simple("direct:${header.operationName}"));
                     
@@ -99,14 +98,14 @@ public class CxfRsConsumerSimpleBindingT
                     }
                 });
                             
-               from("direct:updateCustomer").process(new Processor() {
+                from("direct:updateCustomer").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
                         assertEquals("123", exchange.getIn().getHeader("id"));
                         Customer c = exchange.getIn().getBody(Customer.class);
                         assertEquals(123, c.getId());
                         assertNotNull(c);
                     }
-               });
+                });
                         
                 from("direct:newCustomer").process(new Processor() {
                     public void process(Exchange exchange) throws Exception {
@@ -193,9 +192,8 @@ public class CxfRsConsumerSimpleBindingT
                         exchange.getOut().setBody(null);
                     }
                 });
-        
-        }};
-            
+            }
+        };
     }
     
     @Test

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java?rev=1463377&r1=1463376&r2=1463377&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/spring/CxfEndpointBeanTest.java
Tue Apr  2 04:12:47 2013
@@ -75,11 +75,11 @@ public class CxfEndpointBeanTest extends
         CxfEndpoint myLocalCxfEndpoint = (CxfEndpoint)context.getEndpoint("cxf:bean:routerEndpoint?address=http://localhost:"

             + port1 + "/CxfEndpointBeanTest/myCamelContext/");
         assertEquals("Got the wrong endpoint address", "http://localhost:" + port1 
-                + "/CxfEndpointBeanTest/myCamelContext/", myLocalCxfEndpoint.getAddress());
+            + "/CxfEndpointBeanTest/myCamelContext/", myLocalCxfEndpoint.getAddress());
 
         CxfEndpoint routerEndpoint = ctx.getBean("routerEndpoint", CxfEndpoint.class);
         assertEquals("Got the wrong endpoint address", "http://localhost:" + port1 
-                     + "/CxfEndpointBeanTest/router", routerEndpoint.getAddress());
+            + "/CxfEndpointBeanTest/router", routerEndpoint.getAddress());
     }
     
     @Test

Modified: camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java?rev=1463377&r1=1463376&r2=1463377&view=diff
==============================================================================
--- camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
(original)
+++ camel/trunk/components/camel-jaxb/src/main/java/org/apache/camel/converter/jaxb/JaxbDataFormat.java
Tue Apr  2 04:12:47 2013
@@ -59,6 +59,7 @@ import org.apache.camel.util.ResourceHel
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+
 /**
  * A <a href="http://camel.apache.org/data-format.html">data format</a> ({@link
DataFormat})
  * using JAXB2 to marshal to and from XML

Modified: camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java?rev=1463377&r1=1463376&r2=1463377&view=diff
==============================================================================
--- camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
(original)
+++ camel/trunk/components/camel-soap/src/main/java/org/apache/camel/dataformat/soap/SoapJaxbDataFormat.java
Tue Apr  2 04:12:47 2013
@@ -30,6 +30,8 @@ import javax.xml.bind.JAXBException;
 import javax.xml.bind.JAXBIntrospector;
 import javax.xml.namespace.QName;
 
+import org.xml.sax.SAXException;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.RuntimeCamelException;
@@ -42,6 +44,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
+
 /**
  * Data format supporting SOAP 1.1 and 1.2.
  */



Mime
View raw message