svn commit: r673835 - in /activemq/camel/trunk/camel-core/src/main: java/org/apache/camel/model/PipelineType.java resources/org/apache/camel/model/jaxb.index

[jstrachan]

Author: jstrachan
Date: Thu Jul  3 15:03:13 2008
New Revision: 673835

URL: http://svn.apache.org/viewvc?rev=673835&view=rev
Log:
applied fix for https://issues.apache.org/activemq/browse/CAMEL-661 to add a 
<pipeline> tag

Added:
    
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineType.java
      - copied, changed from r673746, 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java
Modified:
    
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index

Copied: 
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineType.java
 (from r673746, 
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/PipelineType.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/PipelineType.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProceedType.java&r1=673746&r2=673835&rev=673835&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/PipelineType.java
 Thu Jul  3 15:03:13 2008
@@ -24,22 +24,21 @@
 import org.apache.camel.spi.RouteContext;
 
 /**
- * Represents an XML &lt;proceed/&gt; element
+ * Represents an XML &lt;pipeline/&gt; element which can be used to define an 
explicit pipeline; or to define
+ * a specific pipeline within a &lt;multicast&gt; block
  *
  * @version $Revision$
  */
[EMAIL PROTECTED](name = "proceed")
[EMAIL PROTECTED](name = "pipeline")
 @XmlAccessorType(XmlAccessType.FIELD)
-public class ProceedType extends OutputType<ProcessorType> {
+public class PipelineType extends OutputType<ProcessorType> {
 
     @Override
     public String getShortName() {
-        return "proceed";
+        return "pipeline";
     }
 
-    // TODO we should be just returning the outputs!
     public Processor createProcessor(RouteContext routeContext) throws 
Exception {
-        //return routeContext.createProceedProcessor();
         return createOutputsProcessor(routeContext);
     }
-}
+}
\ No newline at end of file

Modified: 
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
URL: 
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index?rev=673835&r1=673834&r2=673835&view=diff
==============================================================================
--- 
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
 (original)
+++ 
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
 Thu Jul  3 15:03:13 2008
@@ -34,6 +34,7 @@
 MulticastType
 OptionalIdentifiedType
 OtherwiseType
+PipelineType
 PolicyRef
 ProceedType
 ProcessorRef