camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmuel...@apache.org
Subject svn commit: r1398969 - in /camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf: CXFTestSupport.java CxfPayLoadMessageRouterAddressOverrideTest.java CxfPayLoadMessageRouterTest.java CxfSimpleRouterTest.java
Date Tue, 16 Oct 2012 20:06:49 GMT
Author: cmueller
Date: Tue Oct 16 20:06:48 2012
New Revision: 1398969

URL: http://svn.apache.org/viewvc?rev=1398969&view=rev
Log:
some code formatting changes

Modified:
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFTestSupport.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java
    camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFTestSupport.java?rev=1398969&r1=1398968&r2=1398969&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFTestSupport.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CXFTestSupport.java
Tue Oct 16 20:06:48 2012
@@ -25,12 +25,14 @@ import org.apache.camel.test.AvailablePo
  * and closed all the time. 
  */
 public final class CXFTestSupport {
+
     static final int PORT1 = AvailablePortFinder.getNextAvailable();  
     static final int PORT2 = AvailablePortFinder.getNextAvailable();  
     static final int PORT3 = AvailablePortFinder.getNextAvailable();  
     static final int PORT4 = AvailablePortFinder.getNextAvailable();  
     static final int PORT5 = AvailablePortFinder.getNextAvailable();  
     static final int PORT6 = AvailablePortFinder.getNextAvailable();
+
     static {
         //set them as system properties so Spring can use the property placeholder
         //things to set them into the URL's in the spring contexts 
@@ -55,20 +57,24 @@ public final class CXFTestSupport {
     public static int getPort1() {
         return PORT1;
     }
+
     public static int getPort2() {
         return PORT2;
     }
+
     public static int getPort3() {
         return PORT3;
     }
+
     public static int getPort4() {
         return PORT4;
     }
+
     public static int getPort5() {
         return PORT5;
     }
+
     public static int getPort6() {
         return PORT6;
     }
-
 }

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java?rev=1398969&r1=1398968&r2=1398969&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterAddressOverrideTest.java
Tue Oct 16 20:06:48 2012
@@ -33,8 +33,10 @@ import org.apache.camel.converter.jaxp.X
  * @version 
  */
 public class CxfPayLoadMessageRouterAddressOverrideTest extends CxfPayLoadMessageRouterTest
{
+
     private String routerEndpointURI = "cxf://" + getRouterAddress() + "?" + SERVICE_CLASS
+ "&dataFormat=PAYLOAD";
     private String serviceEndpointURI = "cxf://http://localhost:9002/badAddress" + "?" +
SERVICE_CLASS + "&dataFormat=PAYLOAD";
+
     @Override
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
@@ -51,7 +53,6 @@ public class CxfPayLoadMessageRouterAddr
                         Element el = new XmlConverter().toDOMElement(elements.get(0));
                         assertEquals("Get the wrong namespace URI" , el.getNamespaceURI(),
"http://cxf.component.camel.apache.org/");
                     }
-                    
                 })
                 .to(serviceEndpointURI);
             }

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java?rev=1398969&r1=1398968&r2=1398969&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayLoadMessageRouterTest.java
Tue Oct 16 20:06:48 2012
@@ -34,8 +34,10 @@ import org.apache.camel.converter.jaxp.X
  * @version 
  */
 public class CxfPayLoadMessageRouterTest extends CxfSimpleRouterTest {
+
     private String routerEndpointURI = "cxf://" + getRouterAddress() + "?" + SERVICE_CLASS
+ "&dataFormat=PAYLOAD";
     private String serviceEndpointURI = "cxf://" + getServiceAddress() + "?" + SERVICE_CLASS
+ "&dataFormat=PAYLOAD";
+
     protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {

Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java?rev=1398969&r1=1398968&r2=1398969&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
(original)
+++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfSimpleRouterTest.java
Tue Oct 16 20:06:48 2012
@@ -33,7 +33,6 @@ import org.junit.Test;
 public class CxfSimpleRouterTest extends CamelTestSupport {    
     
     protected static final String SERVICE_CLASS = "serviceClass=org.apache.camel.component.cxf.HelloService";
-
     
     protected Server server;
     private String routerEndpointURI = "cxf://" + getRouterAddress() + "?" + SERVICE_CLASS
+ "&dataFormat=POJO";
@@ -42,13 +41,14 @@ public class CxfSimpleRouterTest extends
     protected String getRouterAddress() {
         return "http://localhost:" + CXFTestSupport.getPort1() + "/" + getClass().getSimpleName()
+ "/router";
     }
+
     protected String getServiceAddress() {
         return "http://localhost:" + CXFTestSupport.getPort2() + "/" + getClass().getSimpleName()
+ "/helloworld";
     }
     
     protected void configureFactory(ServerFactoryBean svrBean) {
-        
     }
+
     @Override
     public boolean isCreateCamelContextPerClass() {
         return true;
@@ -78,7 +78,9 @@ public class CxfSimpleRouterTest extends
         return new RouteBuilder() {
             public void configure() {
                 errorHandler(noErrorHandler());
-                from(routerEndpointURI).to("log:org.apache.camel?level=DEBUG").to(serviceEndpointURI);
+                from(routerEndpointURI)
+                    .to("log:org.apache.camel?level=DEBUG")
+                    .to(serviceEndpointURI);
             }
         };
     }



Mime
View raw message