You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2009/03/06 09:20:11 UTC
svn commit: r750806 [2/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/...
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchDefinition.java Fri Mar 6 08:20:00 2009
@@ -38,22 +38,22 @@
*/
@XmlRootElement(name = "catch")
@XmlAccessorType(XmlAccessType.FIELD)
-public class CatchType extends ProcessorType<CatchType> {
+public class CatchDefinition extends ProcessorDefinition<CatchDefinition> {
@XmlElement(name = "exception")
private List<String> exceptions = new ArrayList<String>();
@XmlElementRef
- private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+ private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
@XmlTransient
private List<Class> exceptionClasses;
- public CatchType() {
+ public CatchDefinition() {
}
- public CatchType(List<Class> exceptionClasses) {
+ public CatchDefinition(List<Class> exceptionClasses) {
this.exceptionClasses = exceptionClasses;
}
- public CatchType(Class exceptionType) {
+ public CatchDefinition(Class exceptionType) {
exceptionClasses = new ArrayList<Class>();
exceptionClasses.add(exceptionType);
}
@@ -79,11 +79,11 @@
return new CatchProcessor(getExceptionClasses(), childProcessor);
}
- 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;
}
@@ -106,7 +106,7 @@
* @param exceptionClasses a list of the exception classes
* @return the builder
*/
- public CatchType exceptionClasses(List<Class> exceptionClasses) {
+ public CatchDefinition exceptionClasses(List<Class> exceptionClasses) {
setExceptionClasses(exceptionClasses);
return this;
}
@@ -117,7 +117,7 @@
* @param exception the exception of class
* @return the builder
*/
- public CatchType exceptionClasses(Class exception) {
+ public CatchDefinition exceptionClasses(Class exception) {
List<Class> list = getExceptionClasses();
list.add(exception);
return this;
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceDefinition.java Fri Mar 6 08:20:00 2009
@@ -43,13 +43,13 @@
*/
@XmlRootElement(name = "choice")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ChoiceType extends ProcessorType<ChoiceType> {
- private static final transient Log LOG = LogFactory.getLog(ChoiceType.class);
+public class ChoiceDefinition extends ProcessorDefinition<ChoiceDefinition> {
+ private static final transient Log LOG = LogFactory.getLog(ChoiceDefinition.class);
@XmlElementRef
- private List<WhenType> whenClauses = new ArrayList<WhenType>();
+ private List<WhenDefinition> whenClauses = new ArrayList<WhenDefinition>();
@XmlElement(required = false)
- private OtherwiseType otherwise;
+ private OtherwiseDefinition otherwise;
@Override
public String toString() {
@@ -68,7 +68,7 @@
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
List<FilterProcessor> filters = new ArrayList<FilterProcessor>();
- for (WhenType whenClaus : whenClauses) {
+ for (WhenDefinition whenClaus : whenClauses) {
filters.add(whenClaus.createProcessor(routeContext));
}
Processor otherwiseProcessor = null;
@@ -88,8 +88,8 @@
* @param predicate the predicate
* @return the builder
*/
- public ChoiceType when(Predicate predicate) {
- getWhenClauses().add(new WhenType(predicate));
+ public ChoiceDefinition when(Predicate predicate) {
+ getWhenClauses().add(new WhenDefinition(predicate));
return this;
}
@@ -98,10 +98,10 @@
*
* @return expression to be used as builder to configure the when node
*/
- public ExpressionClause<ChoiceType> when() {
- WhenType when = new WhenType();
+ public ExpressionClause<ChoiceDefinition> when() {
+ WhenDefinition when = new WhenDefinition();
getWhenClauses().add(when);
- ExpressionClause<ChoiceType> clause = new ExpressionClause<ChoiceType>(this);
+ ExpressionClause<ChoiceDefinition> clause = new ExpressionClause<ChoiceDefinition>(this);
when.setExpression(clause);
return clause;
}
@@ -111,8 +111,8 @@
*
* @return the builder
*/
- public ChoiceType otherwise() {
- OtherwiseType answer = new OtherwiseType();
+ public ChoiceDefinition otherwise() {
+ OtherwiseDefinition answer = new OtherwiseDefinition();
setOtherwise(answer);
return this;
}
@@ -123,38 +123,38 @@
@Override
public String getLabel() {
CollectionStringBuffer buffer = new CollectionStringBuffer();
- List<WhenType> list = getWhenClauses();
- for (WhenType whenType : list) {
+ List<WhenDefinition> list = getWhenClauses();
+ for (WhenDefinition whenType : list) {
buffer.append(whenType.getLabel());
}
return buffer.toString();
}
- public List<WhenType> getWhenClauses() {
+ public List<WhenDefinition> getWhenClauses() {
return whenClauses;
}
- public void setWhenClauses(List<WhenType> whenClauses) {
+ public void setWhenClauses(List<WhenDefinition> whenClauses) {
this.whenClauses = whenClauses;
}
@SuppressWarnings("unchecked")
- public List<ProcessorType> getOutputs() {
+ public List<ProcessorDefinition> getOutputs() {
if (otherwise != null) {
return otherwise.getOutputs();
} else if (whenClauses.isEmpty()) {
return Collections.EMPTY_LIST;
} else {
- WhenType when = whenClauses.get(whenClauses.size() - 1);
+ WhenDefinition when = whenClauses.get(whenClauses.size() - 1);
return when.getOutputs();
}
}
- public OtherwiseType getOtherwise() {
+ public OtherwiseDefinition getOtherwise() {
return otherwise;
}
- public void setOtherwise(OtherwiseType otherwise) {
+ public void setOtherwise(OtherwiseDefinition otherwise) {
this.otherwise = otherwise;
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/Constants.java Fri Mar 6 08:20:00 2009
@@ -20,8 +20,13 @@
* @version $Revision: 1.1 $
*/
public final class Constants {
- public static final String JAXB_CONTEXT_PACKAGES = "org.apache.camel:org.apache.camel.model:org.apache.camel.model.config:org.apache.camel.model.dataformat"
- + ":org.apache.camel.model.language:org.apache.camel.model.loadbalancer";
+ public static final String JAXB_CONTEXT_PACKAGES =
+ "org.apache.camel:" +
+ "org.apache.camel.model:" +
+ "org.apache.camel.model.config:" +
+ "org.apache.camel.model.dataformat:" +
+ "org.apache.camel.model.language:" +
+ "org.apache.camel.model.loadbalancer";
private Constants() {
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyDefinition.java Fri Mar 6 08:20:00 2009
@@ -36,20 +36,20 @@
*/
@XmlRootElement(name = "convertBodyTo")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ConvertBodyType extends ProcessorType<ProcessorType> {
+public class ConvertBodyDefinition extends ProcessorDefinition<ProcessorDefinition> {
@XmlAttribute
private String type;
@XmlTransient
private Class typeClass;
- public ConvertBodyType() {
+ public ConvertBodyDefinition() {
}
- public ConvertBodyType(String type) {
+ public ConvertBodyDefinition(String type) {
setType(type);
}
- public ConvertBodyType(Class typeClass) {
+ public ConvertBodyDefinition(Class typeClass) {
setTypeClass(typeClass);
setType(typeClass.getName());
}
@@ -71,7 +71,7 @@
@Override
@SuppressWarnings("unchecked")
- public List<ProcessorType> getOutputs() {
+ public List<ProcessorDefinition> getOutputs() {
return Collections.EMPTY_LIST;
}
@@ -110,7 +110,7 @@
* @param typeClass the type class that you want to covert body instance to
* @return the builder
*/
- public ConvertBodyType typeClass(Class typeClass) {
+ public ConvertBodyDefinition typeClass(Class typeClass) {
setTypeClass(typeClass);
return this;
}
@@ -121,7 +121,7 @@
* @param type the type class name
* @return the builder
*/
- public ConvertBodyType type(String type) {
+ public ConvertBodyDefinition type(String type) {
setType(type);
return this;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerDefinition.java Fri Mar 6 08:20:00 2009
@@ -24,7 +24,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.Delayer;
import org.apache.camel.spi.RouteContext;
import org.apache.camel.util.ObjectHelper;
@@ -36,22 +36,22 @@
*/
@XmlRootElement(name = "delay")
@XmlAccessorType(XmlAccessType.FIELD)
-public class DelayerType extends ExpressionNode {
+public class DelayerDefinition extends ExpressionNode {
@XmlAttribute
private Long delayTime = 0L;
- public DelayerType() {
+ public DelayerDefinition() {
}
- public DelayerType(Expression processAtExpression) {
+ public DelayerDefinition(Expression processAtExpression) {
super(processAtExpression);
}
- public DelayerType(ExpressionType processAtExpression) {
+ public DelayerDefinition(ExpressionDefinition processAtExpression) {
super(processAtExpression);
}
- public DelayerType(Expression processAtExpression, long delayTime) {
+ public DelayerDefinition(Expression processAtExpression, long delayTime) {
super(processAtExpression);
this.delayTime = delayTime;
}
@@ -69,7 +69,7 @@
* @param delay delay time in millis
* @return the builder
*/
- public DelayerType delayTime(Long delay) {
+ public DelayerDefinition delayTime(Long delay) {
setDelayTime(delay);
return this;
}
@@ -78,7 +78,7 @@
* Set the expression that the delayer will use
* @return the builder
*/
- public ExpressionClause<DelayerType> expression() {
+ public ExpressionClause<DelayerDefinition> expression() {
return ExpressionClause.createAndSetExpression(this);
}
@@ -104,7 +104,7 @@
}
private Expression createAbsoluteTimeDelayExpression(RouteContext routeContext) {
- ExpressionType expr = getExpression();
+ ExpressionDefinition expr = getExpression();
if (expr != null) {
if (ObjectHelper.isNotEmpty(expr.getExpression())
|| expr.getExpressionValue() != null) {
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/Description.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/DescriptionDefinition.java Fri Mar 6 08:20:00 2009
@@ -29,7 +29,7 @@
*/
@XmlRootElement(name = "description")
@XmlAccessorType(XmlAccessType.FIELD)
-public class Description {
+public class DescriptionDefinition {
@XmlAttribute(required = false)
private String lang;
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/EnricherDefinition.java Fri Mar 6 08:20:00 2009
@@ -33,7 +33,7 @@
*/
@XmlRootElement(name = "enrich")
@XmlAccessorType(XmlAccessType.FIELD)
-public class EnricherType extends OutputType<EnricherType> {
+public class EnricherDefinition extends OutputDefinition<EnricherDefinition> {
@XmlAttribute(name = "uri", required = true)
private String resourceUri;
@@ -44,15 +44,15 @@
@XmlTransient
private AggregationStrategy aggregationStrategy;
- public EnricherType() {
+ public EnricherDefinition() {
this(null, null);
}
- public EnricherType(String resourceUri) {
+ public EnricherDefinition(String resourceUri) {
this(null, resourceUri);
}
- public EnricherType(AggregationStrategy aggregationStrategy, String resourceUri) {
+ public EnricherDefinition(AggregationStrategy aggregationStrategy, String resourceUri) {
this.aggregationStrategy = aggregationStrategy;
this.resourceUri = resourceUri;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionDefinition.java Fri Mar 6 08:20:00 2009
@@ -51,22 +51,22 @@
*/
@XmlRootElement(name = "onException")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ExceptionType extends ProcessorType<ProcessorType> {
+public class ExceptionDefinition extends ProcessorDefinition<ProcessorDefinition> {
@XmlElement(name = "exception")
private List<String> exceptions = new ArrayList<String>();
@XmlElement(name = "onWhen", required = false)
- private WhenType onWhen;
+ private WhenDefinition onWhen;
@XmlElement(name = "retryUntil", required = false)
- private ExpressionSubElementType retryUntil;
+ private ExpressionSubElementDefinition retryUntil;
@XmlElement(name = "redeliveryPolicy", required = false)
- private RedeliveryPolicyType redeliveryPolicy;
+ private RedeliveryPolicyDefinition redeliveryPolicy;
@XmlElement(name = "handled", required = false)
- private ExpressionSubElementType handled;
+ private ExpressionSubElementDefinition handled;
@XmlAttribute(name = "onRedeliveryRef", required = false)
private String onRedeliveryRef;
@XmlElementRef
- private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+ private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
@XmlTransient
private List<Class> exceptionClasses;
@XmlTransient
@@ -78,14 +78,14 @@
@XmlTransient
private Processor onRedelivery;
- public ExceptionType() {
+ public ExceptionDefinition() {
}
- public ExceptionType(List<Class> exceptionClasses) {
+ public ExceptionDefinition(List<Class> exceptionClasses) {
this.exceptionClasses = exceptionClasses;
}
- public ExceptionType(Class exceptionType) {
+ public ExceptionDefinition(Class exceptionType) {
exceptionClasses = new ArrayList<Class>();
exceptionClasses.add(exceptionType);
}
@@ -139,7 +139,7 @@
//-------------------------------------------------------------------------
@Override
- public ExceptionType onException(Class exceptionType) {
+ public ExceptionDefinition onException(Class exceptionType) {
getExceptionClasses().add(exceptionType);
return this;
}
@@ -150,7 +150,7 @@
* @param handled handled or not
* @return the builder
*/
- public ExceptionType handled(boolean handled) {
+ public ExceptionDefinition handled(boolean handled) {
ConstantLanguage constant = new ConstantLanguage();
return handled(constant.createPredicate(Boolean.toString(handled)));
}
@@ -161,7 +161,7 @@
* @param handled predicate that determines true or false
* @return the builder
*/
- public ExceptionType handled(Predicate handled) {
+ public ExceptionDefinition handled(Predicate handled) {
setHandledPolicy(handled);
return this;
}
@@ -172,7 +172,7 @@
* @param handled expression that determines true or false
* @return the builder
*/
- public ExceptionType handled(Expression handled) {
+ public ExceptionDefinition handled(Expression handled) {
setHandledPolicy(toPredicate(handled));
return this;
}
@@ -186,8 +186,8 @@
* @param predicate predicate that determines true or false
* @return the builder
*/
- public ExceptionType onWhen(Predicate predicate) {
- setOnWhen(new WhenType(predicate));
+ public ExceptionDefinition onWhen(Predicate predicate) {
+ setOnWhen(new WhenDefinition(predicate));
return this;
}
@@ -200,9 +200,9 @@
*
* @return the expression clause to configure
*/
- public ExpressionClause<ExceptionType> onWhen() {
- onWhen = new WhenType();
- ExpressionClause<ExceptionType> clause = new ExpressionClause<ExceptionType>(this);
+ public ExpressionClause<ExceptionDefinition> onWhen() {
+ onWhen = new WhenDefinition();
+ ExpressionClause<ExceptionDefinition> clause = new ExpressionClause<ExceptionDefinition>(this);
onWhen.setExpression(clause);
return clause;
}
@@ -213,7 +213,7 @@
* @param until predicate that determines when to stop retrying
* @return the builder
*/
- public ExceptionType retryUntil(Predicate until) {
+ public ExceptionDefinition retryUntil(Predicate until) {
setRetryUntilPolicy(until);
return this;
}
@@ -224,7 +224,7 @@
* @param until expression that determines when to stop retrying
* @return the builder
*/
- public ExceptionType retryUntil(Expression until) {
+ public ExceptionDefinition retryUntil(Expression until) {
setRetryUntilPolicy(toPredicate(until));
return this;
}
@@ -235,7 +235,7 @@
* @param backOffMultiplier the back off multiplier
* @return the builder
*/
- public ExceptionType backOffMultiplier(double backOffMultiplier) {
+ public ExceptionDefinition backOffMultiplier(double backOffMultiplier) {
getOrCreateRedeliveryPolicy().backOffMultiplier(backOffMultiplier);
return this;
}
@@ -246,7 +246,7 @@
* @param collisionAvoidanceFactor the factor
* @return the builder
*/
- public ExceptionType collisionAvoidanceFactor(double collisionAvoidanceFactor) {
+ public ExceptionDefinition collisionAvoidanceFactor(double collisionAvoidanceFactor) {
getOrCreateRedeliveryPolicy().collisionAvoidanceFactor(collisionAvoidanceFactor);
return this;
}
@@ -257,7 +257,7 @@
* @param collisionAvoidancePercent the percentage
* @return the builder
*/
- public ExceptionType collisionAvoidancePercent(short collisionAvoidancePercent) {
+ public ExceptionDefinition collisionAvoidancePercent(short collisionAvoidancePercent) {
getOrCreateRedeliveryPolicy().collisionAvoidancePercent(collisionAvoidancePercent);
return this;
}
@@ -268,7 +268,7 @@
* @param delay delay in millis
* @return the builder
*/
- public ExceptionType redeliveryDelay(long delay) {
+ public ExceptionDefinition redeliveryDelay(long delay) {
getOrCreateRedeliveryPolicy().redeliveryDelay(delay);
return this;
}
@@ -279,7 +279,7 @@
* @param retriesExhaustedLogLevel the logging level
* @return the builder
*/
- public ExceptionType retriesExhaustedLogLevel(LoggingLevel retriesExhaustedLogLevel) {
+ public ExceptionDefinition retriesExhaustedLogLevel(LoggingLevel retriesExhaustedLogLevel) {
getOrCreateRedeliveryPolicy().retriesExhaustedLogLevel(retriesExhaustedLogLevel);
return this;
}
@@ -290,7 +290,7 @@
* @param retryAttemptedLogLevel the logging level
* @return the builder
*/
- public ExceptionType retryAttemptedLogLevel(LoggingLevel retryAttemptedLogLevel) {
+ public ExceptionDefinition retryAttemptedLogLevel(LoggingLevel retryAttemptedLogLevel) {
getOrCreateRedeliveryPolicy().retryAttemptedLogLevel(retryAttemptedLogLevel);
return this;
}
@@ -306,7 +306,7 @@
* @param maximumRedeliveries the value
* @return the builder
*/
- public ExceptionType maximumRedeliveries(int maximumRedeliveries) {
+ public ExceptionDefinition maximumRedeliveries(int maximumRedeliveries) {
getOrCreateRedeliveryPolicy().maximumRedeliveries(maximumRedeliveries);
return this;
}
@@ -316,7 +316,7 @@
*
* @return the builder
*/
- public ExceptionType useCollisionAvoidance() {
+ public ExceptionDefinition useCollisionAvoidance() {
getOrCreateRedeliveryPolicy().useCollisionAvoidance();
return this;
}
@@ -326,7 +326,7 @@
*
* @return the builder
*/
- public ExceptionType useExponentialBackOff() {
+ public ExceptionDefinition useExponentialBackOff() {
getOrCreateRedeliveryPolicy().useExponentialBackOff();
return this;
}
@@ -337,7 +337,7 @@
* @param maximumRedeliveryDelay the delay in millis
* @return the builder
*/
- public ExceptionType maximumRedeliveryDelay(long maximumRedeliveryDelay) {
+ public ExceptionDefinition maximumRedeliveryDelay(long maximumRedeliveryDelay) {
getOrCreateRedeliveryPolicy().maximumRedeliveryDelay(maximumRedeliveryDelay);
return this;
}
@@ -347,18 +347,18 @@
* <p/>
* Can be used to change the {@link org.apache.camel.Exchange} <b>before</b> its being redelivered.
*/
- public ExceptionType onRedelivery(Processor processor) {
+ public ExceptionDefinition onRedelivery(Processor processor) {
setOnRedelivery(processor);
return this;
}
// Properties
//-------------------------------------------------------------------------
- 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;
}
@@ -385,11 +385,11 @@
return errorHandler;
}
- public RedeliveryPolicyType getRedeliveryPolicy() {
+ public RedeliveryPolicyDefinition getRedeliveryPolicy() {
return redeliveryPolicy;
}
- public void setRedeliveryPolicy(RedeliveryPolicyType redeliveryPolicy) {
+ public void setRedeliveryPolicy(RedeliveryPolicyDefinition redeliveryPolicy) {
this.redeliveryPolicy = redeliveryPolicy;
}
@@ -397,11 +397,11 @@
return handledPolicy;
}
- public void setHandled(ExpressionSubElementType handled) {
+ public void setHandled(ExpressionSubElementDefinition handled) {
this.handled = handled;
}
- public ExpressionSubElementType getHandled() {
+ public ExpressionSubElementDefinition getHandled() {
return handled;
}
@@ -409,19 +409,19 @@
this.handledPolicy = handledPolicy;
}
- public WhenType getOnWhen() {
+ public WhenDefinition getOnWhen() {
return onWhen;
}
- public void setOnWhen(WhenType onWhen) {
+ public void setOnWhen(WhenDefinition onWhen) {
this.onWhen = onWhen;
}
- public ExpressionSubElementType getRetryUntil() {
+ public ExpressionSubElementDefinition getRetryUntil() {
return retryUntil;
}
- public void setRetryUntil(ExpressionSubElementType retryUntil) {
+ public void setRetryUntil(ExpressionSubElementDefinition retryUntil) {
this.retryUntil = retryUntil;
}
@@ -452,9 +452,9 @@
// Implementation methods
//-------------------------------------------------------------------------
- protected RedeliveryPolicyType getOrCreateRedeliveryPolicy() {
+ protected RedeliveryPolicyDefinition getOrCreateRedeliveryPolicy() {
if (redeliveryPolicy == null) {
- redeliveryPolicy = new RedeliveryPolicyType();
+ redeliveryPolicy = new RedeliveryPolicyDefinition();
}
return redeliveryPolicy;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java Fri Mar 6 08:20:00 2009
@@ -26,7 +26,7 @@
import org.apache.camel.Expression;
import org.apache.camel.Predicate;
import org.apache.camel.Processor;
-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;
@@ -36,28 +36,28 @@
* @version $Revision$
*/
@XmlAccessorType(XmlAccessType.FIELD)
-public class ExpressionNode extends ProcessorType<ProcessorType> {
+public class ExpressionNode extends ProcessorDefinition<ProcessorDefinition> {
@XmlElementRef
- private ExpressionType expression;
+ private ExpressionDefinition expression;
@XmlElementRef
- private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+ private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
public ExpressionNode() {
}
- public ExpressionNode(ExpressionType expression) {
+ public ExpressionNode(ExpressionDefinition expression) {
this.expression = expression;
}
public ExpressionNode(Expression expression) {
if (expression != null) {
- setExpression(new ExpressionType(expression));
+ setExpression(new ExpressionDefinition(expression));
}
}
public ExpressionNode(Predicate predicate) {
if (predicate != null) {
- setExpression(new ExpressionType(predicate));
+ setExpression(new ExpressionDefinition(predicate));
}
}
@@ -66,19 +66,19 @@
return "exp";
}
- public ExpressionType getExpression() {
+ public ExpressionDefinition getExpression() {
return expression;
}
- public void setExpression(ExpressionType expression) {
+ public void setExpression(ExpressionDefinition expression) {
this.expression = expression;
}
- 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;
}
@@ -96,7 +96,7 @@
}
@Override
- protected void configureChild(ProcessorType output) {
+ protected void configureChild(ProcessorDefinition output) {
super.configureChild(output);
if (isInheritErrorHandler()) {
output.setErrorHandlerBuilder(getErrorHandlerBuilder());
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterDefinition.java Fri Mar 6 08:20:00 2009
@@ -22,7 +22,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;
@@ -33,16 +33,16 @@
*/
@XmlRootElement(name = "filter")
@XmlAccessorType(XmlAccessType.FIELD)
-public class FilterType extends ExpressionNode implements Block {
+public class FilterDefinition extends ExpressionNode implements Block {
- public FilterType() {
+ public FilterDefinition() {
}
- public FilterType(ExpressionType expression) {
+ public FilterDefinition(ExpressionDefinition expression) {
super(expression);
}
- public FilterType(Predicate predicate) {
+ public FilterDefinition(Predicate predicate) {
super(predicate);
}
@@ -68,7 +68,7 @@
* Set the expression that this FilterType will use
* @return the builder
*/
- public ExpressionClause<FilterType> expression() {
+ public ExpressionClause<FilterDefinition> expression() {
return ExpressionClause.createAndSetExpression(this);
}
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyDefinition.java Fri Mar 6 08:20:00 2009
@@ -30,7 +30,7 @@
*/
@XmlRootElement(name = "finally")
@XmlAccessorType(XmlAccessType.FIELD)
-public class FinallyType extends OutputType<ProcessorType> implements Block {
+public class FinallyDefinition extends OutputDefinition<ProcessorDefinition> implements Block {
@Override
public String toString() {
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromDefinition.java Fri Mar 6 08:20:00 2009
@@ -33,7 +33,7 @@
*/
@XmlRootElement(name = "from")
@XmlAccessorType(XmlAccessType.FIELD)
-public class FromType extends OptionalIdentifiedType<FromType> {
+public class FromDefinition extends OptionalIdentifiedType<FromDefinition> {
@XmlAttribute
private String uri;
@XmlAttribute
@@ -41,14 +41,14 @@
@XmlTransient
private Endpoint endpoint;
- public FromType() {
+ public FromDefinition() {
}
- public FromType(String uri) {
+ public FromDefinition(String uri) {
setUri(uri);
}
- public FromType(Endpoint endpoint) {
+ public FromDefinition(Endpoint endpoint) {
this.endpoint = endpoint;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultDefinition.java Fri Mar 6 08:20:00 2009
@@ -29,9 +29,9 @@
*/
@XmlRootElement(name = "handleFault")
@XmlAccessorType(XmlAccessType.FIELD)
-public class HandleFaultType extends InterceptorRef {
+public class HandleFaultDefinition extends InterceptorRef {
- public HandleFaultType() {
+ public HandleFaultDefinition() {
super(new HandleFaultProcessor());
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerDefinition.java Fri Mar 6 08:20:00 2009
@@ -36,16 +36,16 @@
*/
@XmlRootElement(name = "idempotentConsumer")
@XmlAccessorType(XmlAccessType.FIELD)
-public class IdempotentConsumerType extends ExpressionNode {
+public class IdempotentConsumerDefinition extends ExpressionNode {
@XmlAttribute
private String messageIdRepositoryRef;
@XmlTransient
private IdempotentRepository idempotentRepository;
- public IdempotentConsumerType() {
+ public IdempotentConsumerDefinition() {
}
- public IdempotentConsumerType(Expression messageIdExpression, IdempotentRepository idempotentRepository) {
+ public IdempotentConsumerDefinition(Expression messageIdExpression, IdempotentRepository idempotentRepository) {
super(messageIdExpression);
this.idempotentRepository = idempotentRepository;
}
@@ -66,7 +66,7 @@
* Set the expression that IdempotentConsumerType will use
* @return the builder
*/
- public ExpressionClause<IdempotentConsumerType> expression() {
+ public ExpressionClause<IdempotentConsumerDefinition> expression() {
return ExpressionClause.createAndSetExpression(this);
}
@@ -76,7 +76,7 @@
* @param messageIdRepositoryRef the reference name of message id repository
* @return builder
*/
- public IdempotentConsumerType messageIdRepositoryRef(String messageIdRepositoryRef) {
+ public IdempotentConsumerDefinition messageIdRepositoryRef(String messageIdRepositoryRef) {
setMessageIdRepositoryRef(messageIdRepositoryRef);
return this;
}
@@ -87,7 +87,7 @@
* @param idempotentRepository the repository instance of idempotent
* @return builder
*/
- public IdempotentConsumerType messageIdRepository(IdempotentRepository idempotentRepository) {
+ public IdempotentConsumerDefinition messageIdRepository(IdempotentRepository idempotentRepository) {
setMessageIdRepository(idempotentRepository);
return this;
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOnlyDefinition.java Fri Mar 6 08:20:00 2009
@@ -30,16 +30,16 @@
*/
@XmlRootElement(name = "inOnly")
@XmlAccessorType(XmlAccessType.FIELD)
-public class InOnlyType extends SendType<InOnlyType> {
+public class InOnlyDefinition extends SendDefinition<InOnlyDefinition> {
- public InOnlyType() {
+ public InOnlyDefinition() {
}
- public InOnlyType(String uri) {
+ public InOnlyDefinition(String uri) {
setUri(uri);
}
- public InOnlyType(Endpoint endpoint) {
+ public InOnlyDefinition(Endpoint endpoint) {
setEndpoint(endpoint);
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutDefinition.java Fri Mar 6 08:20:00 2009
@@ -30,16 +30,16 @@
*/
@XmlRootElement(name = "inOut")
@XmlAccessorType(XmlAccessType.FIELD)
-public class InOutType extends SendType<InOutType> {
+public class InOutDefinition extends SendDefinition<InOutDefinition> {
- public InOutType() {
+ public InOutDefinition() {
}
- public InOutType(String uri) {
+ public InOutDefinition(String uri) {
setUri(uri);
}
- public InOutType(Endpoint endpoint) {
+ public InOutDefinition(Endpoint endpoint) {
setEndpoint(endpoint);
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptDefinition.java Fri Mar 6 08:20:00 2009
@@ -38,10 +38,10 @@
*/
@XmlRootElement(name = "intercept")
@XmlAccessorType(XmlAccessType.FIELD)
-public class InterceptType extends OutputType<ProcessorType> {
+public class InterceptDefinition extends OutputDefinition<ProcessorDefinition> {
@XmlTransient
- private ProceedType proceed = new ProceedType();
+ private ProceedDefinition proceed = new ProceedDefinition();
@XmlTransient
private Boolean stopIntercept = Boolean.FALSE;
@XmlTransient
@@ -79,14 +79,14 @@
* @param predicate the predicate
* @return the builder
*/
- public ChoiceType when(Predicate predicate) {
+ public ChoiceDefinition when(Predicate predicate) {
usePredicate = Boolean.TRUE;
- ChoiceType choice = choice().when(PredicateBuilder.not(predicate));
+ ChoiceDefinition choice = choice().when(PredicateBuilder.not(predicate));
choice.addOutput(proceed);
return choice.otherwise();
}
- public ProceedType getProceed() {
+ public ProceedDefinition getProceed() {
return proceed;
}
@@ -102,29 +102,29 @@
* with or without proceed/stop set as well.
*/
public void afterPropertiesSet() {
- List<ProcessorType> list = new ArrayList<ProcessorType>();
- for (ProcessorType out : outputs) {
- if (out instanceof WhenType) {
+ List<ProcessorDefinition> list = new ArrayList<ProcessorDefinition>();
+ for (ProcessorDefinition out : outputs) {
+ if (out instanceof WhenDefinition) {
// JAXB does not invoke the when() fluent builder so we need to wrap the when in
// a choice with the proceed as the when for the Java DSL does
- WhenType when = (WhenType) out;
+ WhenDefinition when = (WhenDefinition) out;
usePredicate = Boolean.TRUE;
- ChoiceType choice = new ChoiceType();
+ ChoiceDefinition choice = new ChoiceDefinition();
choice.when(PredicateBuilder.not(when.getExpression()));
choice.addOutput(proceed);
list.add(choice);
- ChoiceType otherwise = choice.otherwise();
+ ChoiceDefinition otherwise = choice.otherwise();
// add the children to the otherwise
- for (ProcessorType child : when.getOutputs()) {
- if (child instanceof StopType) {
+ for (ProcessorDefinition child : when.getOutputs()) {
+ if (child instanceof StopDefinition) {
// notify we should stop
stopIntercept();
} else {
otherwise.addOutput(child);
}
}
- } else if (out instanceof StopType) {
+ } else if (out instanceof StopDefinition) {
// notify we shuld stop
stopIntercept();
} else {
@@ -134,13 +134,13 @@
// replace old output with this redone output list
outputs.clear();
- for (ProcessorType out : list) {
+ for (ProcessorDefinition out : list) {
addOutput(out);
}
}
- public InterceptType createProxy() {
- InterceptType answer = new InterceptType();
+ public InterceptDefinition createProxy() {
+ InterceptDefinition answer = new InterceptDefinition();
answer.getOutputs().addAll(this.getOutputs());
answer.setStopIntercept(getStopIntercept());
@@ -151,16 +151,16 @@
// outputs of the otherwise or last when clause for the predicated version.
if (answer.getOutputs().size() > 0) {
// this is for the predicate version or if a choice() is present
- ChoiceType choice = null;
- for (ProcessorType processor : answer.getOutputs()) {
- if (processor instanceof ChoiceType) {
+ ChoiceDefinition choice = null;
+ for (ProcessorDefinition processor : answer.getOutputs()) {
+ if (processor instanceof ChoiceDefinition) {
// special cases for predicates (choices)
- choice = (ChoiceType) processor;
+ choice = (ChoiceDefinition) processor;
// for the predicated version we add the proceed() to otherwise()
// before knowing if stop() will follow, so let's make a small adjustment
if (usePredicate && getStopIntercept()) {
- WhenType when = choice.getWhenClauses().get(0);
+ WhenDefinition when = choice.getWhenClauses().get(0);
when.getOutputs().remove(this.getProceed());
}
@@ -191,12 +191,12 @@
return answer;
}
- private void addProceedProxy(ProceedType orig, ProceedType proxy, ProcessorType<?> processor, boolean force) {
+ private void addProceedProxy(ProceedDefinition orig, ProceedDefinition proxy, ProcessorDefinition<?> processor, boolean force) {
int index = processor.getOutputs().indexOf(orig);
if (index >= 0) {
processor.addOutput(proxy);
// replace original proceed with proxy
- List<ProcessorType> outs = processor.getOutputs();
+ List<ProcessorDefinition> outs = processor.getOutputs();
outs.remove(proxy);
outs.set(index, proxy);
} else if (force) {
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorDefinition.java Fri Mar 6 08:20:00 2009
@@ -27,7 +27,7 @@
* @version $Revision$
*/
@XmlType(name = "interceptorType")
-public abstract class InterceptorType extends OutputType implements Block {
+public abstract class InterceptorDefinition extends OutputDefinition implements Block {
public abstract DelegateProcessor createInterceptor(RouteContext routeContext) throws Exception;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java Fri Mar 6 08:20:00 2009
@@ -34,7 +34,7 @@
*/
@XmlRootElement(name = "interceptor")
@XmlAccessorType(XmlAccessType.FIELD)
-public class InterceptorRef extends InterceptorType {
+public class InterceptorRef extends InterceptorDefinition {
@XmlAttribute(required = true)
private String ref;
@XmlTransient
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceDefinition.java Fri Mar 6 08:20:00 2009
@@ -31,7 +31,7 @@
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.model.loadbalancer.FailOverLoadBalanceStrategy;
-import org.apache.camel.model.loadbalancer.LoadBalancerType;
+import org.apache.camel.model.loadbalancer.LoadBalancerDefinition;
import org.apache.camel.model.loadbalancer.RandomLoadBalanceStrategy;
import org.apache.camel.model.loadbalancer.RoundRobinLoadBalanceStrategy;
import org.apache.camel.model.loadbalancer.StickyLoadBalanceStrategy;
@@ -51,7 +51,7 @@
*/
@XmlRootElement(name = "loadBalance")
@XmlAccessorType(XmlAccessType.FIELD)
-public class LoadBalanceType extends ProcessorType<LoadBalanceType> {
+public class LoadBalanceDefinition extends ProcessorDefinition<LoadBalanceDefinition> {
@XmlAttribute(required = false)
private String ref;
@@ -62,12 +62,12 @@
@XmlElement(required = false, name = "sticky", type = StickyLoadBalanceStrategy.class),
@XmlElement(required = false, name = "topic", type = TopicLoadBalanceStrategy.class)}
)
- private LoadBalancerType loadBalancerType;
+ private LoadBalancerDefinition loadBalancerType;
@XmlElementRef
- private List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+ private List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
- public LoadBalanceType() {
+ public LoadBalanceDefinition() {
}
@Override
@@ -75,14 +75,14 @@
return "loadbalance";
}
- 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;
if (outputs != null) {
- for (ProcessorType output : outputs) {
+ for (ProcessorDefinition output : outputs) {
configureChild(output);
}
}
@@ -90,7 +90,7 @@
@Override
- protected void configureChild(ProcessorType output) {
+ protected void configureChild(ProcessorDefinition output) {
super.configureChild(output);
if (isInheritErrorHandler()) {
output.setErrorHandlerBuilder(getErrorHandlerBuilder());
@@ -105,18 +105,18 @@
this.ref = ref;
}
- public LoadBalancerType getLoadBalancerType() {
+ public LoadBalancerDefinition getLoadBalancerType() {
return loadBalancerType;
}
- public void setLoadBalancerType(LoadBalancerType loadbalancer) {
+ public void setLoadBalancerType(LoadBalancerDefinition loadbalancer) {
loadBalancerType = loadbalancer;
}
- protected Processor createOutputsProcessor(RouteContext routeContext, Collection<ProcessorType> outputs)
+ protected Processor createOutputsProcessor(RouteContext routeContext, Collection<ProcessorDefinition> outputs)
throws Exception {
- LoadBalancer loadBalancer = LoadBalancerType.getLoadBalancer(routeContext, loadBalancerType, ref);
- for (ProcessorType processorType : outputs) {
+ LoadBalancer loadBalancer = LoadBalancerDefinition.getLoadBalancer(routeContext, loadBalancerType, ref);
+ for (ProcessorDefinition processorType : outputs) {
// The outputs should be the SendProcessor
SendProcessor processor = (SendProcessor) processorType.createProcessor(routeContext);
loadBalancer.addProcessor(processor);
@@ -126,8 +126,8 @@
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
- LoadBalancer loadBalancer = LoadBalancerType.getLoadBalancer(routeContext, loadBalancerType, ref);
- for (ProcessorType processorType : getOutputs()) {
+ LoadBalancer loadBalancer = LoadBalancerDefinition.getLoadBalancer(routeContext, loadBalancerType, ref);
+ for (ProcessorDefinition processorType : getOutputs()) {
Processor processor = processorType.createProcessor(routeContext);
processor = processorType.wrapProcessorInInterceptors(routeContext, processor);
loadBalancer.addProcessor(processor);
@@ -144,8 +144,8 @@
* @param loadBalancer the load balancer
* @return the builder
*/
- public LoadBalanceType setLoadBalancer(LoadBalancer loadBalancer) {
- loadBalancerType = new LoadBalancerType(loadBalancer);
+ public LoadBalanceDefinition setLoadBalancer(LoadBalancer loadBalancer) {
+ loadBalancerType = new LoadBalancerDefinition(loadBalancer);
return this;
}
@@ -154,8 +154,8 @@
*
* @return the builder
*/
- public LoadBalanceType failOver() {
- loadBalancerType = new LoadBalancerType(new FailOverLoadBalancer());
+ public LoadBalanceDefinition failOver() {
+ loadBalancerType = new LoadBalancerDefinition(new FailOverLoadBalancer());
return this;
}
@@ -165,8 +165,8 @@
* @param throwable exception Class which we want to catch
* @return the builder
*/
- public LoadBalanceType failOver(Class throwable) {
- loadBalancerType = new LoadBalancerType(new FailOverLoadBalancer(throwable));
+ public LoadBalanceDefinition failOver(Class throwable) {
+ loadBalancerType = new LoadBalancerDefinition(new FailOverLoadBalancer(throwable));
return this;
}
@@ -175,8 +175,8 @@
*
* @return the builder
*/
- public LoadBalanceType roundRobin() {
- loadBalancerType = new LoadBalancerType(new RoundRobinLoadBalancer());
+ public LoadBalanceDefinition roundRobin() {
+ loadBalancerType = new LoadBalancerDefinition(new RoundRobinLoadBalancer());
return this;
}
@@ -184,8 +184,8 @@
* Uses random load balancer
* @return the builder
*/
- public LoadBalanceType random() {
- loadBalancerType = new LoadBalancerType(new RandomLoadBalancer());
+ public LoadBalanceDefinition random() {
+ loadBalancerType = new LoadBalancerDefinition(new RandomLoadBalancer());
return this;
}
@@ -195,8 +195,8 @@
* @param correlationExpression the expression for correlation
* @return the builder
*/
- public LoadBalanceType sticky(Expression correlationExpression) {
- loadBalancerType = new LoadBalancerType(new StickyLoadBalancer(correlationExpression));
+ public LoadBalanceDefinition sticky(Expression correlationExpression) {
+ loadBalancerType = new LoadBalancerDefinition(new StickyLoadBalancer(correlationExpression));
return this;
}
@@ -205,16 +205,16 @@
*
* @return the builder
*/
- public LoadBalanceType topic() {
- loadBalancerType = new LoadBalancerType(new TopicLoadBalancer());
+ public LoadBalanceDefinition topic() {
+ loadBalancerType = new LoadBalancerDefinition(new TopicLoadBalancer());
return this;
}
@Override
public String getLabel() {
CollectionStringBuffer buffer = new CollectionStringBuffer();
- List<ProcessorType> list = getOutputs();
- for (ProcessorType processorType : list) {
+ List<ProcessorDefinition> list = getOutputs();
+ for (ProcessorDefinition processorType : list) {
buffer.append(processorType.getLabel());
}
return buffer.toString();
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoopDefinition.java Fri Mar 6 08:20:00 2009
@@ -23,7 +23,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.LoopProcessor;
import org.apache.camel.spi.RouteContext;
@@ -34,21 +34,21 @@
*/
@XmlRootElement(name = "loop")
@XmlAccessorType(XmlAccessType.FIELD)
-public class LoopType extends ExpressionNode implements Block {
- public LoopType() {
+public class LoopDefinition extends ExpressionNode implements Block {
+ public LoopDefinition() {
}
- public LoopType(Expression expression) {
+ public LoopDefinition(Expression expression) {
super(expression);
}
- public LoopType(ExpressionType expression) {
+ public LoopDefinition(ExpressionDefinition expression) {
super(expression);
}
public void setExpression(Expression expr) {
if (expr != null) {
- setExpression(new ExpressionType(expr));
+ setExpression(new ExpressionDefinition(expr));
}
}
@@ -76,7 +76,7 @@
* Set the expression that LoopType will use
* @return the builder
*/
- public ExpressionClause<LoopType> expression() {
+ public ExpressionClause<LoopDefinition> expression() {
return ExpressionClause.createAndSetExpression(this);
}
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.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;
@@ -42,13 +42,13 @@
import org.apache.camel.spi.RouteContext;
/**
- * Marshals to a binary payload using the given {@link DataFormatType}
+ * Marshals to a binary payload using the given {@link DataFormatDefinition}
*
* @version $Revision$
*/
@XmlRootElement(name = "marshal")
@XmlAccessorType(XmlAccessType.FIELD)
-public class MarshalType extends OutputType<ProcessorType> {
+public class MarshalDefinition extends OutputDefinition<ProcessorDefinition> {
@XmlAttribute(required = false)
private String ref;
// TODO cannot use @XmlElementRef as it doesn't allow optional properties
@@ -67,16 +67,16 @@
@XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
@XmlElement(required = false, name = "zip", type = ZipDataFormat.class)}
)
- private DataFormatType dataFormatType;
+ private DataFormatDefinition dataFormatType;
- public MarshalType() {
+ public MarshalDefinition() {
}
- public MarshalType(DataFormatType dataFormatType) {
+ public MarshalDefinition(DataFormatDefinition dataFormatType) {
this.dataFormatType = dataFormatType;
}
- public MarshalType(String ref) {
+ public MarshalDefinition(String ref) {
this.ref = ref;
}
@@ -102,17 +102,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 MarshalProcessor(dataFormat);
}
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastDefinition.java Fri Mar 6 08:20:00 2009
@@ -39,7 +39,7 @@
*/
@XmlRootElement(name = "multicast")
@XmlAccessorType(XmlAccessType.FIELD)
-public class MulticastType extends OutputType<ProcessorType> {
+public class MulticastDefinition extends OutputDefinition<ProcessorDefinition> {
@XmlAttribute(required = false)
private Boolean parallelProcessing;
@XmlAttribute(required = false)
@@ -74,7 +74,7 @@
*
* @return the builder
*/
- public MulticastType aggregationStrategy(AggregationStrategy aggregationStrategy) {
+ public MulticastDefinition aggregationStrategy(AggregationStrategy aggregationStrategy) {
setAggregationStrategy(aggregationStrategy);
return this;
}
@@ -84,7 +84,7 @@
*
* @return the builder
*/
- public MulticastType parallelProcessing() {
+ public MulticastDefinition parallelProcessing() {
setParallelProcessing(true);
return this;
}
@@ -97,7 +97,7 @@
*
* @return the builder
*/
- public MulticastType parallelProcessing(boolean parallelProcessing) {
+ public MulticastDefinition parallelProcessing(boolean parallelProcessing) {
setParallelProcessing(parallelProcessing);
return this;
}
@@ -107,7 +107,7 @@
*
* @return the builder
*/
- public MulticastType executor(Executor executor) {
+ public MulticastDefinition executor(Executor executor) {
setExecutor(executor);
return this;
}
@@ -129,7 +129,7 @@
return aggregationStrategy;
}
- public MulticastType setAggregationStrategy(AggregationStrategy aggregationStrategy) {
+ public MulticastDefinition setAggregationStrategy(AggregationStrategy aggregationStrategy) {
this.aggregationStrategy = aggregationStrategy;
return this;
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/NodeFactory.java Fri Mar 6 08:20:00 2009
@@ -23,15 +23,15 @@
* @version $Revision$
*/
public class NodeFactory {
- public FilterType createFilter() {
- return new FilterType();
+ public FilterDefinition createFilter() {
+ return new FilterDefinition();
}
- public LoopType createLoop() {
- return new LoopType();
+ public LoopDefinition createLoop() {
+ return new LoopDefinition();
}
- public RouteType createRoute() {
- return new RouteType();
+ public RouteDefinition createRoute() {
+ return new RouteDefinition();
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java Fri Mar 6 08:20:00 2009
@@ -45,7 +45,7 @@
@XmlID
private String id;
@XmlElement(required = false)
- private Description description;
+ private DescriptionDefinition description;
/**
@@ -62,11 +62,11 @@
this.id = value;
}
- public Description getDescription() {
+ public DescriptionDefinition getDescription() {
return description;
}
- public void setDescription(Description description) {
+ public void setDescription(DescriptionDefinition description) {
this.description = description;
}
@@ -97,13 +97,13 @@
}
if (text != null) {
if (description == null) {
- description = new Description();
+ description = new DescriptionDefinition();
}
description.setText(text);
}
if (lang != null) {
if (description == null) {
- description = new Description();
+ description = new DescriptionDefinition();
}
description.setLang(lang);
}
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseDefinition.java Fri Mar 6 08:20:00 2009
@@ -32,7 +32,7 @@
*/
@XmlRootElement(name = "otherwise")
@XmlAccessorType(XmlAccessType.FIELD)
-public class OtherwiseType extends OutputType<ProcessorType> implements Block {
+public class OtherwiseDefinition extends OutputDefinition<ProcessorDefinition> implements Block {
@Override
public String toString() {
@@ -52,8 +52,8 @@
@Override
public String getLabel() {
CollectionStringBuffer buffer = new CollectionStringBuffer();
- List<ProcessorType> list = getOutputs();
- for (ProcessorType type : list) {
+ List<ProcessorDefinition> list = getOutputs();
+ for (ProcessorDefinition type : list) {
buffer.append(type.getLabel());
}
return buffer.toString();
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputDefinition.java Fri Mar 6 08:20:00 2009
@@ -32,29 +32,29 @@
*
* @version $Revision$
*/
-@XmlType(name = "outputType")
+@XmlType(name = "output")
@XmlAccessorType(XmlAccessType.FIELD)
-public class OutputType<Type extends ProcessorType> extends ProcessorType<Type> {
- private static final transient Log LOG = LogFactory.getLog(OutputType.class);
+public class OutputDefinition<Type extends ProcessorDefinition> extends ProcessorDefinition<Type> {
+ private static final transient Log LOG = LogFactory.getLog(OutputDefinition.class);
@XmlElementRef
- protected List<ProcessorType> outputs = new ArrayList<ProcessorType>();
+ protected List<ProcessorDefinition> outputs = new ArrayList<ProcessorDefinition>();
- 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;
if (outputs != null) {
- for (ProcessorType output : outputs) {
+ for (ProcessorDefinition output : outputs) {
configureChild(output);
}
}
}
@Override
- protected void configureChild(ProcessorType output) {
+ protected void configureChild(ProcessorDefinition output) {
super.configureChild(output);
if (isInheritErrorHandler()) {
output.setErrorHandlerBuilder(getErrorHandlerBuilder());
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineDefinition.java Fri Mar 6 08:20:00 2009
@@ -31,7 +31,7 @@
*/
@XmlRootElement(name = "pipeline")
@XmlAccessorType(XmlAccessType.FIELD)
-public class PipelineType extends OutputType<ProcessorType> {
+public class PipelineDefinition extends OutputDefinition<ProcessorDefinition> {
@Override
public String getShortName() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java?rev=750806&r1=750805&r2=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java Fri Mar 6 08:20:00 2009
@@ -34,7 +34,7 @@
*/
@XmlRootElement(name = "policy")
@XmlAccessorType(XmlAccessType.FIELD)
-public class PolicyRef extends OutputType<ProcessorType> {
+public class PolicyRef extends OutputDefinition<ProcessorDefinition> {
@XmlAttribute(required = true)
private String ref;
@XmlTransient
Copied: camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedDefinition.java (from r750590, camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java)
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedDefinition.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedDefinition.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java&r1=750590&r2=750806&rev=750806&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedDefinition.java Fri Mar 6 08:20:00 2009
@@ -30,7 +30,7 @@
*/
@XmlRootElement(name = "proceed")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ProceedType extends OutputType<ProcessorType> {
+public class ProceedDefinition extends OutputDefinition<ProcessorDefinition> {
@Override
public String getShortName() {