camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hadr...@apache.org
Subject svn commit: r750806 [4/7] - in /camel/trunk: camel-core/src/main/java/org/apache/camel/ camel-core/src/main/java/org/apache/camel/builder/ camel-core/src/main/java/org/apache/camel/impl/ camel-core/src/main/java/org/apache/camel/management/ camel-core/...
Date Fri, 06 Mar 2009 08:20:11 GMT
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetPropertyDefinition.java Fri Mar  6 08:20:00 2009
@@ -26,7 +26,7 @@
 import org.apache.camel.builder.ExpressionBuilder;
 import org.apache.camel.builder.ExpressionClause;
 import org.apache.camel.builder.ProcessorBuilder;
-import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.model.language.ExpressionDefinition;
 import org.apache.camel.spi.RouteContext;
 import org.apache.camel.util.ObjectHelper;
 
@@ -35,24 +35,24 @@
  */
 @XmlRootElement(name = "setProperty")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SetPropertyType extends ExpressionNode {
+public class SetPropertyDefinition extends ExpressionNode {
     @XmlAttribute(required = true)
     private String propertyName;
     
-    public SetPropertyType() {
+    public SetPropertyDefinition() {
     }
 
-    public SetPropertyType(String propertyName, ExpressionType expression) {
+    public SetPropertyDefinition(String propertyName, ExpressionDefinition expression) {
         super(expression);
         setPropertyName(propertyName);
     }
 
-    public SetPropertyType(String propertyName, Expression expression) {
+    public SetPropertyDefinition(String propertyName, Expression expression) {
         super(expression);
         setPropertyName(propertyName);        
     }
 
-    public SetPropertyType(String propertyName, String value) {
+    public SetPropertyDefinition(String propertyName, String value) {
         super(ExpressionBuilder.constantExpression(value));
         setPropertyName(propertyName);        
     }   
@@ -88,7 +88,7 @@
      * Set the expression that SetPropertyType will use
      * @return the builder
      */
-    public ExpressionClause<SetPropertyType> expression() {
+    public ExpressionClause<SetPropertyDefinition> expression() {
         return ExpressionClause.createAndSetExpression(this);
     }
 }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SortDefinition.java Fri Mar  6 08:20:00 2009
@@ -38,22 +38,22 @@
  */
 @XmlRootElement(name = "sort")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SortType extends OutputType<SortType> {
+public class SortDefinition extends OutputDefinition<SortDefinition> {
     @XmlTransient
     private Comparator comparator;
     @XmlAttribute(required = false)
     private String comparatorRef;
     @XmlElement(name = "expression", required = false)
-    private ExpressionSubElementType expression;
+    private ExpressionSubElementDefinition expression;
 
-    public SortType() {
+    public SortDefinition() {
     }
 
-    public SortType(Expression expression) {
+    public SortDefinition(Expression expression) {
         setExpression(expression);
     }
 
-    public SortType(Expression expression, Comparator comparator) {
+    public SortDefinition(Expression expression, Comparator comparator) {
         this(expression);
         this.comparator = comparator;
     }
@@ -94,7 +94,7 @@
 
     @Override
     @SuppressWarnings("unchecked")
-    public List<ProcessorType> getOutputs() {
+    public List<ProcessorDefinition> getOutputs() {
         return Collections.EMPTY_LIST;
     }
 
@@ -125,7 +125,7 @@
     }
 
     public void setExpression(Expression expression) {
-        this.expression = new ExpressionSubElementType(expression);
+        this.expression = new ExpressionSubElementDefinition(expression);
     }
 
     /**
@@ -134,7 +134,7 @@
      * @param comparator  the comparator to use for sorting
      * @return the builder
      */
-    public SortType comparator(Comparator comparator) {
+    public SortDefinition comparator(Comparator comparator) {
         setComparator(comparator);
         return this;
     }
@@ -145,7 +145,7 @@
      * @param ref reference for the comparator
      * @return the builder
      */
-    public SortType comparatorRef(String ref) {
+    public SortDefinition comparatorRef(String ref) {
         setComparatorRef(ref);
         return this;
     }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterDefinition.java Fri Mar  6 08:20:00 2009
@@ -30,7 +30,7 @@
 import org.apache.camel.Expression;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.ExpressionClause;
-import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.model.language.ExpressionDefinition;
 import org.apache.camel.processor.Splitter;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
@@ -43,7 +43,7 @@
  */
 @XmlRootElement(name = "split")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class SplitterType extends ExpressionNode {
+public class SplitterDefinition extends ExpressionNode {
     @XmlTransient
     private AggregationStrategy aggregationStrategy;
     @XmlAttribute(required = false)
@@ -57,14 +57,14 @@
     @XmlAttribute(required = false)
     private Boolean streaming = false;
     
-    public SplitterType() {
+    public SplitterDefinition() {
     }
 
-    public SplitterType(Expression expression) {
+    public SplitterDefinition(Expression expression) {
         super(expression);
     }
 
-    public SplitterType(ExpressionType expression) {
+    public SplitterDefinition(ExpressionDefinition expression) {
         super(expression);
     }
 
@@ -120,7 +120,7 @@
      *
      * @return the builder
      */
-    public ExpressionClause<SplitterType> expression() {
+    public ExpressionClause<SplitterDefinition> expression() {
         return ExpressionClause.createAndSetExpression(this);
     }
     /**
@@ -128,7 +128,7 @@
      *
      * @return the builder
      */
-    public SplitterType aggregationStrategy(AggregationStrategy aggregationStrategy) {
+    public SplitterDefinition aggregationStrategy(AggregationStrategy aggregationStrategy) {
         setAggregationStrategy(aggregationStrategy);
         return this;
     }
@@ -138,7 +138,7 @@
      *
      * @return the builder
      */
-    public SplitterType parallelProcessing() {
+    public SplitterDefinition parallelProcessing() {
         setParallelProcessing(true);
         return this;
     }
@@ -151,18 +151,18 @@
      *
      * @return the builder
      */
-    public SplitterType parallelProcessing(boolean parallelProcessing) {
+    public SplitterDefinition parallelProcessing(boolean parallelProcessing) {
         setParallelProcessing(parallelProcessing);
         return this;
     }
     
     /**
      * Enables streaming. 
-     * See {@link SplitterType#setStreaming(boolean)} for more information
+     * See {@link SplitterDefinition#setStreaming(boolean)} for more information
      *
      * @return the builder
      */
-    public SplitterType streaming() {
+    public SplitterDefinition streaming() {
         setStreaming(true);
         return this;
     }
@@ -173,7 +173,7 @@
      * @param executor the executor
      * @return the builder
      */
-    public SplitterType executor(Executor executor) {
+    public SplitterDefinition executor(Executor executor) {
         setExecutor(executor);
         return this;
     }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/StopDefinition.java Fri Mar  6 08:20:00 2009
@@ -30,7 +30,7 @@
  */
 @XmlRootElement(name = "stop")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class StopType extends OutputType<ProcessorType> {
+public class StopDefinition extends OutputDefinition<ProcessorDefinition> {
 
     @Override
     public String getShortName() {

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadDefinition.java Fri Mar  6 08:20:00 2009
@@ -41,7 +41,7 @@
  */
 @XmlRootElement(name = "thread")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ThreadType extends ProcessorType<ProcessorType> {
+public class ThreadDefinition extends ProcessorDefinition<ProcessorDefinition> {
     @XmlAttribute(required = false)
     private Integer coreSize = 1;
     @XmlAttribute(required = false)
@@ -57,7 +57,7 @@
     @XmlAttribute(required = false)
     private Long stackSize;
     @XmlElementRef
-    private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+    private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
     @XmlTransient
     private BlockingQueue<Runnable> taskQueue;
     @XmlTransient
@@ -65,20 +65,20 @@
     @XmlTransient
     private Executor executor;
 
-    public ThreadType() {
+    public ThreadDefinition() {
     }
 
-    public ThreadType(int coreSize) {
+    public ThreadDefinition(int coreSize) {
         this.coreSize = coreSize;
         this.maxSize = coreSize;
     }
 
-    public ThreadType(Executor executor) {
+    public ThreadDefinition(Executor executor) {
         this.executor = executor;
     }
 
     @Override
-    public List<ProcessorType> getOutputs() {
+    public List<ProcessorDefinition> getOutputs() {
         return outputs;
     }
 
@@ -124,7 +124,7 @@
     }
 
     @Override
-    protected void configureChild(ProcessorType output) {
+    protected void configureChild(ProcessorDefinition output) {
         super.configureChild(output);
         if (isInheritErrorHandler()) {
             output.setErrorHandlerBuilder(getErrorHandlerBuilder());
@@ -134,7 +134,7 @@
     // Fluent methods
     // -----------------------------------------------------------------------
     @Override
-    public ProcessorType errorHandler(ErrorHandlerBuilder errorHandlerBuilder) {
+    public ProcessorDefinition errorHandler(ErrorHandlerBuilder errorHandlerBuilder) {
         // do not support setting error handling on thread type as its confusing and will not be used
         throw new IllegalArgumentException("Setting errorHandler on ThreadType is not supported."
             + " Instead set the errorHandler on the parent.");
@@ -146,7 +146,7 @@
      * @param coreSize the core size
      * @return the builder
      */
-    public ThreadType coreSize(int coreSize) {
+    public ThreadDefinition coreSize(int coreSize) {
         setCoreSize(coreSize);
         return this;
     }
@@ -157,7 +157,7 @@
      * @param daemon  deamon option
      * @return the builder
      */
-    public ThreadType daemon(boolean daemon) {
+    public ThreadDefinition daemon(boolean daemon) {
         setDaemon(daemon);
         return this;
     }
@@ -168,7 +168,7 @@
      * @param keepAliveTime keep alive time in millis
      * @return the builder
      */
-    public ThreadType keepAliveTime(long keepAliveTime) {
+    public ThreadDefinition keepAliveTime(long keepAliveTime) {
         setKeepAliveTime(keepAliveTime);
         return this;
     }
@@ -179,7 +179,7 @@
      * @param maxSize  the max pool size
      * @return the builder
      */
-    public ThreadType maxSize(int maxSize) {
+    public ThreadDefinition maxSize(int maxSize) {
         setMaxSize(maxSize);
         return this;
     }
@@ -190,7 +190,7 @@
      * @param name  the name
      * @return the builder
      */
-    public ThreadType name(String name) {
+    public ThreadDefinition name(String name) {
         setName(name);
         return this;
     }
@@ -201,7 +201,7 @@
      * @param priority  the priority
      * @return the builder
      */
-    public ThreadType priority(int priority) {
+    public ThreadDefinition priority(int priority) {
         setPriority(priority);
         return this;
     }
@@ -212,7 +212,7 @@
      * @param stackSize  the stack size
      * @return the builder
      */
-    public ThreadType stackSize(long stackSize) {
+    public ThreadDefinition stackSize(long stackSize) {
         setStackSize(stackSize);
         return this;
     }
@@ -223,7 +223,7 @@
      * @param taskQueue  the task queue
      * @return the builder
      */
-    public ThreadType taskQueue(BlockingQueue<Runnable> taskQueue) {
+    public ThreadDefinition taskQueue(BlockingQueue<Runnable> taskQueue) {
         setTaskQueue(taskQueue);
         return this;
     }
@@ -234,7 +234,7 @@
      * @param threadGroup  the thread group
      * @return the builder
      */
-    public ThreadType threadGroup(ThreadGroup threadGroup) {
+    public ThreadDefinition threadGroup(ThreadGroup threadGroup) {
         setThreadGroup(threadGroup);
         return this;
     }
@@ -245,7 +245,7 @@
      * @param executor  the executor
      * @return the builder
      */
-    public ThreadType executor(Executor executor) {
+    public ThreadDefinition executor(Executor executor) {
         setExecutor(executor);
         return this;
     }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerDefinition.java Fri Mar  6 08:20:00 2009
@@ -36,18 +36,18 @@
  */
 @XmlRootElement(name = "throttle")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ThrottlerType extends ProcessorType<ProcessorType> {
+public class ThrottlerDefinition extends ProcessorDefinition<ProcessorDefinition> {
     @XmlAttribute
     private Long maximumRequestsPerPeriod;
     @XmlAttribute
     private long timePeriodMillis = 1000;
     @XmlElementRef
-    private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+    private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
 
-    public ThrottlerType() {
+    public ThrottlerDefinition() {
     }
 
-    public ThrottlerType(long maximumRequestsPerPeriod) {
+    public ThrottlerDefinition(long maximumRequestsPerPeriod) {
         this.maximumRequestsPerPeriod = maximumRequestsPerPeriod;
     }
 
@@ -82,7 +82,7 @@
      * @param timePeriodMillis  period in millis
      * @return the builder
      */
-    public ThrottlerType timePeriodMillis(long timePeriodMillis) {
+    public ThrottlerDefinition timePeriodMillis(long timePeriodMillis) {
         setTimePeriodMillis(timePeriodMillis);
         return this;
     }
@@ -93,7 +93,7 @@
      * @param maximumRequestsPerPeriod  the maximum request count number per time period
      * @return the builder
      */
-    public ThrottlerType maximumRequestsPerPeriod(Long maximumRequestsPerPeriod) {
+    public ThrottlerDefinition maximumRequestsPerPeriod(Long maximumRequestsPerPeriod) {
         setMaximumRequestsPerPeriod(maximumRequestsPerPeriod);
         return this;
     }
@@ -117,11 +117,11 @@
         this.timePeriodMillis = timePeriodMillis;
     }
 
-    public List<ProcessorType> getOutputs() {
+    public List<ProcessorDefinition> getOutputs() {
         return outputs;
     }
 
-    public void setOutputs(List<ProcessorType> outputs) {
+    public void setOutputs(List<ProcessorDefinition> outputs) {
         this.outputs = outputs;
     }
 }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultDefinition.java Fri Mar  6 08:20:00 2009
@@ -35,7 +35,7 @@
  */
 @XmlRootElement(name = "throwFault")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ThrowFaultType extends ProcessorType<ThrowFaultType> {
+public class ThrowFaultDefinition extends ProcessorDefinition<ThrowFaultDefinition> {
     @XmlTransient
     private Throwable fault;
     @XmlTransient
@@ -43,7 +43,7 @@
     @XmlAttribute (required = true)
     private String faultRef;
 
-    public ThrowFaultType() {
+    public ThrowFaultDefinition() {
     }
 
     @Override
@@ -93,7 +93,7 @@
 
     @Override
     @SuppressWarnings("unchecked")
-    public List<ProcessorType> getOutputs() {
+    public List<ProcessorDefinition> getOutputs() {
         return Collections.EMPTY_LIST;
     }
 }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToDefinition.java Fri Mar  6 08:20:00 2009
@@ -31,27 +31,27 @@
  */
 @XmlRootElement(name = "to")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ToType extends SendType<ToType> {
+public class ToDefinition extends SendDefinition<ToDefinition> {
     @XmlAttribute(required = false)
     private ExchangePattern pattern;
 
-    public ToType() {
+    public ToDefinition() {
     }
 
-    public ToType(String uri) {
+    public ToDefinition(String uri) {
         setUri(uri);
     }
 
-    public ToType(Endpoint endpoint) {
+    public ToDefinition(Endpoint endpoint) {
         setEndpoint(endpoint);
     }
 
-    public ToType(String uri, ExchangePattern pattern) {
+    public ToDefinition(String uri, ExchangePattern pattern) {
         this(uri);
         this.pattern = pattern;
     }
 
-    public ToType(Endpoint endpoint, ExchangePattern pattern) {
+    public ToDefinition(Endpoint endpoint, ExchangePattern pattern) {
         this(endpoint);
         this.pattern = pattern;
     }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformDefinition.java Fri Mar  6 08:20:00 2009
@@ -31,12 +31,12 @@
  */
 @XmlRootElement(name = "transform")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class TransformType extends ExpressionNode {
+public class TransformDefinition extends ExpressionNode {
 
-    public TransformType() {
+    public TransformDefinition() {
     }
 
-    public TransformType(Expression expression) {
+    public TransformDefinition(Expression expression) {
         super(expression);
     }
 
@@ -64,7 +64,7 @@
      * Set the expression that TransformType will use
      * @return the builder
      */
-    public ExpressionClause<TransformType> expression() {
+    public ExpressionClause<TransformDefinition> expression() {
         return ExpressionClause.createAndSetExpression(this);
     }
 }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryDefinition.java Fri Mar  6 08:20:00 2009
@@ -36,15 +36,15 @@
  */
 @XmlRootElement(name = "try")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class TryType extends OutputType<TryType> {
+public class TryDefinition extends OutputDefinition<TryDefinition> {
     @XmlTransient
-    private List<CatchType> catchClauses;
+    private List<CatchDefinition> catchClauses;
     @XmlTransient
-    private FinallyType finallyClause;
+    private FinallyDefinition finallyClause;
     @XmlTransient
     private boolean initialized;
     @XmlTransient
-    private List<ProcessorType> outputsWithoutCatches;
+    private List<ProcessorDefinition> outputsWithoutCatches;
 
     @Override
     public String toString() {
@@ -66,7 +66,7 @@
         }
         List<CatchProcessor> catchProcessors = new ArrayList<CatchProcessor>();
         if (catchClauses != null) {
-            for (CatchType catchClause : catchClauses) {
+            for (CatchDefinition catchClause : catchClauses) {
                 catchProcessors.add(catchClause.createProcessor(routeContext));
             }
         }
@@ -82,9 +82,9 @@
      * @param exceptionType  the exception
      * @return the try builder
      */
-    public TryType handle(Class<?> exceptionType) {
+    public TryDefinition handle(Class<?> exceptionType) {
         popBlock();
-        CatchType answer = new CatchType(exceptionType);
+        CatchDefinition answer = new CatchDefinition(exceptionType);
         addOutput(answer);
         pushBlock(answer);
         return this;
@@ -95,16 +95,16 @@
      *
      * @return  the try builder
      */
-    public TryType finallyBlock() {
+    public TryDefinition finallyBlock() {
         popBlock();
-        FinallyType answer = new FinallyType();
+        FinallyDefinition answer = new FinallyDefinition();
         addOutput(answer);
         pushBlock(answer);
         return this;
     }
 
     @Override
-    public ProcessorType<? extends ProcessorType> end() {
+    public ProcessorDefinition<? extends ProcessorDefinition> end() {
         popBlock();
         return super.end();
     }
@@ -112,34 +112,34 @@
     // Properties
     // -------------------------------------------------------------------------
 
-    public List<CatchType> getCatchClauses() {
+    public List<CatchDefinition> getCatchClauses() {
         if (catchClauses == null) {
             checkInitialized();
         }
         return catchClauses;
     }
 
-    public FinallyType getFinallyClause() {
+    public FinallyDefinition getFinallyClause() {
         if (finallyClause == null) {
             checkInitialized();
         }
         return finallyClause;
     }
 
-    public List<ProcessorType> getOutputsWithoutCatches() {
+    public List<ProcessorDefinition> getOutputsWithoutCatches() {
         if (outputsWithoutCatches == null) {
             checkInitialized();
         }
         return outputsWithoutCatches;
     }
 
-    public void setOutputs(List<ProcessorType> outputs) {
+    public void setOutputs(List<ProcessorDefinition> outputs) {
         initialized = false;
         super.setOutputs(outputs);
     }
 
     @Override
-    public void addOutput(ProcessorType output) {
+    public void addOutput(ProcessorDefinition output) {
         initialized = false;
         super.addOutput(output);
     }
@@ -150,19 +150,19 @@
     protected void checkInitialized() {
         if (!initialized) {
             initialized = true;
-            outputsWithoutCatches = new ArrayList<ProcessorType>();
-            catchClauses = new ArrayList<CatchType>();
+            outputsWithoutCatches = new ArrayList<ProcessorDefinition>();
+            catchClauses = new ArrayList<CatchDefinition>();
             finallyClause = null;
 
-            for (ProcessorType output : outputs) {
-                if (output instanceof CatchType) {
-                    catchClauses.add((CatchType)output);
-                } else if (output instanceof FinallyType) {
+            for (ProcessorDefinition output : outputs) {
+                if (output instanceof CatchDefinition) {
+                    catchClauses.add((CatchDefinition)output);
+                } else if (output instanceof FinallyDefinition) {
                     if (finallyClause != null) {
                         throw new IllegalArgumentException("Multiple finally clauses added: " + finallyClause
                                                            + " and " + output);
                     } else {
-                        finallyClause = (FinallyType)output;
+                        finallyClause = (FinallyDefinition)output;
                     }
                 } else {
                     outputsWithoutCatches.add(output);

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java Fri Mar  6 08:20:00 2009
@@ -26,7 +26,7 @@
 import org.apache.camel.Processor;
 import org.apache.camel.model.dataformat.ArtixDSDataFormat;
 import org.apache.camel.model.dataformat.CsvDataFormat;
-import org.apache.camel.model.dataformat.DataFormatType;
+import org.apache.camel.model.dataformat.DataFormatDefinition;
 import org.apache.camel.model.dataformat.FlatpackDataFormat;
 import org.apache.camel.model.dataformat.HL7DataFormat;
 import org.apache.camel.model.dataformat.JaxbDataFormat;
@@ -43,13 +43,13 @@
 import org.apache.camel.spi.RouteContext;
 
 /**
- * Unmarshals the binary payload using the given {@link DataFormatType}
+ * Unmarshals the binary payload using the given {@link DataFormatDefinition}
  *
  * @version $Revision$
  */
 @XmlRootElement(name = "unmarshal")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class UnmarshalType extends OutputType<ProcessorType> {
+public class UnmarshalDefinition extends OutputDefinition<ProcessorDefinition> {
     @XmlAttribute(required = false)
     private String ref;
     // TODO cannot use @XmlElementRef as it doesn't allow optional properties
@@ -69,16 +69,16 @@
     @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
     @XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
     )
-    private DataFormatType dataFormatType;
+    private DataFormatDefinition dataFormatType;
 
-    public UnmarshalType() {
+    public UnmarshalDefinition() {
     }
 
-    public UnmarshalType(DataFormatType dataFormatType) {
+    public UnmarshalDefinition(DataFormatDefinition dataFormatType) {
         this.dataFormatType = dataFormatType;
     }
 
-    public UnmarshalType(String ref) {
+    public UnmarshalDefinition(String ref) {
         this.ref = ref;
     }
 
@@ -104,17 +104,17 @@
         this.ref = ref;
     }
 
-    public DataFormatType getDataFormatType() {
+    public DataFormatDefinition getDataFormatType() {
         return dataFormatType;
     }
 
-    public void setDataFormatType(DataFormatType dataFormatType) {
+    public void setDataFormatType(DataFormatDefinition dataFormatType) {
         this.dataFormatType = dataFormatType;
     }
 
     @Override
     public Processor createProcessor(RouteContext routeContext) {
-        DataFormat dataFormat = DataFormatType.getDataFormat(routeContext, getDataFormatType(), ref);
+        DataFormat dataFormat = DataFormatDefinition.getDataFormat(routeContext, getDataFormatType(), ref);
         return new UnmarshalProcessor(dataFormat);
     }
 }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenDefinition.java Fri Mar  6 08:20:00 2009
@@ -20,7 +20,7 @@
 
 import org.apache.camel.Predicate;
 import org.apache.camel.builder.ExpressionClause;
-import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.model.language.ExpressionDefinition;
 import org.apache.camel.processor.FilterProcessor;
 import org.apache.camel.spi.RouteContext;
 
@@ -30,16 +30,16 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "when")
-public class WhenType extends ExpressionNode {
+public class WhenDefinition extends ExpressionNode {
 
-    public WhenType() {
+    public WhenDefinition() {
     }
 
-    public WhenType(Predicate predicate) {
+    public WhenDefinition(Predicate predicate) {
         super(predicate);
     }
 
-    public WhenType(ExpressionType expression) {
+    public WhenDefinition(ExpressionDefinition expression) {
         super(expression);
     }
 
@@ -64,7 +64,7 @@
      * Set the expression that WhenType will use
      * @return the builder
      */
-    public ExpressionClause<WhenType> expression() {
+    public ExpressionClause<WhenDefinition> expression() {
         return ExpressionClause.createAndSetExpression(this);
     }
 }

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertiesDefinition.java Fri Mar  6 08:20:00 2009
@@ -25,7 +25,7 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.camel.model.dataformat.DataFormatType;
+import org.apache.camel.model.dataformat.DataFormatDefinition;
 
 
 /**
@@ -33,19 +33,19 @@
  */
 @XmlRootElement(name = "properties")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class PropertiesType {
+public class PropertiesDefinition {
     @XmlElement(name = "property", required = false)
-    private List<PropertyType> properties;
+    private List<PropertyDefinition> properties;
     
-    public PropertiesType() {
+    public PropertiesDefinition() {
         
     }
     
-    public void setProperties(List<PropertyType> properties) {
+    public void setProperties(List<PropertyDefinition> properties) {
         this.properties = properties;
     }
     
-    public List<PropertyType> getProperties() {
+    public List<PropertyDefinition> getProperties() {
         return properties;
     }
     
@@ -54,7 +54,7 @@
      */
     public Map<String, String> asMap() {
         Map<String, String> propertiesAsMap = new HashMap<String, String>();
-        for (PropertyType propertyType : getProperties()) {
+        for (PropertyDefinition propertyType : getProperties()) {
             propertiesAsMap.put(propertyType.getKey(), propertyType.getValue());
         }
         return propertiesAsMap;

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/config/PropertyDefinition.java Fri Mar  6 08:20:00 2009
@@ -24,13 +24,13 @@
 
 @XmlRootElement(name = "property")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class PropertyType {
+public class PropertyDefinition {
     @XmlAttribute(required = true)
     String key;
     @XmlAttribute(required = true)
     String value;
     
-    public PropertyType() {
+    public PropertyDefinition() {
         
     }
     

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ArtixDSDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ArtixDSDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ArtixDSDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ArtixDSDataFormat.java Fri Mar  6 08:20:00 2009
@@ -34,7 +34,7 @@
  */
 @XmlRootElement(name = "artixDS")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ArtixDSDataFormat extends DataFormatType {
+public class ArtixDSDataFormat extends DataFormatDefinition {
     private static final transient Log LOG = LogFactory.getLog(ArtixDSDataFormat.class);
 
     @XmlAttribute(required = false)

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java Fri Mar  6 08:20:00 2009
@@ -29,7 +29,7 @@
  */
 @XmlRootElement(name = "csv")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class CsvDataFormat extends DataFormatType {
+public class CsvDataFormat extends DataFormatDefinition {
 
     public CsvDataFormat() {
         super("org.apache.camel.dataformat.csv.CsvDataFormat");

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatDefinition.java Fri Mar  6 08:20:00 2009
@@ -32,23 +32,23 @@
  *
  * @version $Revision$
  */
-@XmlType(name = "dataFormatType")
+@XmlType(name = "dataFormat")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class DataFormatType extends IdentifiedType {
+public class DataFormatDefinition extends IdentifiedType {
     @XmlTransient
     private DataFormat dataFormat;
     @XmlTransient
-    private String dataFormatTypeName;
+    private String dataFormatName;
 
-    public DataFormatType() {
+    public DataFormatDefinition() {
     }
 
-    public DataFormatType(DataFormat dataFormat) {
+    public DataFormatDefinition(DataFormat dataFormat) {
         this.dataFormat = dataFormat;
     }
 
-    protected DataFormatType(String dataFormatTypeName) {
-        this.dataFormatTypeName = dataFormatTypeName;
+    protected DataFormatDefinition(String dataFormatName) {
+        this.dataFormatName = dataFormatName;
     }
 
     /**
@@ -58,14 +58,14 @@
      * @param ref  reference to lookup for a data format
      * @return the data format or null if not possible to create
      */
-    public static DataFormat getDataFormat(RouteContext routeContext, DataFormatType type, String ref) {
+    public static DataFormat getDataFormat(RouteContext routeContext, DataFormatDefinition type, String ref) {
         if (type == null) {
-            ObjectHelper.notNull(ref, "ref or dataFormatType");
+            ObjectHelper.notNull(ref, "ref or dataFormat");
 
             DataFormat dataFormat = lookup(routeContext, ref, DataFormat.class);
             if (dataFormat == null) {
                 // lookup type and create the data format from it
-                type = lookup(routeContext, ref, DataFormatType.class);
+                type = lookup(routeContext, ref, DataFormatDefinition.class);
                 if (type == null) {
                     type = routeContext.getDataFormat(ref);
                 }
@@ -107,10 +107,10 @@
      */
     @SuppressWarnings("unchecked")
     protected DataFormat createDataFormat(RouteContext routeContext) {
-        if (dataFormatTypeName != null) {
-            Class type = routeContext.getCamelContext().getClassResolver().resolveClass(dataFormatTypeName);
+        if (dataFormatName != null) {
+            Class type = routeContext.getCamelContext().getClassResolver().resolveClass(dataFormatName);
             if (type == null) {
-                throw new IllegalArgumentException("The class " + dataFormatTypeName + " is not on the classpath! Cannot use the dataFormat " + this);
+                throw new IllegalArgumentException("The class " + dataFormatName + " is not on the classpath! Cannot use the dataFormat " + this);
             }
             return (DataFormat) ObjectHelper.newInstance(type);
         }
@@ -133,6 +133,5 @@
             throw new IllegalArgumentException("Failed to set property: " + name + " on: " + bean + ". Reason: " + e, e);
         }
     }
-
 }
 

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java Fri Mar  6 08:20:00 2009
@@ -31,7 +31,7 @@
  */
 @XmlRootElement(name = "dataFormats")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class DataFormatsType {
+public class DataFormatsDefinition {
 
     // TODO cannot use @XmlElementRef as it doesn't allow optional properties
     // @XmlElementRef
@@ -51,23 +51,23 @@
         @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
         @XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
         )
-    private List<DataFormatType> dataFormats;
+    private List<DataFormatDefinition> dataFormats;
 
 
-    public void setDataFormats(List<DataFormatType> dataFormats) {
+    public void setDataFormats(List<DataFormatDefinition> dataFormats) {
         this.dataFormats = dataFormats;
     }
 
-    public List<DataFormatType> getDataFormats() {
+    public List<DataFormatDefinition> getDataFormats() {
         return dataFormats;
     }
 
     /***
      * @return A Map of the contained DataFormatType's indexed by id.
      */
-    public Map<String, DataFormatType> asMap() {
-        Map<String, DataFormatType> dataFormatsAsMap = new HashMap<String, DataFormatType>();
-        for (DataFormatType dataFormatType : getDataFormats()) {
+    public Map<String, DataFormatDefinition> asMap() {
+        Map<String, DataFormatDefinition> dataFormatsAsMap = new HashMap<String, DataFormatDefinition>();
+        for (DataFormatDefinition dataFormatType : getDataFormats()) {
             dataFormatsAsMap.put(dataFormatType.getId(), dataFormatType);
         }
         return dataFormatsAsMap;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/FlatpackDataFormat.java Fri Mar  6 08:20:00 2009
@@ -29,7 +29,7 @@
  */
 @XmlRootElement(name = "flatpack")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class FlatpackDataFormat extends DataFormatType {
+public class FlatpackDataFormat extends DataFormatDefinition {
 
     public FlatpackDataFormat() {
         super("org.apache.camel.component.flatpack.FlatpackDataFormat");

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/HL7DataFormat.java Fri Mar  6 08:20:00 2009
@@ -29,7 +29,7 @@
  */
 @XmlRootElement(name = "hl7")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class HL7DataFormat extends DataFormatType {
+public class HL7DataFormat extends DataFormatDefinition {
 
     public HL7DataFormat() {
         super("org.apache.camel.component.hl7.HL7DataFormat");

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java Fri Mar  6 08:20:00 2009
@@ -31,7 +31,7 @@
  */
 @XmlRootElement(name = "jaxb")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class JaxbDataFormat extends DataFormatType {
+public class JaxbDataFormat extends DataFormatDefinition {
     @XmlAttribute(required = false)
     private String contextPath;
     @XmlAttribute(required = false)

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JsonDataFormat.java Fri Mar  6 08:20:00 2009
@@ -23,7 +23,7 @@
 
 @XmlRootElement(name = "json")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class JsonDataFormat extends DataFormatType {
+public class JsonDataFormat extends DataFormatDefinition {
     
     @XmlAttribute(required = false)
     private Boolean prettyPrint;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/RssDataFormat.java Fri Mar  6 08:20:00 2009
@@ -28,7 +28,7 @@
  */
 @XmlRootElement(name = "rss")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class RssDataFormat extends DataFormatType {
+public class RssDataFormat extends DataFormatDefinition {
 
     public RssDataFormat() {
         super("org.apache.camel.dataformat.rss.RssDataFormat");

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/SerializationDataFormat.java Fri Mar  6 08:20:00 2009
@@ -27,7 +27,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "serialization")
-public class SerializationDataFormat extends DataFormatType {
+public class SerializationDataFormat extends DataFormatDefinition {
 
     @Override
     protected DataFormat createDataFormat(RouteContext routeContext) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/StringDataFormat.java Fri Mar  6 08:20:00 2009
@@ -31,7 +31,7 @@
  */
 @XmlRootElement(name = "string")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class StringDataFormat extends DataFormatType {
+public class StringDataFormat extends DataFormatDefinition {
 
     @XmlAttribute(required = false)
     private String charset;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/TidyMarkupDataFormat.java Fri Mar  6 08:20:00 2009
@@ -32,7 +32,7 @@
  */
 @XmlRootElement(name = "tidyMarkup")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class TidyMarkupDataFormat extends DataFormatType {
+public class TidyMarkupDataFormat extends DataFormatDefinition {
 
     @XmlAttribute(required = false)
     private Class<?> dataObjectType;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLBeansDataFormat.java Fri Mar  6 08:20:00 2009
@@ -30,7 +30,7 @@
  */
 @XmlRootElement(name = "xmlBeans")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class XMLBeansDataFormat extends DataFormatType {
+public class XMLBeansDataFormat extends DataFormatDefinition {
     @XmlAttribute(required = false)
     private Boolean prettyPrint;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XMLSecurityDataFormat.java Fri Mar  6 08:20:00 2009
@@ -28,7 +28,7 @@
  */
 @XmlRootElement(name = "secureXML")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class XMLSecurityDataFormat extends DataFormatType {
+public class XMLSecurityDataFormat extends DataFormatDefinition {
 
     private static final transient String TRIPLEDES = "http://www.w3.org/2001/04/xmlenc#tripledes-cbc";
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/XStreamDataFormat.java Fri Mar  6 08:20:00 2009
@@ -30,7 +30,7 @@
  */
 @XmlRootElement(name = "xstream")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class XStreamDataFormat extends DataFormatType {
+public class XStreamDataFormat extends DataFormatDefinition {
     @XmlAttribute(required = false)
     private Boolean prettyPrint;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/ZipDataFormat.java Fri Mar  6 08:20:00 2009
@@ -30,7 +30,7 @@
 
 @XmlRootElement(name = "zip")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ZipDataFormat extends DataFormatType {
+public class ZipDataFormat extends DataFormatDefinition {
 
     @XmlAttribute(required = false)
     private int compressionLevel = Deflater.BEST_SPEED;

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ConstantExpression.java Fri Mar  6 08:20:00 2009
@@ -23,7 +23,7 @@
  *
  */
 @XmlRootElement(name = "constant")
-public class ConstantExpression extends ExpressionType {
+public class ConstantExpression extends ExpressionDefinition {
     public ConstantExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ELExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "el")
-public class ELExpression extends ExpressionType {
+public class ELExpression extends ExpressionDefinition {
     public ELExpression() {
     }
 

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java Fri Mar  6 08:20:00 2009
@@ -48,9 +48,9 @@
  * @version $Revision$
  */
 @XmlRootElement
-@XmlType(name = "expressionType")
+@XmlType(name = "expression")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ExpressionType implements Expression, Predicate {
+public class ExpressionDefinition implements Expression, Predicate {
     @XmlAttribute
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     @XmlID
@@ -62,26 +62,26 @@
     @XmlTransient
     private Expression expressionValue;
     @XmlTransient
-    private ExpressionType expressionType;
+    private ExpressionDefinition expressionType;
 
-    public ExpressionType() {
+    public ExpressionDefinition() {
     }
 
-    public ExpressionType(String expression) {
+    public ExpressionDefinition(String expression) {
         this.expression = expression;
     }
 
-    public ExpressionType(Predicate predicate) {
+    public ExpressionDefinition(Predicate predicate) {
         this.predicate = predicate;
     }
 
-    public ExpressionType(Expression expression) {
+    public ExpressionDefinition(Expression expression) {
         this.expressionValue = expression;
     }
 
-    public static String getLabel(List<ExpressionType> expressions) {
+    public static String getLabel(List<ExpressionDefinition> expressions) {
         CollectionStringBuffer buffer = new CollectionStringBuffer();
-        for (ExpressionType expression : expressions) {
+        for (ExpressionDefinition expression : expressions) {
             buffer.append(expression.getLabel());
         }
         return buffer.toString();
@@ -235,7 +235,7 @@
      * Allows derived classes to set a lazily created expressionType instance
      * such as if using the {@link ExpressionClause}
      */
-    protected void setExpressionType(ExpressionType expressionType) {
+    protected void setExpressionType(ExpressionDefinition expressionType) {
         this.expressionType = expressionType;
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/GroovyExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "groovy")
-public class GroovyExpression extends ExpressionType {
+public class GroovyExpression extends ExpressionDefinition {
     public GroovyExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/HeaderExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "header")
-public class HeaderExpression extends ExpressionType {
+public class HeaderExpression extends ExpressionDefinition {
     public HeaderExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JXPathExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "jxpath")
-public class JXPathExpression extends ExpressionType {
+public class JXPathExpression extends ExpressionDefinition {
     public JXPathExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/JavaScriptExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "javaScript")
-public class JavaScriptExpression extends ExpressionType {
+public class JavaScriptExpression extends ExpressionDefinition {
     public JavaScriptExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/LanguageExpression.java Fri Mar  6 08:20:00 2009
@@ -29,7 +29,7 @@
  */
 @XmlRootElement(name = "language")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class LanguageExpression extends ExpressionType {
+public class LanguageExpression extends ExpressionDefinition {
     @XmlAttribute
     private String language;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MethodCallExpression.java Fri Mar  6 08:20:00 2009
@@ -35,7 +35,7 @@
  */
 @XmlRootElement(name = "method")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class MethodCallExpression extends ExpressionType {
+public class MethodCallExpression extends ExpressionDefinition {
     @XmlAttribute(required = false)
     private String bean;
     @XmlAttribute(required = false)

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/MvelExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "mvel")
-public class MvelExpression extends ExpressionType {
+public class MvelExpression extends ExpressionDefinition {
     public MvelExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java Fri Mar  6 08:20:00 2009
@@ -34,7 +34,7 @@
  * @version $Revision$
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-public abstract class NamespaceAwareExpression extends ExpressionType implements NamespaceAware {
+public abstract class NamespaceAwareExpression extends ExpressionDefinition implements NamespaceAware {
     @XmlTransient
     private Map<String, String> namespaces;
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/OgnlExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "ognl")
-public class OgnlExpression extends ExpressionType {
+public class OgnlExpression extends ExpressionDefinition {
     public OgnlExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PhpExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "php")
-public class PhpExpression extends ExpressionType {
+public class PhpExpression extends ExpressionDefinition {
     public PhpExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PropertyExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision: 630591 $
  */
 @XmlRootElement(name = "property")
-public class PropertyExpression extends ExpressionType {
+public class PropertyExpression extends ExpressionDefinition {
     public PropertyExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/PythonExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "python")
-public class PythonExpression extends ExpressionType {
+public class PythonExpression extends ExpressionDefinition {
     public PythonExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/RubyExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "ruby")
-public class RubyExpression extends ExpressionType {
+public class RubyExpression extends ExpressionDefinition {
     public RubyExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SimpleExpression.java Fri Mar  6 08:20:00 2009
@@ -25,7 +25,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "simple")
-public class SimpleExpression extends ExpressionType {
+public class SimpleExpression extends ExpressionDefinition {
     public SimpleExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/SqlExpression.java Fri Mar  6 08:20:00 2009
@@ -24,7 +24,7 @@
  * @version $Revision$
  */
 @XmlRootElement(name = "sql")
-public class SqlExpression extends ExpressionType {
+public class SqlExpression extends ExpressionDefinition {
     public SqlExpression() {
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/language/TokenizerExpression.java Fri Mar  6 08:20:00 2009
@@ -32,7 +32,7 @@
  */
 @XmlRootElement(name = "tokenize")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class TokenizerExpression extends ExpressionType {
+public class TokenizerExpression extends ExpressionDefinition {
     @XmlAttribute(required = true)
     private String token;
     @XmlAttribute(required = false)

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailOverLoadBalanceStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailOverLoadBalanceStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailOverLoadBalanceStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/FailOverLoadBalanceStrategy.java Fri Mar  6 08:20:00 2009
@@ -29,7 +29,7 @@
 
 @XmlRootElement(name = "failOver")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class FailOverLoadBalanceStrategy extends LoadBalancerType {    
+public class FailOverLoadBalanceStrategy extends LoadBalancerDefinition {    
     @XmlAttribute
     private String failedException;
     

Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/LoadBalancerDefinition.java Fri Mar  6 08:20:00 2009
@@ -35,32 +35,32 @@
 /**
  * Represents an XML &lt;loadBalance/&gt; element
  */
-@XmlType(name = "loadBalancerType")
+@XmlType(name = "loadBalancer")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class LoadBalancerType extends IdentifiedType implements LoadBalancer {
+public class LoadBalancerDefinition extends IdentifiedType implements LoadBalancer {
 
     @XmlTransient
     private LoadBalancer loadBalancer;
     @XmlTransient
     private String loadBalancerTypeName;
 
-    public LoadBalancerType() {
+    public LoadBalancerDefinition() {
     }
 
-    public LoadBalancerType(LoadBalancer loadBalancer) {
+    public LoadBalancerDefinition(LoadBalancer loadBalancer) {
         this.loadBalancer = loadBalancer;
     }
 
-    protected LoadBalancerType(String loadBalancerTypeName) {
+    protected LoadBalancerDefinition(String loadBalancerTypeName) {
         this.loadBalancerTypeName = loadBalancerTypeName;
     }
 
-    public static LoadBalancer getLoadBalancer(RouteContext routeContext, LoadBalancerType type, String ref) {
+    public static LoadBalancer getLoadBalancer(RouteContext routeContext, LoadBalancerDefinition type, String ref) {
         if (type == null) {
-            ObjectHelper.notNull(ref, "ref or LoadBalancerType");
+            ObjectHelper.notNull(ref, "ref or loadBalancer");
             LoadBalancer loadBalancer = routeContext.lookup(ref, LoadBalancer.class);
-            if (loadBalancer instanceof LoadBalancerType) {
-                type = (LoadBalancerType) loadBalancer;
+            if (loadBalancer instanceof LoadBalancerDefinition) {
+                type = (LoadBalancerDefinition) loadBalancer;
             } else {
                 return loadBalancer;
             }
@@ -76,8 +76,8 @@
         try {
             IntrospectionSupport.setProperty(bean, name, value);
         } catch (Exception e) {
-            throw new IllegalArgumentException("Failed to set property " + name + " on " + bean
-                                               + ". Reason: " + e, e);
+            throw new IllegalArgumentException("Failed to set property " + 
+                name + " on " + bean + ". Reason: " + e, e);
         }
     }
 

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RandomLoadBalanceStrategy.java Fri Mar  6 08:20:00 2009
@@ -26,7 +26,7 @@
  * Represents an XML &lt;random/&gt; element
  */
 @XmlRootElement(name = "random")
-public class RandomLoadBalanceStrategy extends LoadBalancerType {
+public class RandomLoadBalanceStrategy extends LoadBalancerDefinition {
 
     @Override
     protected LoadBalancer createLoadBalancer(RouteContext routeContext) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/RoundRobinLoadBalanceStrategy.java Fri Mar  6 08:20:00 2009
@@ -25,7 +25,7 @@
  * Represents an XML &lt;roundRobin/&gt; element
  */
 @XmlRootElement(name = "roundRobin")
-public class RoundRobinLoadBalanceStrategy extends LoadBalancerType {
+public class RoundRobinLoadBalanceStrategy extends LoadBalancerDefinition {
 
     @Override
     protected LoadBalancer createLoadBalancer(RouteContext routeContext) {

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalanceStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalanceStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalanceStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalanceStrategy.java Fri Mar  6 08:20:00 2009
@@ -21,7 +21,7 @@
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.model.language.ExpressionDefinition;
 import org.apache.camel.processor.loadbalancer.LoadBalancer;
 
 /**
@@ -29,50 +29,50 @@
  */
 @XmlRootElement(name = "sticky")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class StickyLoadBalanceStrategy extends LoadBalancerType {
-    @XmlElement(required = true, name = "expression", type = ExpressionType.class)
-    private ExpressionType expressionType;
-    @XmlElement(required = false, name = "loadBalancer", type = LoadBalancerType.class)
-    private LoadBalancerType loadBalancerType;
+public class StickyLoadBalanceStrategy extends LoadBalancerDefinition {
+    @XmlElement(required = true, name = "expression", type = ExpressionDefinition.class)
+    private ExpressionDefinition expressionType;
+    @XmlElement(required = false, name = "loadBalancer", type = LoadBalancerDefinition.class)
+    private LoadBalancerDefinition loadBalancerType;
 
     public StickyLoadBalanceStrategy() {
         super("org.apache.camel.processor.loadbalancer.StickyLoadBalancer");
     }
 
-    public StickyLoadBalanceStrategy(ExpressionType expressionType) {
+    public StickyLoadBalanceStrategy(ExpressionDefinition expressionType) {
         this();
         this.expressionType = expressionType;
     }
 
-    public StickyLoadBalanceStrategy(ExpressionType expressionType, LoadBalancerType loadBalancerType) {
+    public StickyLoadBalanceStrategy(ExpressionDefinition expressionType, LoadBalancerDefinition loadBalancerType) {
         this();
         this.expressionType = expressionType;
         this.loadBalancerType = loadBalancerType;
     }
 
-    public void setExpressionType(ExpressionType expressionType) {
+    public void setExpressionType(ExpressionDefinition expressionType) {
         this.expressionType = expressionType;
     }
 
-    public ExpressionType getExpressionType() {
+    public ExpressionDefinition getExpressionType() {
         return expressionType;
     }
 
-    public void setLoadBalancerType(LoadBalancerType loadBalancerType) {
+    public void setLoadBalancerType(LoadBalancerDefinition loadBalancerType) {
         this.loadBalancerType = loadBalancerType;
     }
 
-    public LoadBalancerType getLoadBalancerType() {
+    public LoadBalancerDefinition getLoadBalancerType() {
         return loadBalancerType;
     }
 
     @Override
     protected void configureLoadBalancer(LoadBalancer loadBalancer) {
-        ExpressionType expression = getExpressionType();
+        ExpressionDefinition expression = getExpressionType();
         if (expression != null) {
             setProperty(loadBalancer, "correlationExpression", expression);
         }
-        LoadBalancerType type = getLoadBalancerType();
+        LoadBalancerDefinition type = getLoadBalancerType();
         if (type != null) {
             setProperty(loadBalancer, "loadBalancer", type);
         }

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/loadbalancer/TopicLoadBalanceStrategy.java Fri Mar  6 08:20:00 2009
@@ -26,7 +26,7 @@
  * 
  */
 @XmlRootElement(name = "topic")
-public class TopicLoadBalanceStrategy extends LoadBalancerType {
+public class TopicLoadBalanceStrategy extends LoadBalancerDefinition {
     @Override
     protected LoadBalancer createLoadBalancer(RouteContext routeContext) {
         return new org.apache.camel.processor.loadbalancer.TopicLoadBalancer();

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/DeadLetterChannel.java Fri Mar  6 08:20:00 2009
@@ -28,7 +28,7 @@
 import org.apache.camel.Predicate;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.converter.AsyncProcessorTypeConverter;
-import org.apache.camel.model.ExceptionType;
+import org.apache.camel.model.ExceptionDefinition;
 import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
 import org.apache.camel.util.AsyncProcessorHelper;
 import org.apache.camel.util.MessageHelper;
@@ -276,7 +276,7 @@
         exchange.setProperty(Exchange.EXCEPTION_CAUGHT, e);
 
         // find the error handler to use (if any)
-        ExceptionType exceptionPolicy = getExceptionPolicy(exchange, e);
+        ExceptionDefinition exceptionPolicy = getExceptionPolicy(exchange, e);
         if (exceptionPolicy != null) {
             data.currentRedeliveryPolicy = exceptionPolicy.createRedeliveryPolicy(exchange.getContext(), data.currentRedeliveryPolicy);
             data.handledPredicate = exceptionPolicy.getHandledPolicy();

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ErrorHandlerSupport.java Fri Mar  6 08:20:00 2009
@@ -23,7 +23,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.impl.ServiceSupport;
-import org.apache.camel.model.ExceptionType;
+import org.apache.camel.model.ExceptionDefinition;
 import org.apache.camel.processor.exceptionpolicy.DefaultExceptionPolicyStrategy;
 import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyKey;
 import org.apache.camel.processor.exceptionpolicy.ExceptionPolicyStrategy;
@@ -34,10 +34,10 @@
  * @version $Revision$
  */
 public abstract class ErrorHandlerSupport extends ServiceSupport implements ErrorHandler {
-    private Map<ExceptionPolicyKey, ExceptionType> exceptionPolicies = new LinkedHashMap<ExceptionPolicyKey, ExceptionType>();
+    private Map<ExceptionPolicyKey, ExceptionDefinition> exceptionPolicies = new LinkedHashMap<ExceptionPolicyKey, ExceptionDefinition>();
     private ExceptionPolicyStrategy exceptionPolicy = createDefaultExceptionPolicyStrategy();
 
-    public void addExceptionPolicy(ExceptionType exceptionType) {
+    public void addExceptionPolicy(ExceptionDefinition exceptionType) {
         Processor processor = exceptionType.getErrorHandler();
         addChildService(processor);
 
@@ -53,7 +53,7 @@
      * Attempts to invoke the handler for this particular exception if one is available
      */
     protected boolean customProcessorForException(Exchange exchange, Throwable exception) throws Exception {
-        ExceptionType policy = getExceptionPolicy(exchange, exception);
+        ExceptionDefinition policy = getExceptionPolicy(exchange, exception);
         if (policy != null) {
             Processor processor = policy.getErrorHandler();
             if (processor != null) {
@@ -65,13 +65,13 @@
     }
 
     /**
-     * Attempts to find the best suited {@link ExceptionType} to be used for handling the given thrown exception.
+     * Attempts to find the best suited {@link ExceptionDefinition} to be used for handling the given thrown exception.
      *
      * @param exchange  the exchange
      * @param exception the exception that was thrown
      * @return the best exception type to handle this exception, <tt>null</tt> if none found.
      */
-    protected ExceptionType getExceptionPolicy(Exchange exchange, Throwable exception) {
+    protected ExceptionDefinition getExceptionPolicy(Exchange exchange, Throwable exception) {
         if (exceptionPolicy == null) {
             throw new IllegalStateException("The exception policy has not been set");
         }
@@ -80,7 +80,7 @@
     }
 
     /**
-     * Sets the strategy to use for resolving the {@link ExceptionType} to use
+     * Sets the strategy to use for resolving the {@link ExceptionDefinition} to use
      * for handling thrown exceptions.
      */
     public void setExceptionPolicy(ExceptionPolicyStrategy exceptionPolicy) {



Mime
View raw message