Author: janstey
Date: Wed Sep 10 12:37:30 2008
New Revision: 693948
URL: http://svn.apache.org/viewvc?rev=693948&view=rev
Log:
Small source improvements I've had lying around for a while.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java?rev=693948&r1=693947&r2=693948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/RedeliveryPolicy.java
Wed Sep 10 12:37:30 2008
@@ -168,7 +168,7 @@
}
/**
- * Enables collision avoidence which adds some randomization to the backoff
+ * Enables collision avoidance which adds some randomization to the backoff
* timings to reduce contention probability
*/
public RedeliveryPolicy useCollisionAvoidance() {
@@ -177,7 +177,7 @@
}
/**
- * Enables exponential backof using the [EMAIL PROTECTED]
#getBackOffMultiplier()} to
+ * Enables exponential backoff using the [EMAIL PROTECTED]
#getBackOffMultiplier()} to
* increase the time between retries
*/
public RedeliveryPolicy useExponentialBackOff() {
@@ -196,7 +196,7 @@
}
/**
- * Enables collision avoidence and sets the percentage used
+ * Enables collision avoidance and sets the percentage used
*/
public RedeliveryPolicy collisionAvoidancePercent(double
collisionAvoidancePercent) {
useCollisionAvoidance();
@@ -232,7 +232,7 @@
}
/**
- * Sets the percentage used for collision avoidence if enabled via
+ * Sets the percentage used for collision avoidance if enabled via
* [EMAIL PROTECTED] #setUseCollisionAvoidance(boolean)}
*/
public void setCollisionAvoidancePercent(double collisionAvoidancePercent)
{
@@ -244,7 +244,7 @@
}
/**
- * Sets the factor used for collision avoidence if enabled via
+ * Sets the factor used for collision avoidance if enabled via
* [EMAIL PROTECTED] #setUseCollisionAvoidance(boolean)}
*/
public void setCollisionAvoidanceFactor(double collisionAvoidanceFactor) {
@@ -296,7 +296,7 @@
}
/**
- * Enables/disables collision avoidence which adds some randomization to
the
+ * Enables/disables collision avoidance which adds some randomization to
the
* backoff timings to reduce contention probability
*/
public void setUseCollisionAvoidance(boolean useCollisionAvoidance) {
@@ -308,7 +308,7 @@
}
/**
- * Enables/disables exponential backof using the
+ * Enables/disables exponential backoff using the
* [EMAIL PROTECTED] #getBackOffMultiplier()} to increase the time between
retries
*/
public void setUseExponentialBackOff(boolean useExponentialBackOff) {
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java?rev=693948&r1=693947&r2=693948&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
Wed Sep 10 12:37:30 2008
@@ -38,7 +38,7 @@
sendMessage("bar", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendToSecondWhen() throws Exception {
@@ -48,7 +48,7 @@
sendMessage("cheese", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendToOtherwiseClause() throws Exception {
@@ -58,7 +58,7 @@
sendMessage("somethingUndefined", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected void sendMessage(final Object headerValue, final Object body)
throws Exception {
@@ -78,9 +78,9 @@
return new RouteBuilder() {
public void configure() {
from("direct:start").choice()
-
.when(header("foo").isEqualTo("bar")).setHeader("name",
constant("a")).to("mock:x")
- .when(header("foo").isEqualTo("cheese")).to("mock:y")
- .otherwise().to("mock:z");
+ .when().xpath("$foo = 'bar'").to("mock:x")
+ .when().xpath("$foo = 'cheese'").to("mock:y")
+ .otherwise().to("mock:z");
}
};
}
Modified:
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java?rev=693948&r1=693947&r2=693948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java
(original)
+++
activemq/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/TransactionErrorHandlerBuilderAsSpringBeanTest.java
Wed Sep 10 12:37:30 2008
@@ -23,7 +23,7 @@
import org.springframework.context.support.ClassPathXmlApplicationContext;
/**
- * To demonstrate the TransactionErrorHandlerBuilder configued in Spring XML.
+ * To demonstrate the TransactionErrorHandlerBuilder configured in Spring XML.
*/
public class TransactionErrorHandlerBuilderAsSpringBeanTest extends
SpringTestSupport {
Modified:
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java?rev=693948&r1=693947&r2=693948&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/interceptor/TransactionalClientDataSourceTest.java
Wed Sep 10 12:37:30 2008
@@ -99,7 +99,7 @@
if (useTransactionErrorHandler) {
// useTransactionErrorHandler is only used for unit
testing to reuse code
// for doing a 2nd test without this transaction error
handler, so ignore
- // this. For spring based transaction, end users is
encured to use the
+ // this. For spring based transaction, end users are
encouraged to use the
// transaction error handler instead of the default
DeadLetterChannel.
errorHandler(transactionErrorHandler(required).
// notice that the builder has builder methods for
chained configuration
