You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by js...@apache.org on 2007/03/20 18:04:29 UTC

svn commit: r520482 - /activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/

Author: jstrachan
Date: Tue Mar 20 10:04:27 2007
New Revision: 520482

URL: http://svn.apache.org/viewvc?view=rev&rev=520482
Log:
renamed the builders to make them a little easier to follow; they generally now follow the name of the verb in the builder language

Added:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FilterBuilder.java   (contents, props changed)
      - copied, changed from r520404, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FromBuilder.java   (contents, props changed)
      - copied, changed from r520404, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java   (contents, props changed)
      - copied, changed from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ToBuilder.java   (contents, props changed)
      - copied, changed from r520404, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/WhenBuilder.java   (contents, props changed)
      - copied, changed from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoicePredicateBuilder.java
Removed:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoicePredicateBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java
Modified:
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java
    activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java?view=diff&rev=520482&r1=520481&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoiceBuilder.java Tue Mar 20 10:04:27 2007
@@ -28,13 +28,13 @@
 /**
  * @version $Revision$
  */
-public class ChoiceBuilder<E extends Exchange> extends DestinationBuilder<E> {
+public class ChoiceBuilder<E extends Exchange> extends FromBuilder<E> {
 
-    private final DestinationBuilder<E> parent;
-    private List<ChoicePredicateBuilder<E>> predicateBuilders = new ArrayList<ChoicePredicateBuilder<E>>();
-    private DestinationBuilder<E> otherwise;
+    private final FromBuilder<E> parent;
+    private List<WhenBuilder<E>> predicateBuilders = new ArrayList<WhenBuilder<E>>();
+    private FromBuilder<E> otherwise;
 
-    public ChoiceBuilder(DestinationBuilder<E> parent) {
+    public ChoiceBuilder(FromBuilder<E> parent) {
         super(parent);
         this.parent = parent;
     }
@@ -44,29 +44,29 @@
      *
      * @return a builder for creating a when predicate clause and action
      */
-    public ChoicePredicateBuilder<E> when(Predicate<E> predicate) {
-        ChoicePredicateBuilder<E> answer = new ChoicePredicateBuilder<E>(this, predicate);
+    public WhenBuilder<E> when(Predicate<E> predicate) {
+        WhenBuilder<E> answer = new WhenBuilder<E>(this, predicate);
         predicateBuilders.add(answer);
         return answer;
     }
 
-    public DestinationBuilder<E> otherwise() {
-        this.otherwise = new DestinationBuilder<E>(parent);
+    public FromBuilder<E> otherwise() {
+        this.otherwise = new FromBuilder<E>(parent);
         return otherwise;
     }
 
-    public List<ChoicePredicateBuilder<E>> getPredicateBuilders() {
+    public List<WhenBuilder<E>> getPredicateBuilders() {
         return predicateBuilders;
     }
 
-    public DestinationBuilder<E> getOtherwise() {
+    public FromBuilder<E> getOtherwise() {
         return otherwise;
     }
 
     @Override
     public Processor<E> createProcessor() {
         List<FilterProcessor<E>> filters = new ArrayList<FilterProcessor<E>>();
-        for (ChoicePredicateBuilder<E> predicateBuilder : predicateBuilders) {
+        for (WhenBuilder<E> predicateBuilder : predicateBuilders) {
             filters.add(predicateBuilder.createProcessor());
         }
         Processor<E> otherwiseProcessor = null;

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java?view=diff&rev=520482&r1=520481&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConstantProcessorBuilder.java Tue Mar 20 10:04:27 2007
@@ -23,7 +23,7 @@
 /**
  * @version $Revision$
  */
-public class ConstantProcessorBuilder<E extends Exchange> implements ProcessorBuilder<E> {
+public class ConstantProcessorBuilder<E extends Exchange> implements ProcessorFactory<E> {
     private Processor<E> processor;
 
     public ConstantProcessorBuilder(Processor<E> processor) {

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FilterBuilder.java (from r520404, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FilterBuilder.java?view=diff&rev=520482&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java&r1=520404&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FilterBuilder.java&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/PredicateBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FilterBuilder.java Tue Mar 20 10:04:27 2007
@@ -25,10 +25,10 @@
 /**
  * @version $Revision$
  */
-public class PredicateBuilder<E extends Exchange> extends DestinationBuilder<E> {
+public class FilterBuilder<E extends Exchange> extends FromBuilder<E> {
     private Predicate<E> predicate;
 
-    public PredicateBuilder(DestinationBuilder<E> builder, Predicate<E> predicate) {
+    public FilterBuilder(FromBuilder<E> builder, Predicate<E> predicate) {
         super(builder);
         this.predicate = predicate;
     }
@@ -36,7 +36,7 @@
     /**
      * Adds another predicate using a logican AND
      */
-    public PredicateBuilder<E> and(Predicate<E> predicate) {
+    public FilterBuilder<E> and(Predicate<E> predicate) {
         this.predicate = Predicates.and(this.predicate, predicate);
         return this;
     }
@@ -44,7 +44,7 @@
     /**
      * Adds another predicate using a logican OR
      */
-    public PredicateBuilder<E> or(Predicate<E> predicate) {
+    public FilterBuilder<E> or(Predicate<E> predicate) {
         this.predicate = Predicates.or(this.predicate, predicate);
         return this;
     }

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FilterBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FilterBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FilterBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FromBuilder.java (from r520404, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FromBuilder.java?view=diff&rev=520482&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java&r1=520404&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FromBuilder.java&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DestinationBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FromBuilder.java Tue Mar 20 10:04:27 2007
@@ -29,18 +29,18 @@
 /**
  * @version $Revision$
  */
-public class DestinationBuilder<E extends Exchange> extends BuilderSupport<E> implements ProcessorBuilder<E> {
+public class FromBuilder<E extends Exchange> extends BuilderSupport<E> implements ProcessorFactory<E> {
     private RouteBuilder<E> builder;
     private Endpoint<E> from;
     private List<Processor<E>> processors = new ArrayList<Processor<E>>();
-    private List<ProcessorBuilder<E>> processBuilders = new ArrayList<ProcessorBuilder<E>>();
+    private List<ProcessorFactory<E>> processFactories = new ArrayList<ProcessorFactory<E>>();
 
-    public DestinationBuilder(RouteBuilder<E> builder, Endpoint<E> from) {
+    public FromBuilder(RouteBuilder<E> builder, Endpoint<E> from) {
         this.builder = builder;
         this.from = from;
     }
 
-    public DestinationBuilder(DestinationBuilder<E> parent) {
+    public FromBuilder(FromBuilder<E> parent) {
         this.builder = parent.getBuilder();
         this.from = parent.getFrom();
     }
@@ -55,15 +55,15 @@
     /**
      * Sends the exchange to the given endpoint URI
      */
-    public ProcessorBuilder<E> to(String uri) {
+    public ProcessorFactory<E> to(String uri) {
         return to(endpoint(uri));
     }
 
     /**
      * Sends the exchange to the given endpoint
      */
-    public ProcessorBuilder<E> to(Endpoint<E> endpoint) {
-        ConfiguredDestinationBuilder<E> answer = new ConfiguredDestinationBuilder<E>(this, endpoint);
+    public ProcessorFactory<E> to(Endpoint<E> endpoint) {
+        ToBuilder<E> answer = new ToBuilder<E>(this, endpoint);
         addProcessBuilder(answer);
         return answer;
     }
@@ -72,8 +72,8 @@
     /**
      * Sends the exchange to the given endpoint URI
      */
-    public ProcessorBuilder<E> to(String... uris) {
-        ProcessorBuilder<E> answer = null;
+    public ProcessorFactory<E> to(String... uris) {
+        ProcessorFactory<E> answer = null;
         for (String uri : uris) {
             answer = to(endpoint(uri));
         }
@@ -83,8 +83,8 @@
     /**
      * Sends the exchange to the given endpoint
      */
-    public ProcessorBuilder<E> to(Endpoint<E>... endpoints) {
-        ProcessorBuilder<E> answer = null;
+    public ProcessorFactory<E> to(Endpoint<E>... endpoints) {
+        ProcessorFactory<E> answer = null;
         for (Endpoint<E> endpoint : endpoints) {
             answer = to(endpoint);          
         }
@@ -95,7 +95,7 @@
     /**
      * Adds the custom processor to this destination
      */
-    public ProcessorBuilder<E> process(Processor<E> processor) {
+    public ConstantProcessorBuilder<E> process(Processor<E> processor) {
         ConstantProcessorBuilder<E> answer = new ConstantProcessorBuilder<E>(processor);
         addProcessBuilder(answer);
         return answer;
@@ -109,8 +109,8 @@
      *
      * @return the builder for a predicate
      */
-    public PredicateBuilder<E> filter(Predicate<E> predicate) {
-        PredicateBuilder<E> answer = new PredicateBuilder<E>(this, predicate);
+    public FilterBuilder<E> filter(Predicate<E> predicate) {
+        FilterBuilder<E> answer = new FilterBuilder<E>(this, predicate);
         addProcessBuilder(answer);
         return answer;
     }
@@ -149,8 +149,8 @@
         return from;
     }
 
-    public void addProcessBuilder(ProcessorBuilder<E> processBuilder) {
-        processBuilders.add(processBuilder);
+    public void addProcessBuilder(ProcessorFactory<E> processFactory) {
+        processFactories.add(processFactory);
     }
 
     public void addProcessor(Processor<E> processor) {
@@ -160,10 +160,10 @@
     public Processor<E> createProcessor() {
         List<Processor<E>> answer = new ArrayList<Processor<E>>();
 
-        for (ProcessorBuilder<E> processBuilder : processBuilders) {
-            Processor<E> processor = processBuilder.createProcessor();
+        for (ProcessorFactory<E> processFactory : processFactories) {
+            Processor<E> processor = processFactory.createProcessor();
             if (processor == null) {
-                throw new IllegalArgumentException("No processor created for processBuilder: " + processBuilder);
+                throw new IllegalArgumentException("No processor created for processBuilder: " + processFactory);
             }
             answer.add(processor);
         }

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FromBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FromBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/FromBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java?view=diff&rev=520482&r1=520481&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/InterceptorBuilder.java Tue Mar 20 10:04:27 2007
@@ -28,12 +28,12 @@
 /**
  * @version $Revision: 519943 $
  */
-public class InterceptorBuilder<E extends Exchange> implements ProcessorBuilder<E> {
+public class InterceptorBuilder<E extends Exchange> implements ProcessorFactory<E> {
     private final List<InterceptorProcessor<E>> intercepts = new ArrayList<InterceptorProcessor<E>>();
-	private final DestinationBuilder<E> parent;
-	private DestinationBuilder<E> target;
+	private final FromBuilder<E> parent;
+	private FromBuilder<E> target;
 
-	public InterceptorBuilder(DestinationBuilder<E> parent) {
+	public InterceptorBuilder(FromBuilder<E> parent) {
 		this.parent = parent;
 	}
 
@@ -42,8 +42,8 @@
 		return this;
 	}
 	
-    public DestinationBuilder<E> target() {
-        this.target = new DestinationBuilder<E>(parent);
+    public FromBuilder<E> target() {
+        this.target = new FromBuilder<E>(parent);
         return target;
     }
 

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java (from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java?view=diff&rev=520482&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java&r1=520373&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java Tue Mar 20 10:04:27 2007
@@ -24,7 +24,7 @@
  * 
  * @version $Revision$
  */
-public interface ProcessorBuilder<E extends Exchange> {
+public interface ProcessorFactory<E extends Exchange> {
 
     public Processor<E> createProcessor();
 

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ProcessorFactory.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java?view=diff&rev=520482&r1=520481&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RecipientListBuilder.java Tue Mar 20 10:04:27 2007
@@ -27,10 +27,10 @@
  *
  * @version $Revision$
  */
-public class RecipientListBuilder<E extends Exchange> extends BuilderSupport<E> implements ProcessorBuilder<E> {
+public class RecipientListBuilder<E extends Exchange> extends BuilderSupport<E> implements ProcessorFactory<E> {
     private final ValueBuilder<E> valueBuilder;
 
-    public RecipientListBuilder(DestinationBuilder<E> destinationBuilder, ValueBuilder<E> valueBuilder) {
+    public RecipientListBuilder(FromBuilder<E> fromBuilder, ValueBuilder<E> valueBuilder) {
         super();
         this.valueBuilder = valueBuilder;
     }

Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java?view=diff&rev=520482&r1=520481&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/RouteBuilder.java Tue Mar 20 10:04:27 2007
@@ -20,9 +20,7 @@
 import org.apache.camel.Endpoint;
 import org.apache.camel.EndpointResolver;
 import org.apache.camel.Exchange;
-import org.apache.camel.Predicate;
 import org.apache.camel.Processor;
-import org.apache.camel.util.ObjectHelper;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,7 +35,7 @@
  */
 public abstract class RouteBuilder<E extends Exchange> extends BuilderSupport<E> {
     private CamelContext<E> container;
-    private List<DestinationBuilder<E>> destinationBuilders = new ArrayList<DestinationBuilder<E>>();
+    private List<FromBuilder<E>> fromBuilders = new ArrayList<FromBuilder<E>>();
     private AtomicBoolean initalized = new AtomicBoolean(false);
     private Map<Endpoint<E>, Processor<E>> routeMap = new HashMap<Endpoint<E>, Processor<E>>();
 
@@ -62,13 +60,13 @@
          return er.resolveEndpoint(c, uri);
     }
 
-    public DestinationBuilder<E> from(String uri) {
+    public FromBuilder<E> from(String uri) {
         return from(endpoint(uri));
     }
 
-    public DestinationBuilder<E> from(Endpoint<E> endpoint) {
-        DestinationBuilder<E> answer = new DestinationBuilder<E>(this, endpoint);
-        destinationBuilders.add(answer);
+    public FromBuilder<E> from(Endpoint<E> endpoint) {
+        FromBuilder<E> answer = new FromBuilder<E>(this, endpoint);
+        fromBuilders.add(answer);
         return answer;
     }
 
@@ -98,9 +96,9 @@
     /**
      * Returns the destinationBuilders which have been created
      */
-    public List<DestinationBuilder<E>> getDestinationBuilders() {
+    public List<FromBuilder<E>> getDestinationBuilders() {
         checkInitialized();
-        return destinationBuilders;
+        return fromBuilders;
     }
 
 
@@ -114,11 +112,11 @@
     }
 
     protected void populateRouteMap(Map<Endpoint<E>, Processor<E>> routeMap) {
-        for (DestinationBuilder<E> destinationBuilder : destinationBuilders) {
-            Endpoint<E> from = destinationBuilder.getFrom();
-            Processor<E> processor = destinationBuilder.createProcessor();
+        for (FromBuilder<E> fromBuilder : fromBuilders) {
+            Endpoint<E> from = fromBuilder.getFrom();
+            Processor<E> processor = fromBuilder.createProcessor();
             if (processor == null) {
-                throw new IllegalArgumentException("No processor created for DestinationBuilder: " + destinationBuilder);
+                throw new IllegalArgumentException("No processor created for DestinationBuilder: " + fromBuilder);
             }
             routeMap.put(from, processor);
         }

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ToBuilder.java (from r520404, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ToBuilder.java?view=diff&rev=520482&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java&r1=520404&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ToBuilder.java&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ConfiguredDestinationBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ToBuilder.java Tue Mar 20 10:04:27 2007
@@ -25,10 +25,10 @@
 /**
  * @version $Revision$
  */
-public class ConfiguredDestinationBuilder<E extends Exchange> extends DestinationBuilder<E> {
+public class ToBuilder<E extends Exchange> extends FromBuilder<E> {
     private Endpoint<E> destination;
 
-    public ConfiguredDestinationBuilder(DestinationBuilder<E> parent, Endpoint<E> endpoint) {
+    public ToBuilder(FromBuilder<E> parent, Endpoint<E> endpoint) {
         super(parent);
         this.destination = endpoint;
     }

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ToBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ToBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ToBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/WhenBuilder.java (from r520373, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoicePredicateBuilder.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/WhenBuilder.java?view=diff&rev=520482&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoicePredicateBuilder.java&r1=520373&p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/WhenBuilder.java&r2=520482
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ChoicePredicateBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/WhenBuilder.java Tue Mar 20 10:04:27 2007
@@ -24,10 +24,10 @@
 /**
  * @version $Revision$
  */
-public class ChoicePredicateBuilder<E extends Exchange> extends PredicateBuilder<E> {
+public class WhenBuilder<E extends Exchange> extends FilterBuilder<E> {
     private final ChoiceBuilder<E> parent;
 
-    public ChoicePredicateBuilder(ChoiceBuilder<E> parent, Predicate<E> predicate) {
+    public WhenBuilder(ChoiceBuilder<E> parent, Predicate<E> predicate) {
         super(parent, predicate);
         this.parent = parent;
     }

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/WhenBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/WhenBuilder.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/WhenBuilder.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain