You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2010/07/11 15:12:39 UTC
svn commit: r963068 - in /camel/trunk:
components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/
tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/
Author: ningjiang
Date: Sun Jul 11 13:12:38 2010
New Revision: 963068
URL: http://svn.apache.org/viewvc?rev=963068&view=rev
Log:
Fixed the CS errors
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/MyRouteBuilder.java
camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/OSGiPackageScanTest.java
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTX2Test.java Sun Jul 11 13:12:38 2010
@@ -29,6 +29,8 @@ import org.springframework.context.suppo
* @version $Revision$
*/
public class AsyncEndpointJmsTX2Test extends CamelSpringTestSupport {
+ private static String beforeThreadName;
+ private static String afterThreadName;
@Override
protected int getExpectedRouteCount() {
@@ -39,10 +41,7 @@ public class AsyncEndpointJmsTX2Test ext
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
- }
-
- private static String beforeThreadName;
- private static String afterThreadName;
+ }
@Test
public void testAsyncEndpointOK() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXMulticastTest.java Sun Jul 11 13:12:38 2010
@@ -29,6 +29,9 @@ import org.springframework.context.suppo
* @version $Revision$
*/
public class AsyncEndpointJmsTXMulticastTest extends CamelSpringTestSupport {
+ private static String beforeThreadName;
+ private static String afterThreadName;
+
@Override
protected int getExpectedRouteCount() {
@@ -40,10 +43,7 @@ public class AsyncEndpointJmsTXMulticast
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
}
-
- private static String beforeThreadName;
- private static String afterThreadName;
-
+
@Test
public void testAsyncEndpointOK() throws Exception {
getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRecipientListTest.java Sun Jul 11 13:12:38 2010
@@ -29,6 +29,8 @@ import org.springframework.context.suppo
* @version $Revision$
*/
public class AsyncEndpointJmsTXRecipientListTest extends CamelSpringTestSupport {
+ private static String beforeThreadName;
+ private static String afterThreadName;
@Override
protected int getExpectedRouteCount() {
@@ -39,10 +41,7 @@ public class AsyncEndpointJmsTXRecipient
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
- }
-
- private static String beforeThreadName;
- private static String afterThreadName;
+ }
@Test
public void testAsyncEndpointOK() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollback2Test.java Sun Jul 11 13:12:38 2010
@@ -32,6 +32,9 @@ public class AsyncEndpointJmsTXRollback2
private static int invoked;
+ private static String beforeThreadName;
+ private static String afterThreadName;
+
@Override
protected int getExpectedRouteCount() {
// no routes in Spring XML so return 0
@@ -43,9 +46,6 @@ public class AsyncEndpointJmsTXRollback2
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
}
- private static String beforeThreadName;
- private static String afterThreadName;
-
@Test
public void testAsyncEndpointRollback() throws Exception {
invoked = 0;
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRollbackTest.java Sun Jul 11 13:12:38 2010
@@ -31,6 +31,8 @@ import org.springframework.context.suppo
public class AsyncEndpointJmsTXRollbackTest extends CamelSpringTestSupport {
private static int invoked;
+ private static String beforeThreadName;
+ private static String afterThreadName;
@Override
protected int getExpectedRouteCount() {
@@ -41,10 +43,7 @@ public class AsyncEndpointJmsTXRollbackT
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
- }
-
- private static String beforeThreadName;
- private static String afterThreadName;
+ }
@Test
public void testAsyncEndpointRollback() throws Exception {
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXRoutingSlipTest.java Sun Jul 11 13:12:38 2010
@@ -30,6 +30,9 @@ import org.springframework.context.suppo
*/
public class AsyncEndpointJmsTXRoutingSlipTest extends CamelSpringTestSupport {
+ private static String beforeThreadName;
+ private static String afterThreadName;
+
@Override
protected int getExpectedRouteCount() {
// no routes in Spring XML so return 0
@@ -41,9 +44,6 @@ public class AsyncEndpointJmsTXRoutingSl
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
}
- private static String beforeThreadName;
- private static String afterThreadName;
-
@Test
public void testAsyncEndpointOK() throws Exception {
getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTest.java Sun Jul 11 13:12:38 2010
@@ -29,6 +29,8 @@ import org.springframework.context.suppo
* @version $Revision$
*/
public class AsyncEndpointJmsTXTest extends CamelSpringTestSupport {
+ private static String beforeThreadName;
+ private static String afterThreadName;
@Override
protected int getExpectedRouteCount() {
@@ -40,10 +42,7 @@ public class AsyncEndpointJmsTXTest exte
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
}
-
- private static String beforeThreadName;
- private static String afterThreadName;
-
+
@Test
public void testAsyncEndpointOK() throws Exception {
getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXTryCatchFinallyTest.java Sun Jul 11 13:12:38 2010
@@ -30,6 +30,9 @@ import org.springframework.context.suppo
*/
public class AsyncEndpointJmsTXTryCatchFinallyTest extends CamelSpringTestSupport {
+ private static String beforeThreadName;
+ private static String afterThreadName;
+
@Override
protected int getExpectedRouteCount() {
// no routes in Spring XML so return 0
@@ -41,9 +44,6 @@ public class AsyncEndpointJmsTXTryCatchF
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
}
- private static String beforeThreadName;
- private static String afterThreadName;
-
@Test
public void testAsyncEndpointOK() throws Exception {
getMockEndpoint("mock:before").expectedBodiesReceived("Hello Camel");
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/AsyncEndpointJmsTXWireTapTest.java Sun Jul 11 13:12:38 2010
@@ -29,6 +29,11 @@ import org.springframework.context.suppo
* @version $Revision$
*/
public class AsyncEndpointJmsTXWireTapTest extends CamelSpringTestSupport {
+ private static String beforeThreadName;
+ private static String afterThreadName;
+ private static volatile boolean txA;
+ private static volatile boolean txB;
+
@Override
protected int getExpectedRouteCount() {
@@ -40,12 +45,7 @@ public class AsyncEndpointJmsTXWireTapTe
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/component/jms/tx/JmsTransacted-context.xml");
}
-
- private static String beforeThreadName;
- private static String afterThreadName;
- private static volatile boolean txA;
- private static volatile boolean txB;
-
+
@Test
public void testAsyncEndpointOK() throws Exception {
getMockEndpoint("mock:tap").expectedBodiesReceived("Hi Camel");
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/MyRouteBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/MyRouteBuilder.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/MyRouteBuilder.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/MyRouteBuilder.java Sun Jul 11 13:12:38 2010
@@ -16,8 +16,8 @@
*/
package org.apache.camel.itest.osgi.packages;
-import org.springframework.stereotype.Component;
import org.apache.camel.builder.RouteBuilder;
+import org.springframework.stereotype.Component;
@Component
public class MyRouteBuilder extends RouteBuilder {
Modified: camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/OSGiPackageScanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/OSGiPackageScanTest.java?rev=963068&r1=963067&r2=963068&view=diff
==============================================================================
--- camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/OSGiPackageScanTest.java (original)
+++ camel/trunk/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/packages/OSGiPackageScanTest.java Sun Jul 11 13:12:38 2010
@@ -16,12 +16,12 @@
*/
package org.apache.camel.itest.osgi.packages;
-import org.ops4j.pax.exam.junit.JUnit4TestRunner;
-import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.itest.osgi.OSGiIntegrationSpringTestSupport;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.springframework.osgi.context.support.OsgiBundleXmlApplicationContext;
@RunWith(JUnit4TestRunner.class)
public class OSGiPackageScanTest extends OSGiIntegrationSpringTestSupport {