camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1149494 - in /camel/trunk: components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/ components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/ components/camel-test/src/main/java/org/apache/camel/test/ compo...
Date Fri, 22 Jul 2011 08:17:17 GMT
Author: davsclaus
Date: Fri Jul 22 08:17:15 2011
New Revision: 1149494

URL: http://svn.apache.org/viewvc?rev=1149494&view=rev
Log:
Fixed CS

Modified:
    camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
    camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java
    camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
    camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
    camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
    camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java

Modified: camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java?rev=1149494&r1=1149493&r2=1149494&view=diff
==============================================================================
--- camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
(original)
+++ camel/trunk/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
Fri Jul 22 08:17:15 2011
@@ -141,7 +141,7 @@ public class CxfRsEndpoint extends Defau
         if (getAddress() != null) {
             sfb.setAddress(getAddress());
         }
-        if (getResourceClasses()!= null) {
+        if (getResourceClasses() != null) {
             sfb.setResourceClasses(CastUtils.cast(getResourceClasses(), Class.class));
         }
         sfb.setStart(false);

Modified: camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java?rev=1149494&r1=1149493&r2=1149494&view=diff
==============================================================================
--- camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java
(original)
+++ camel/trunk/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FileToFtpTempFileNameTest.java
Fri Jul 22 08:17:15 2011
@@ -45,9 +45,9 @@ public class FileToFtpTempFileNameTest e
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-              from("file://target/in?recursive=true")
-                  .to("ftp://admin:admin@localhost:" + getPort() +
-                          "//out/?fileName=${file:name}&tempFileName=${file:onlyname}.part&stepwise=false");
+                from("file://target/in?recursive=true")
+                    .to("ftp://admin:admin@localhost:" + getPort()
+                        + "//out/?fileName=${file:name}&tempFileName=${file:onlyname}.part&stepwise=false");
             }
         };
     }

Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java?rev=1149494&r1=1149493&r2=1149494&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
(original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
Fri Jul 22 08:17:15 2011
@@ -49,8 +49,8 @@ import org.slf4j.LoggerFactory;
  * @version 
  */
 public abstract class TestSupport extends TestCase {
-    private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
     protected static final String LS = System.getProperty("line.separator");
+    private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
     protected transient Logger log = LoggerFactory.getLogger(getClass());
     
     /**

Modified: camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java?rev=1149494&r1=1149493&r2=1149494&view=diff
==============================================================================
--- camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
(original)
+++ camel/trunk/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
Fri Jul 22 08:17:15 2011
@@ -52,8 +52,8 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class TestSupport extends Assert {
 
-    private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
     protected static final String LS = System.getProperty("line.separator");
+    private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
     protected transient Logger log = LoggerFactory.getLogger(getClass());
 
     // CHECKSTYLE:OFF

Modified: camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java?rev=1149494&r1=1149493&r2=1149494&view=diff
==============================================================================
--- camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
(original)
+++ camel/trunk/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
Fri Jul 22 08:17:15 2011
@@ -49,9 +49,9 @@ import org.testng.Assert;
  * @version $Revision$
  */
 public abstract class TestSupport extends Assert {
+    protected static final String LS = System.getProperty("line.separator");
     private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class);
     protected transient Logger log = LoggerFactory.getLogger(getClass());
-    protected static final String LS = System.getProperty("line.separator");
 
     // Builder methods for expressions used when testing
     // -------------------------------------------------------------------------

Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java?rev=1149494&r1=1149493&r2=1149494&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
(original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
Fri Jul 22 08:17:15 2011
@@ -18,8 +18,8 @@ package org.apache.camel.itest.osgi.cxf.
 
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.CustomerService;
 import org.apache.camel.itest.osgi.blueprint.OSGiBlueprintTestSupport;
+import org.apache.camel.itest.osgi.cxf.blueprint.jaxrs.testbean.CustomerService;
 import org.apache.cxf.endpoint.Server;
 import org.apache.cxf.jaxrs.JAXRSServerFactoryBean;
 import org.apache.http.HttpResponse;
@@ -41,8 +41,8 @@ import org.ops4j.pax.exam.junit.JUnit4Te
 import org.osgi.framework.Constants;
 
 import static org.ops4j.pax.exam.OptionUtils.combine;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.scanFeatures;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
 import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.newBundle;
 
 @RunWith(JUnit4TestRunner.class)
@@ -188,7 +188,7 @@ public class CxfRsBlueprintRouterTest ex
            
             // using the features to install the camel components
             scanFeatures(getCamelKarafFeatureUrl(),
-                         "camel-blueprint","camel-http4", "camel-cxf"),
+                         "camel-blueprint", "camel-http4", "camel-cxf"),
                                         
             bundle(newBundle()
                 .add("OSGI-INF/blueprint/test.xml", CxfRsBlueprintRouterTest.class.getResource("CxfRsBlueprintRouter.xml"))
@@ -200,7 +200,7 @@ public class CxfRsBlueprintRouterTest ex
                 .set(Constants.BUNDLE_SYMBOLICNAME, "CxfRsBlueprintRouterTest")
                 .set(Constants.DYNAMICIMPORT_PACKAGE, "*")
                 .build()).noStart(),
-            vmOption( "-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006"
)
+            vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5006")
 
         );
           



Mime
View raw message