You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 21:17:57 UTC
svn commit: r1172757 - in /camel/branches/camel-2.8.x: ./
components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/
components/camel-test/src/main/java/org/apache/camel/test/
components/camel-test/src/main/java/org/apache/camel/test/juni...
Author: dkulp
Date: Mon Sep 19 19:17:57 2011
New Revision: 1172757
URL: http://svn.apache.org/viewvc?rev=1172757&view=rev
Log:
Merged revisions 1149494 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1149494 | davsclaus | 2011-07-22 04:17:15 -0400 (Fri, 22 Jul 2011) | 1 line
Fixed CS
........
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-test/src/main/java/org/apache/camel/test/TestSupport.java
camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
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=1172757&r1=1172756&r2=1172757&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 Mon Sep 19 19:17:57 2011
@@ -148,7 +148,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/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java?rev=1172757&r1=1172756&r2=1172757&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java (original)
+++ camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/TestSupport.java Mon Sep 19 19:17:57 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/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java?rev=1172757&r1=1172756&r2=1172757&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java (original)
+++ camel/branches/camel-2.8.x/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java Mon Sep 19 19:17:57 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/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java?rev=1172757&r1=1172756&r2=1172757&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java (original)
+++ camel/branches/camel-2.8.x/components/camel-testng/src/main/java/org/apache/camel/testng/TestSupport.java Mon Sep 19 19:17:57 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/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java?rev=1172757&r1=1172756&r2=1172757&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java (original)
+++ camel/branches/camel-2.8.x/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/cxf/blueprint/CxfRsBlueprintRouterTest.java Mon Sep 19 19:17:57 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;
@@ -40,8 +40,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)
@@ -186,7 +186,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"))