Author: jstrachan
Date: Thu Jun 26 08:06:31 2008
New Revision: 671918
URL: http://svn.apache.org/viewvc?rev=671918&view=rev
Log:
improvements for CAMEL-619 - use more descriptive generated IDs for EIP nodes
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
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/ConvertBodyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.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/FilterType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.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/ProcessorRef.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.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/RoutingSlipType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.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/ThrowFaultType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
Thu Jun 26 08:06:31 2008
@@ -81,6 +81,11 @@
return "Aggregator[ " + getExpression() + " -> " + getOutputs() + "]";
}
+ @Override
+ public String getShortName() {
+ return "aggregator";
+ }
+
@SuppressWarnings("unchecked")
@Override
public void addRoutes(RouteContext routeContext, Collection<Route> routes)
throws Exception {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/BeanRef.java
Thu Jun 26 08:06:31 2008
@@ -63,6 +63,11 @@
return "Bean[" + getLabel() + "]";
}
+ @Override
+ public String getShortName() {
+ return "bean";
+ }
+
public String getRef() {
return ref;
}
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=671918&r1=671917&r2=671918&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
Thu Jun 26 08:06:31 2008
@@ -64,6 +64,11 @@
}
@Override
+ public String getShortName() {
+ return "catch";
+ }
+
+ @Override
public String getLabel() {
return getExceptionClasses().toString();
}
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=671918&r1=671917&r2=671918&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
Thu Jun 26 08:06:31 2008
@@ -62,7 +62,11 @@
}
}
-
+ @Override
+ public String getShortName() {
+ return "choice";
+ }
+
@Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
List<FilterProcessor> filters = new ArrayList<FilterProcessor>();
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ConvertBodyType.java
Thu Jun 26 08:06:31 2008
@@ -58,6 +58,11 @@
}
@Override
+ public String getShortName() {
+ return "convertBodyTo";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
return new ConvertBodyProcessor(getTypeClass());
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/DelayerType.java
Thu Jun 26 08:06:31 2008
@@ -57,6 +57,11 @@
return "Delayer[ " + getExpression() + " -> " + getOutputs() + "]";
}
+ @Override
+ public String getShortName() {
+ return "delayer";
+ }
+
public Long getDelay() {
return delay;
}
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=671918&r1=671917&r2=671918&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
Thu Jun 26 08:06:31 2008
@@ -61,6 +61,11 @@
}
}
+ @Override
+ public String getShortName() {
+ return "exp";
+ }
+
public ExpressionType getExpression() {
return expression;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FilterType.java
Thu Jun 26 08:06:31 2008
@@ -48,6 +48,12 @@
public String toString() {
return "Filter[ " + getExpression() + " -> " + getOutputs() + "]";
}
+
+ @Override
+ public String getShortName() {
+ return "filter";
+ }
+
@Override
public FilterProcessor createProcessor(RouteContext routeContext) throws
Exception {
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FinallyType.java
Thu Jun 26 08:06:31 2008
@@ -37,6 +37,11 @@
}
@Override
+ public String getShortName() {
+ return "finally";
+ }
+
+ @Override
public String getLabel() {
return "";
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/FromType.java
Thu Jun 26 08:06:31 2008
@@ -58,6 +58,12 @@
return "From[" + getLabel() + "]";
}
+ @Override
+ public String getShortName() {
+ return "from";
+ }
+
+
public String getLabel() {
return description(getUri(), getRef(), getEndpoint());
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/HandleFaultType.java
Thu Jun 26 08:06:31 2008
@@ -36,6 +36,11 @@
}
@Override
+ public String getShortName() {
+ return "handleFault";
+ }
+
+ @Override
public String toString() {
return "HandleFault[" + getLabel() + "]";
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/IdempotentConsumerType.java
Thu Jun 26 08:06:31 2008
@@ -54,6 +54,11 @@
return "IdempotentConsumer[ " + getExpression() + " -> " +
getOutputs() + "]";
}
+ @Override
+ public String getShortName() {
+ return "idempotentConsumer";
+ }
+
public String getMessageIdRepositoryRef() {
return messageIdRepositoryRef;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptType.java
Thu Jun 26 08:06:31 2008
@@ -50,6 +50,11 @@
}
@Override
+ public String getShortName() {
+ return "intercept";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
Interceptor interceptor = new Interceptor();
routeContext.intercept(interceptor);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InterceptorRef.java
Thu Jun 26 08:06:31 2008
@@ -56,6 +56,11 @@
}
@Override
+ public String getShortName() {
+ return "interceptor";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
DelegateProcessor processor = createInterceptor(routeContext);
Processor child = createOutputsProcessor(routeContext);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/LoadBalanceType.java
Thu Jun 26 08:06:31 2008
@@ -63,6 +63,11 @@
public LoadBalanceType() {
}
+ @Override
+ public String getShortName() {
+ return "loadbalance";
+ }
+
public String getRef() {
return ref;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalType.java
Thu Jun 26 08:06:31 2008
@@ -77,6 +77,11 @@
}
}
+ @Override
+ public String getShortName() {
+ return "marshal";
+ }
+
public String getRef() {
return ref;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MulticastType.java
Thu Jun 26 08:06:31 2008
@@ -53,6 +53,11 @@
}
@Override
+ public String getShortName() {
+ return "multicast";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
return createOutputsProcessor(routeContext);
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OptionalIdentifiedType.java
Thu Jun 26 08:06:31 2008
@@ -17,6 +17,9 @@
package org.apache.camel.model;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.Collections;
+import java.util.Map;
+import java.util.HashMap;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -37,7 +40,7 @@
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class OptionalIdentifiedType<T extends OptionalIdentifiedType>
{
@XmlTransient
- protected static AtomicInteger nodeCounter = new AtomicInteger(1);
+ protected static Map<String,AtomicInteger> nodeCounters = new
HashMap<String, AtomicInteger>();
@XmlAttribute(required = false)
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
@@ -74,6 +77,15 @@
this.description = description;
}
+ /**
+ * Returns a short name for this node which can be useful for ID
generation or referring to related resources like images
+ *
+ * @return defaults to "node" but derived nodes should overload this to
provide a unique name
+ */
+ public String getShortName() {
+ return "node";
+ }
+
// Fluent API
//
-------------------------------------------------------------------------
public T description(String text) {
@@ -97,8 +109,31 @@
public String idOrCreate() {
if (id == null) {
- setId("node" + nodeCounter.incrementAndGet());
+ setId(createId());
}
return getId();
}
+
+ // Implementation methods
+ //
-------------------------------------------------------------------------
+
+ /**
+ * A helper method to create a new ID for this node
+ */
+ protected String createId() {
+ String key = getShortName();
+ return key + getNodeCounter(key).incrementAndGet();
+ }
+
+ /**
+ * Returns the counter for the given node key, lazily creating one if
necessary
+ */
+ protected static synchronized AtomicInteger getNodeCounter(String key) {
+ AtomicInteger answer = nodeCounters.get(key);
+ if (answer == null) {
+ answer = new AtomicInteger(0);
+ nodeCounters.put(key, answer);
+ }
+ return answer;
+ }
}
\ No newline at end of file
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/OtherwiseType.java
Thu Jun 26 08:06:31 2008
@@ -43,6 +43,11 @@
}
@Override
+ public String getShortName() {
+ return "otherwise";
+ }
+
+ @Override
public String getLabel() {
return "otherwise";
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PolicyRef.java
Thu Jun 26 08:06:31 2008
@@ -52,6 +52,11 @@
}
@Override
+ public String getShortName() {
+ return "policy";
+ }
+
+ @Override
public String getLabel() {
if (ref != null) {
return "ref: " + ref;
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=671918&r1=671917&r2=671918&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
Thu Jun 26 08:06:31 2008
@@ -32,6 +32,11 @@
@XmlAccessorType(XmlAccessType.FIELD)
public class ProceedType extends OutputType<ProcessorType> {
+ @Override
+ public String getShortName() {
+ return "proceed";
+ }
+
// TODO we should be just returning the outputs!
public Processor createProcessor(RouteContext routeContext) throws
Exception {
//return routeContext.createProceedProcessor();
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorRef.java
Thu Jun 26 08:06:31 2008
@@ -46,6 +46,11 @@
}
@Override
+ public String getShortName() {
+ return "processor";
+ }
+
+ @Override
public String toString() {
return "Processor["
+ ((ref != null) ? "ref: " + ref : processor)
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RecipientListType.java
Thu Jun 26 08:06:31 2008
@@ -51,6 +51,11 @@
}
@Override
+ public String getShortName() {
+ return "recipientList";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
return new
RecipientList(getExpression().createExpression(routeContext));
}
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=671918&r1=671917&r2=671918&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
Thu Jun 26 08:06:31 2008
@@ -63,6 +63,11 @@
this.batch();
}
+ @Override
+ public String getShortName() {
+ return "resequencer";
+ }
+
/**
* Configures the stream-based resequencing algorithm using the default
* configuration.
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RoutingSlipType.java
Thu Jun 26 08:06:31 2008
@@ -61,6 +61,11 @@
}
@Override
+ public String getShortName() {
+ return "routingSlip";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
return new RoutingSlip(getHeaderName(), getUriDelimiter());
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyType.java
Thu Jun 26 08:06:31 2008
@@ -46,6 +46,11 @@
}
@Override
+ public String getShortName() {
+ return "setBody";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
Expression expr = getExpression().createExpression(routeContext);
return ProcessorBuilder.setBody(expr);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetHeaderType.java
Thu Jun 26 08:06:31 2008
@@ -63,6 +63,11 @@
}
@Override
+ public String getShortName() {
+ return "setHeader";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
Expression expr;
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SplitterType.java
Thu Jun 26 08:06:31 2008
@@ -66,6 +66,11 @@
}
@Override
+ public String getShortName() {
+ return "splitter";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
Processor childProcessor = routeContext.createProcessor(this);
if (aggregationStrategy == null) {
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=671918&r1=671917&r2=671918&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
Thu Jun 26 08:06:31 2008
@@ -87,6 +87,11 @@
}
@Override
+ public String getShortName() {
+ return "thread";
+ }
+
+ @Override
public String getLabel() {
return "coreSize=" + coreSize;
}
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=671918&r1=671917&r2=671918&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
Thu Jun 26 08:06:31 2008
@@ -58,6 +58,11 @@
}
@Override
+ public String getShortName() {
+ return "throttler";
+ }
+
+ @Override
public String getLabel() {
return "" + getMaximumRequestsPerPeriod() + " per " +
getTimePeriodMillis() + " (ms)";
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ThrowFaultType.java
Thu Jun 26 08:06:31 2008
@@ -46,6 +46,11 @@
public ThrowFaultType() {
}
+ @Override
+ public String getShortName() {
+ return "throwFault";
+ }
+
public void setFault(Throwable fault) {
this.fault = fault;
}
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=671918&r1=671917&r2=671918&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
Thu Jun 26 08:06:31 2008
@@ -63,6 +63,11 @@
}
@Override
+ public String getShortName() {
+ return "to";
+ }
+
+ @Override
public String getLabel() {
return FromType.description(getUri(), getRef(), getEndpoint());
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TransformType.java
Thu Jun 26 08:06:31 2008
@@ -45,6 +45,11 @@
}
@Override
+ public String getShortName() {
+ return "transform";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
Expression expr = getExpression().createExpression(routeContext);
Processor childProcessor = routeContext.createProcessor(this);
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/TryType.java
Thu Jun 26 08:06:31 2008
@@ -52,6 +52,11 @@
}
@Override
+ public String getShortName() {
+ return "try";
+ }
+
+ @Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
Processor tryProcessor = createOutputsProcessor(routeContext,
getOutputsWithoutCatches());
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
Thu Jun 26 08:06:31 2008
@@ -77,6 +77,11 @@
}
}
+ @Override
+ public String getShortName() {
+ return "unmarshal";
+ }
+
public String getRef() {
return ref;
}
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java?rev=671918&r1=671917&r2=671918&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/WhenType.java
Thu Jun 26 08:06:31 2008
@@ -48,6 +48,11 @@
}
@Override
+ public String getShortName() {
+ return "when";
+ }
+
+ @Override
public FilterProcessor createProcessor(RouteContext routeContext) throws
Exception {
return createFilterProcessor(routeContext);
}
