Author: ningjiang
Date: Wed Dec 10 22:57:14 2008
New Revision: 725598
URL: http://svn.apache.org/viewvc?rev=725598&view=rev
Log:
Merged revisions 725340,725351 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r725340 | jstrachan | 2008-12-11 01:06:25 +0800 (Thu, 11 Dec 2008) | 1 line
fix for CAMEL-1171 to allow the ExchangePattern to be used in the JAXB beans
........
r725351 | jstrachan | 2008-12-11 01:29:06 +0800 (Thu, 11 Dec 2008) | 1 line
fixed the <setExchangePattern> to use the ExchangePattern enum rather than an
arbitrary string
........
Added:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternType.java
- copied unchanged from r725351,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetExchangePatternType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/package-info.java
- copied unchanged from r725340,
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/package-info.java
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/jaxb.index
- copied unchanged from r725340,
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/jaxb.index
Removed:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ExchangePatternType.java
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/InOutType.java
(props changed)
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ToType.java
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
activemq/camel/branches/camel-1.x/components/camel-spring/pom.xml
activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 10 22:57:14 2008
@@ -1 +1 @@
-/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320
+/activemq/camel/trunk:709850,711200,711206,711219-711220,711523,711531,711756,711784,711859,711874,711962,711971,712064,712119,712148,712662,712692,712925,713013,713107,713136,713273,713290,713292,713295,713314,713475,713625,713932,713944,714032,717965,717989,718242,718273,718312-718515,719163-719184,719334,719339,719524,719662,719848,719851,719855,719864,719978-719979,720207,720435-720437,720806,721272,721331,721333-721334,721360,721669,721764,721813,721985,722005,722070,722110,722415,722438,722726,722845,722878,723264,723314,723325-723327,723409,723835,723966,724122,724619,724681,725040,725309-725320,725340,725351
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ExchangePattern.java?rev=725598&r1=725597&r2=725598&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
Wed Dec 10 22:57:14 2008
@@ -19,11 +19,16 @@
import java.util.HashMap;
import java.util.Map;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
+
/**
* Represents the kind of message exchange pattern
*
* @version $Revision$
*/
[EMAIL PROTECTED]
[EMAIL PROTECTED](String.class)
public enum ExchangePattern {
InOnly, RobustInOnly, InOut, InOptionalOut, OutOnly, RobustOutOnly, OutIn,
OutOptionalIn;
Propchange:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/InOutType.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 10 22:57:14 2008
@@ -0,0 +1 @@
+/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/InOutType.java:725340,725351
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=725598&r1=725597&r2=725598&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
Wed Dec 10 22:57:14 2008
@@ -1572,7 +1572,7 @@
* @return the builder
*/
public Type setExchangePattern(ExchangePattern exchangePattern) {
- addOutput(new ExchangePatternType(exchangePattern));
+ addOutput(new SetExchangePatternType(exchangePattern));
return (Type) this;
}
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ToType.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ToType.java?rev=725598&r1=725597&r2=725598&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ToType.java
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/java/org/apache/camel/model/ToType.java
Wed Dec 10 22:57:14 2008
@@ -18,6 +18,7 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
@@ -32,8 +33,7 @@
@XmlRootElement(name = "to")
@XmlAccessorType(XmlAccessType.FIELD)
public class ToType extends SendType<ToType> {
- //@XmlAttribute(required = false)
- @XmlTransient
+ @XmlAttribute(required = false)
private ExchangePattern pattern;
public ToType() {
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/jaxb.index?rev=725598&r1=725597&r2=725598&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/main/resources/org/apache/camel/model/jaxb.index
Wed Dec 10 22:57:14 2008
@@ -22,7 +22,6 @@
DelayerType
Description
ExceptionType
-ExchangePatternType
ExpressionSubElementType
FilterType
FinallyType
@@ -55,6 +54,7 @@
RoutingSlipType
ServiceActivationType
SetBodyType
+SetExchangePatternType
SetHeaderType
SetOutHeaderType
SetPropertyType
Modified:
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java?rev=725598&r1=725597&r2=725598&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
(original)
+++
activemq/camel/branches/camel-1.x/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
Wed Dec 10 22:57:14 2008
@@ -52,6 +52,6 @@
protected void setUp() throws Exception {
super.setUp();
jaxbContext = JAXBContext
-
.newInstance("org.apache.camel.model:org.apache.camel.model.config:org.apache.camel.model.dataformat:org.apache.camel.model.language:org.apache.camel.model.loadbalancer");
+
.newInstance("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");
}
}
Modified: activemq/camel/branches/camel-1.x/components/camel-spring/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring/pom.xml?rev=725598&r1=725597&r2=725598&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-spring/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-spring/pom.xml Wed Dec
10 22:57:14 2008
@@ -194,6 +194,8 @@
</fileset>
<fileset dir="${basedir}/../../camel-core/src/main/java">
<include name="org/apache/camel/model/**/*.java"/>
+ <include name="org/apache/camel/ExchangePattern.java"/>
+ <include name="org/apache/camel/package-info.java"/>
</fileset>
</copy>
</tasks>
Modified:
activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=725598&r1=725597&r2=725598&view=diff
==============================================================================
---
activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
(original)
+++
activemq/camel/branches/camel-1.x/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Wed Dec 10 22:57:14 2008
@@ -29,6 +29,7 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+import org.apache.camel.ExchangePattern;
import org.apache.camel.builder.xml.Namespaces;
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
@@ -57,6 +58,7 @@
import org.springframework.beans.factory.xml.ParserContext;
+
/**
* Camel namespace for the spring XML configuration file.
*/
@@ -170,6 +172,7 @@
protected Set<Class> getJaxbPackages() {
Set<Class> classes = new HashSet<Class>();
classes.add(org.apache.camel.spring.CamelContextFactoryBean.class);
+ classes.add(ExchangePattern.class);
classes.add(org.apache.camel.model.RouteType.class);
classes.add(org.apache.camel.model.config.StreamResequencerConfig.class);
classes.add(org.apache.camel.model.dataformat.DataFormatType.class);
