Author: ningjiang
Date: Mon Apr 20 09:58:02 2009
New Revision: 766634
URL: http://svn.apache.org/viewvc?rev=766634&view=rev
Log:
Fixed the cs error of camel-itest
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java?rev=766634&r1=766633&r2=766634&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpRoute.java
Mon Apr 20 09:58:02 2009
@@ -35,14 +35,13 @@
* @version $Revision$
*/
public class JmsToHttpRoute extends SpringRouteBuilder {
-
+ protected static int counter;
+
@Resource(name = "PROPAGATION_REQUIRED")
protected SpringTransactionPolicy required;
@EndpointInject(name = "data")
- protected Endpoint data;
-
- protected static int counter;
+ protected Endpoint data;
protected String nok = "<?xml
version=\"1.0\"?><reply><status>nok</status></reply>";
protected String ok = "<?xml
version=\"1.0\"?><reply><status>ok</status></reply>";
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java?rev=766634&r1=766633&r2=766634&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionAndNoTransactionErrorHandlerConfiguredTest.java
Mon Apr 20 09:58:02 2009
@@ -70,7 +70,7 @@
// will send and wait for a response
try {
template.requestBodyAndHeader(data,
- "<?xml version=\"1.0\"?><request><status id=\"123\"/></request>",
"user", "guest");
+ "<?xml version=\"1.0\"?><request><status
id=\"123\"/></request>", "user", "guest");
fail("Should throw an exception");
} catch (RuntimeCamelException e) {
assertTrue("Should timeout", e.getCause() instanceof
ExchangeTimedOutException);
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java?rev=766634&r1=766633&r2=766634&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpTXWithOnExceptionTest.java
Mon Apr 20 09:58:02 2009
@@ -70,7 +70,7 @@
// will send and wait for a response
try {
template.requestBodyAndHeader(data,
- "<?xml version=\"1.0\"?><request><status id=\"123\"/></request>",
"user", "guest");
+ "<?xml version=\"1.0\"?><request><status
id=\"123\"/></request>", "user", "guest");
fail("Should throw an exception");
} catch (RuntimeCamelException e) {
assertTrue("Should timeout", e.getCause() instanceof
ExchangeTimedOutException);
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java?rev=766634&r1=766633&r2=766634&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionAndNoTransactionErrorHandlerConfiguredRoute.java
Mon Apr 20 09:58:02 2009
@@ -17,8 +17,8 @@
package org.apache.camel.itest.tx;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.Predicate;
+import org.apache.camel.Processor;
import org.apache.camel.component.http.HttpConstants;
import org.apache.camel.component.http.HttpOperationFailedException;
Modified:
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
URL:
http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java?rev=766634&r1=766633&r2=766634&view=diff
==============================================================================
---
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
(original)
+++
camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/tx/JmsToHttpWithOnExceptionRoute.java
Mon Apr 20 09:58:02 2009
@@ -17,8 +17,8 @@
package org.apache.camel.itest.tx;
import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
import org.apache.camel.Predicate;
+import org.apache.camel.Processor;
import org.apache.camel.component.http.HttpConstants;
import org.apache.camel.component.http.HttpOperationFailedException;
