You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/11/02 18:30:40 UTC
svn commit: r591407 -
/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/
Author: jstrachan
Date: Fri Nov 2 10:30:38 2007
New Revision: 591407
URL: http://svn.apache.org/viewvc?rev=591407&view=rev
Log:
removed some commented out cruft after the last commit
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/CatchType.java Fri Nov 2 10:30:38 2007
@@ -37,10 +37,6 @@
@XmlRootElement(name = "catch")
@XmlAccessorType(XmlAccessType.FIELD)
public class CatchType extends ProcessorType<ProcessorType> {
-/*
- @XmlElementRef
- private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
-*/
@XmlElement(name = "exception")
private List<String> exceptions = new ArrayList<String>();
@XmlElementRef
@@ -75,16 +71,6 @@
Processor childProcessor = routeContext.createProcessor(this);
return new CatchProcessor(getExceptionClasses(), childProcessor);
}
-
-/*
- public List<InterceptorType> getInterceptors() {
- return interceptors;
- }
-
- public void setInterceptors(List<InterceptorType> interceptors) {
- this.interceptors = interceptors;
- }
-*/
public List<ProcessorType<?>> getOutputs() {
return outputs;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ChoiceType.java Fri Nov 2 10:30:38 2007
@@ -40,10 +40,6 @@
@XmlRootElement(name = "choice")
@XmlAccessorType(XmlAccessType.FIELD)
public class ChoiceType extends ProcessorType<ChoiceType> {
-/*
- @XmlElementRef
- private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
-*/
@XmlElementRef
private List<WhenType> whenClauses = new ArrayList<WhenType>();
@XmlElement(required = false)
@@ -131,14 +127,4 @@
public void setOtherwise(OtherwiseType otherwise) {
this.otherwise = otherwise;
}
-
-/*
- public List<InterceptorType> getInterceptors() {
- return interceptors;
- }
-
- public void setInterceptors(List<InterceptorType> interceptors) {
- this.interceptors = interceptors;
- }
-*/
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExceptionType.java Fri Nov 2 10:30:38 2007
@@ -146,16 +146,6 @@
// Properties
//-------------------------------------------------------------------------
-/*
- public List<InterceptorType> getInterceptors() {
- return interceptors;
- }
-
- public void setInterceptors(List<InterceptorType> interceptors) {
- this.interceptors = interceptors;
- }
-*/
-
public List<ProcessorType<?>> getOutputs() {
return outputs;
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ExpressionNode.java Fri Nov 2 10:30:38 2007
@@ -38,10 +38,6 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
public class ExpressionNode extends ProcessorType<ProcessorType> {
-/*
- @XmlTransient
- private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
-*/
@XmlElementRef
private ExpressionType expression;
@XmlElementRef
@@ -61,14 +57,6 @@
public ExpressionNode(Predicate predicate) {
setExpression(new ExpressionType(predicate));
}
-
-/* public List<InterceptorType> getInterceptors() {
- return interceptors;
- }
-
- public void setInterceptors(List<InterceptorType> interceptors) {
- this.interceptors = interceptors;
- }*/
public ExpressionType getExpression() {
return expression;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OutputType.java Fri Nov 2 10:30:38 2007
@@ -40,10 +40,6 @@
@XmlElementRef
protected List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
-/*
- @XmlTransient
- private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
-*/
public List<ProcessorType<?>> getOutputs() {
return outputs;
@@ -57,14 +53,7 @@
}
}
}
-/*
- public List<InterceptorType> getInterceptors() {
- return interceptors;
- }
- public void setInterceptors(List<InterceptorType> interceptors) {
- this.interceptors = interceptors;
- }*/
@Override
protected void configureChild(ProcessorType output) {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java Fri Nov 2 10:30:38 2007
@@ -37,12 +37,6 @@
return Collections.EMPTY_LIST;
}
-/*
- public List<InterceptorType> getInterceptors() {
- return Collections.EMPTY_LIST;
- }
-*/
-
public Processor createProcessor(RouteContext routeContext) throws Exception {
return routeContext.createProceedProcessor();
}
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Fri Nov 2 10:30:38 2007
@@ -76,9 +76,6 @@
public abstract List<ProcessorType<?>> getOutputs();
-/*
- public abstract List<InterceptorType> getInterceptors();
-*/
public Processor createProcessor(RouteContext routeContext) throws Exception {
throw new UnsupportedOperationException("Not implemented yet for class: " + getClass().getName());
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ResequencerType.java Fri Nov 2 10:30:38 2007
@@ -43,10 +43,6 @@
*/
@XmlRootElement(name = "resequencer")
public class ResequencerType extends ProcessorType<ProcessorType> {
-/*
- @XmlElementRef
- private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
-*/
@XmlElementRef
private List<ExpressionType> expressions = new ArrayList<ExpressionType>();
@XmlElementRef
@@ -130,16 +126,6 @@
public List<ExpressionType> getExpressions() {
return expressions;
}
-
-/*
- public List<InterceptorType> getInterceptors() {
- return interceptors;
- }
-
- public void setInterceptors(List<InterceptorType> interceptors) {
- this.interceptors = interceptors;
- }
-*/
public List<ProcessorType<?>> getOutputs() {
return outputs;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThreadType.java Fri Nov 2 10:30:38 2007
@@ -77,14 +77,7 @@
public ThreadType(ThreadPoolExecutor executor) {
this.executor = executor;
}
-
-/*
- @Override
- public List getInterceptors() {
- return Collections.EMPTY_LIST;
- }
-*/
-
+
@Override
public List<ProcessorType<?>> getOutputs() {
return outputs;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrottlerType.java Fri Nov 2 10:30:38 2007
@@ -39,10 +39,6 @@
private Long maximumRequestsPerPeriod;
@XmlAttribute
private long timePeriodMillis = 1000;
-/*
- @XmlElementRef
- private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
-*/
@XmlElementRef
private List<ProcessorType<?>> outputs = new ArrayList<ProcessorType<?>>();
@@ -99,16 +95,6 @@
public void setTimePeriodMillis(long timePeriodMillis) {
this.timePeriodMillis = timePeriodMillis;
}
-
-/*
- public List<InterceptorType> getInterceptors() {
- return interceptors;
- }
-
- public void setInterceptors(List<InterceptorType> interceptors) {
- this.interceptors = interceptors;
- }
-*/
public List<ProcessorType<?>> getOutputs() {
return outputs;
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java?rev=591407&r1=591406&r2=591407&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java Fri Nov 2 10:30:38 2007
@@ -45,10 +45,6 @@
private String uri;
@XmlAttribute
private String ref;
-/*
- @XmlElementRef
- private List<InterceptorType> interceptors = new ArrayList<InterceptorType>();
-*/
@XmlTransient
private Endpoint endpoint;
@@ -126,17 +122,6 @@
public List<ProcessorType<?>> getOutputs() {
return Collections.EMPTY_LIST;
}
-
-/*
- public List<InterceptorType> getInterceptors() {
- return interceptors;
- }
-
- public void setInterceptors(List<InterceptorType> interceptors) {
- this.interceptors = interceptors;
- }
-*/
-
/**
* Returns the endpoint URI or the name of the reference to it