Author: jstrachan
Date: Wed Dec 10 09:06:25 2008
New Revision: 725340
URL: http://svn.apache.org/viewvc?rev=725340&view=rev
Log:
fix for CAMEL-1171 to allow the ExchangePattern to be used in the JAXB beans
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/package-info.java
(with props)
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/jaxb.index
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ToType.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
activemq/camel/trunk/components/camel-spring/pom.xml
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java?rev=725340&r1=725339&r2=725340&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
(original)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/ExchangePattern.java
Wed Dec 10 09:06:25 2008
@@ -16,6 +16,8 @@
*/
package org.apache.camel;
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlType;
import java.util.HashMap;
import java.util.Map;
@@ -24,6 +26,8 @@
*
* @version $Revision$
*/
[EMAIL PROTECTED]
[EMAIL PROTECTED](String.class)
public enum ExchangePattern {
InOnly, RobustInOnly, InOut, InOptionalOut, OutOnly, RobustOutOnly, OutIn,
OutOptionalIn;
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=725340&r1=725339&r2=725340&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
Wed Dec 10 09:06:25 2008
@@ -40,8 +40,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() {
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/package-info.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/package-info.java?rev=725340&view=auto
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/package-info.java
(added)
+++
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/package-info.java
Wed Dec 10 09:06:25 2008
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * The JAXB POJOs for the
+ * <a href="http://activemq.apache.org/camel/xml-configuration.html";>XML
Configuration</a>
+ * of the routing rules.
+ */
[EMAIL PROTECTED](namespace = "http://activemq.apache.org/camel/schema/spring";,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+package org.apache.camel;
+
Propchange:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/jaxb.index
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/jaxb.index?rev=725340&view=auto
==============================================================================
---
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/jaxb.index
(added)
+++
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/jaxb.index
Wed Dec 10 09:06:25 2008
@@ -0,0 +1,17 @@
+## ------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ------------------------------------------------------------------------
+ExchangePattern
\ No newline at end of file
Modified:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java?rev=725340&r1=725339&r2=725340&view=diff
==============================================================================
---
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
(original)
+++
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlTestSupport.java
Wed Dec 10 09:06:25 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/trunk/components/camel-spring/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/pom.xml?rev=725340&r1=725339&r2=725340&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/pom.xml (original)
+++ activemq/camel/trunk/components/camel-spring/pom.xml Wed Dec 10 09:06:25
2008
@@ -196,6 +196,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/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL:
http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=725340&r1=725339&r2=725340&view=diff
==============================================================================
---
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
(original)
+++
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
Wed Dec 10 09:06:25 2008
@@ -48,6 +48,7 @@
import org.apache.camel.spring.remoting.CamelServiceExporter;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.view.ModelFileGenerator;
+import org.apache.camel.ExchangePattern;
import org.springframework.beans.factory.BeanDefinitionStoreException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -170,6 +171,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);
