Author: davsclaus
Date: Fri Aug 19 14:38:00 2011
New Revision: 1159648
URL: http://svn.apache.org/viewvc?rev=1159648&view=rev
Log:
CAMEL-4339: Renamed replaceFrom to replaceFromWith
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithReplaceFromTest.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithJUnit4Test.java
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/IsUseAdviceWithTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java?rev=1159648&r1=1159647&r2=1159648&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithRouteBuilder.java
Fri Aug 19 14:38:00 2011
@@ -93,9 +93,9 @@ public abstract class AdviceWithRouteBui
*
* @param uri uri of the new endpoint
*/
- public void replaceFrom(String uri) {
+ public void replaceFromWith(String uri) {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
- getAdviceWithTasks().add(AdviceWithTasks.replaceFrom(originalRoute,
uri));
+
getAdviceWithTasks().add(AdviceWithTasks.replaceFromWith(originalRoute, uri));
}
/**
@@ -103,7 +103,7 @@ public abstract class AdviceWithRouteBui
*
* @param endpoint the new endpoint
*/
- public void replaceFrom(Endpoint endpoint) {
+ public void replaceFromWith(Endpoint endpoint) {
ObjectHelper.notNull(originalRoute, "originalRoute", this);
getAdviceWithTasks().add(AdviceWithTasks.replaceFrom(originalRoute,
endpoint));
}
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java?rev=1159648&r1=1159647&r2=1159648&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/AdviceWithTasks.java
Fri Aug 19 14:38:00 2011
@@ -309,7 +309,7 @@ public final class AdviceWithTasks {
};
}
- public static AdviceWithTask replaceFrom(final RouteDefinition route,
final String uri) {
+ public static AdviceWithTask replaceFromWith(final RouteDefinition route,
final String uri) {
return new AdviceWithTask() {
public void task() throws Exception {
FromDefinition from = route.getInputs().get(0);
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithReplaceFromTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithReplaceFromTest.java?rev=1159648&r1=1159647&r2=1159648&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithReplaceFromTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/AdviceWithReplaceFromTest.java
Fri Aug 19 14:38:00 2011
@@ -33,7 +33,7 @@ public class AdviceWithReplaceFromTest e
@Override
public void configure() throws Exception {
// replace the input in the route with a new endpoint uri
- replaceFrom("seda:foo");
+ replaceFromWith("seda:foo");
}
});
@@ -52,7 +52,7 @@ public class AdviceWithReplaceFromTest e
@Override
public void configure() throws Exception {
// replace the input in the route with a new endpoint
- replaceFrom(endpoint);
+ replaceFromWith(endpoint);
}
});
@@ -69,7 +69,7 @@ public class AdviceWithReplaceFromTest e
context.getRouteDefinitions().get(0).adviceWith(context, new
AdviceWithRouteBuilder() {
@Override
public void configure() throws Exception {
- replaceFrom("xxx:foo");
+ replaceFromWith("xxx:foo");
}
});
fail("Should have thrown exception");
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithJUnit4Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithJUnit4Test.java?rev=1159648&r1=1159647&r2=1159648&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithJUnit4Test.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithJUnit4Test.java
Fri Aug 19 14:38:00 2011
@@ -32,7 +32,7 @@ public class IsUseAdviceWithJUnit4Test e
@Override
public void configure() throws Exception {
// replace the from with seda:foo
- replaceFrom("seda:foo");
+ replaceFromWith("seda:foo");
}
});
// we must manually start when we are done with all the advice with
Modified:
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java?rev=1159648&r1=1159647&r2=1159648&view=diff
==============================================================================
---
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java
(original)
+++
camel/trunk/components/camel-test/src/test/java/org/apache/camel/test/IsUseAdviceWithTest.java
Fri Aug 19 14:38:00 2011
@@ -29,7 +29,7 @@ public class IsUseAdviceWithTest extends
@Override
public void configure() throws Exception {
// replace the from with seda:foo
- replaceFrom("seda:foo");
+ replaceFromWith("seda:foo");
}
});
// we must manually start when we are done with all the advice with
Modified:
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/IsUseAdviceWithTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/IsUseAdviceWithTest.java?rev=1159648&r1=1159647&r2=1159648&view=diff
==============================================================================
---
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/IsUseAdviceWithTest.java
(original)
+++
camel/trunk/components/camel-testng/src/test/java/org/apache/camel/testng/patterns/IsUseAdviceWithTest.java
Fri Aug 19 14:38:00 2011
@@ -32,7 +32,7 @@ public class IsUseAdviceWithTest extends
@Override
public void configure() throws Exception {
// replace the from with seda:foo
- replaceFrom("seda:foo");
+ replaceFromWith("seda:foo");
}
});
// we must manually start when we are done with all the advice with
