You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/11/27 17:11:34 UTC
svn commit: r1039701 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/model/dataformat/
camel-core/src/test/java/org/apache/camel/model/ cam...
Author: davsclaus
Date: Sat Nov 27 16:11:32 2010
New Revision: 1039701
URL: http://svn.apache.org/viewvc?rev=1039701&view=rev
Log:
CAMEL-3204: Added camel-jixb data format. Thanks to Henryk for patch.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java (with props)
camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithJibxDataFormat.xml (with props)
camel/trunk/components/camel-jibx/
camel/trunk/components/camel-jibx/pom.xml (with props)
camel/trunk/components/camel-jibx/src/
camel/trunk/components/camel-jibx/src/main/
camel/trunk/components/camel-jibx/src/main/java/
camel/trunk/components/camel-jibx/src/main/java/org/
camel/trunk/components/camel-jibx/src/main/java/org/apache/
camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/
camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/
camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/
camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/JibxDataFormat.java (with props)
camel/trunk/components/camel-jibx/src/main/resources/
camel/trunk/components/camel-jibx/src/main/resources/META-INF/
camel/trunk/components/camel-jibx/src/main/resources/META-INF/LICENSE.txt (with props)
camel/trunk/components/camel-jibx/src/main/resources/META-INF/NOTICE.txt (with props)
camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/
camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/org/
camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/org/apache/
camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/org/apache/camel/
camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/org/apache/camel/dataformat/
camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/org/apache/camel/dataformat/jibx
camel/trunk/components/camel-jibx/src/test/
camel/trunk/components/camel-jibx/src/test/java/
camel/trunk/components/camel-jibx/src/test/java/org/
camel/trunk/components/camel-jibx/src/test/java/org/apache/
camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/
camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/
camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/
camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatMarshallTest.java (with props)
camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatSpringDslTest.java (with props)
camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatUnmarshallTest.java (with props)
camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/PurchaseOrder.java (with props)
camel/trunk/components/camel-jibx/src/test/resources/
camel/trunk/components/camel-jibx/src/test/resources/log4j.properties (with props)
camel/trunk/components/camel-jibx/src/test/resources/org/
camel/trunk/components/camel-jibx/src/test/resources/org/apache/
camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/
camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/
camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/
camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/SpringJibxConfigurationTest.xml (with props)
camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/purchaseOrder-jibx.xml (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
camel/trunk/components/pom.xml
camel/trunk/parent/pom.xml
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java?rev=1039701&r1=1039700&r2=1039701&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataFormatClause.java Sat Nov 27 16:11:32 2010
@@ -28,6 +28,7 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.GzipDataFormat;
import org.apache.camel.model.dataformat.HL7DataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
+import org.apache.camel.model.dataformat.JibxDataFormat;
import org.apache.camel.model.dataformat.JsonDataFormat;
import org.apache.camel.model.dataformat.JsonLibrary;
import org.apache.camel.model.dataformat.ProtobufDataFormat;
@@ -163,6 +164,20 @@ public class DataFormatClause<T extends
}
/**
+ * Uses the JiBX data format.
+ */
+ public T jibx() {
+ return dataFormat(new JibxDataFormat());
+ }
+
+ /**
+ * Uses the JiBX data format with unmarshall class.
+ */
+ public T jibx(Class unmarshallClass) {
+ return dataFormat(new JibxDataFormat(unmarshallClass));
+ }
+
+ /**
* Uses the JSON data format using the XStream json library
*/
public T json() {
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java?rev=1039701&r1=1039700&r2=1039701&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/MarshalDefinition.java Sat Nov 27 16:11:32 2010
@@ -32,6 +32,7 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.GzipDataFormat;
import org.apache.camel.model.dataformat.HL7DataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
+import org.apache.camel.model.dataformat.JibxDataFormat;
import org.apache.camel.model.dataformat.JsonDataFormat;
import org.apache.camel.model.dataformat.RssDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
@@ -65,6 +66,7 @@ public class MarshalDefinition extends O
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
+ @XmlElement(required = false, name = "jibx", type = JibxDataFormat.class),
@XmlElement(required = false, name = "json", type = JsonDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
@XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java?rev=1039701&r1=1039700&r2=1039701&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalDefinition.java Sat Nov 27 16:11:32 2010
@@ -32,6 +32,7 @@ import org.apache.camel.model.dataformat
import org.apache.camel.model.dataformat.GzipDataFormat;
import org.apache.camel.model.dataformat.HL7DataFormat;
import org.apache.camel.model.dataformat.JaxbDataFormat;
+import org.apache.camel.model.dataformat.JibxDataFormat;
import org.apache.camel.model.dataformat.JsonDataFormat;
import org.apache.camel.model.dataformat.RssDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
@@ -66,6 +67,7 @@ public class UnmarshalDefinition extends
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
+ @XmlElement(required = false, name = "jibx", type = JibxDataFormat.class),
@XmlElement(required = false, name = "json", type = JsonDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
@XmlElement(required = false, name = "secureXML", type = XMLSecurityDataFormat.class),
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java?rev=1039701&r1=1039700&r2=1039701&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/DataFormatsDefinition.java Sat Nov 27 16:11:32 2010
@@ -45,6 +45,7 @@ public class DataFormatsDefinition {
@XmlElement(required = false, name = "gzip", type = GzipDataFormat.class),
@XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
+ @XmlElement(required = false, name = "jibx", type = JibxDataFormat.class),
@XmlElement(required = false, name = "json", type = JsonDataFormat.class),
@XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
@XmlElement(required = false, name = "rss", type = RssDataFormat.class),
Added: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java?rev=1039701&view=auto
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java (added)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java Sat Nov 27 16:11:32 2010
@@ -0,0 +1,65 @@
+/**
+ * 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.
+ */
+package org.apache.camel.model.dataformat;
+
+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 org.apache.camel.model.DataFormatDefinition;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.spi.RouteContext;
+
+/**
+ * Represents the JiBX XML {@link org.apache.camel.spi.DataFormat}
+ *
+ */
+@XmlRootElement(name = "jibx")
+@XmlAccessorType(XmlAccessType.NONE)
+public class JibxDataFormat extends DataFormatDefinition {
+
+ @XmlAttribute
+ private Class unmarshallClass;
+
+ public JibxDataFormat() {
+ super("jibx");
+ }
+
+ public JibxDataFormat(Class unmarshallClass) {
+ this();
+ setUnmarshallClass(unmarshallClass);
+ }
+
+ @Override
+ protected DataFormat createDataFormat(RouteContext routeContext) {
+ DataFormat answer = super.createDataFormat(routeContext);
+ if (unmarshallClass != null) {
+ setProperty(answer, "unmarshallClass", unmarshallClass);
+ }
+ return answer;
+ }
+
+ public Class getUnmarshallClass() {
+ return unmarshallClass;
+ }
+
+ public void setUnmarshallClass(Class unmarshallClass) {
+ this.unmarshallClass = unmarshallClass;
+ }
+
+}
\ No newline at end of file
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JibxDataFormat.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java?rev=1039701&r1=1039700&r2=1039701&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/model/XmlParseTest.java Sat Nov 27 16:11:32 2010
@@ -245,6 +245,11 @@ public class XmlParseTest extends XmlTes
assertFrom(route, "seda:a");
}
+ public void testParseJibxDataFormat() throws Exception {
+ RouteDefinition route = assertOneRoute("routeWithJibxDataFormat.xml");
+ assertFrom(route, "seda:a");
+ }
+
public void testParseXMLBeansDataFormat() throws Exception {
RouteDefinition route = assertOneRoute("routeWithXMLBeansDataFormat.xml");
assertFrom(route, "seda:a");
Added: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithJibxDataFormat.xml
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithJibxDataFormat.xml?rev=1039701&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithJibxDataFormat.xml (added)
+++ camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithJibxDataFormat.xml Sat Nov 27 16:11:32 2010
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<routes id="camel" xmlns="http://camel.apache.org/schema/spring">
+ <route>
+ <from uri="seda:a"/>
+ <pipeline>
+ <marshal>
+ <jibx/>
+ </marshal>
+ <to uri="seda:b"/>
+ </pipeline>
+ </route>
+</routes>
Propchange: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithJibxDataFormat.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithJibxDataFormat.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/camel-core/src/test/resources/org/apache/camel/model/routeWithJibxDataFormat.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-jibx/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/pom.xml?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/pom.xml (added)
+++ camel/trunk/components/camel-jibx/pom.xml Sat Nov 27 16:11:32 2010
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>2.6-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>camel-jibx</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Jibx</name>
+ <description>Camel Jibx support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.dataformat.jibx.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>${jibx-version}</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ <version>${jibx-version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- Use Maven Antrun plugin + JiBX Ant task to perform the binding
+ of the test classes. We will use Maven plugin when following issue
+ will be fixed - http://jira.codehaus.org/browse/JIBX-355 -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.5</version>
+ <executions>
+ <execution>
+ <phase>process-test-classes</phase>
+ <configuration>
+ <target>
+ <taskdef name="bind" classname="org.jibx.binding.ant.CompileTask">
+ <classpath refid="maven.test.classpath"/>
+ </taskdef>
+ <bind>
+ <classpath>
+ <pathelement path="target/test-classes"/>
+ </classpath>
+ <bindingfileset dir="src/test/resources">
+ <include name="**/*-jibx.xml"/>
+ </bindingfileset>
+ </bind>
+ </target>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.8.1</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
Propchange: camel/trunk/components/camel-jibx/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-jibx/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/JibxDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/JibxDataFormat.java?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/JibxDataFormat.java (added)
+++ camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/JibxDataFormat.java Sat Nov 27 16:11:32 2010
@@ -0,0 +1,61 @@
+/**
+ * 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.
+ */
+package org.apache.camel.dataformat.jibx;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.util.ObjectHelper;
+import org.jibx.runtime.BindingDirectory;
+import org.jibx.runtime.IBindingFactory;
+import org.jibx.runtime.IMarshallingContext;
+import org.jibx.runtime.IUnmarshallingContext;
+
+public class JibxDataFormat implements DataFormat {
+ private Class unmarshallClass;
+
+ public JibxDataFormat() {
+ }
+
+ public JibxDataFormat(Class unmarshallClass) {
+ this.setUnmarshallClass(unmarshallClass);
+ }
+
+ public void marshal(Exchange exchange, Object body, OutputStream stream) throws Exception {
+ IBindingFactory bindingFactory = BindingDirectory.getFactory(body.getClass());
+ IMarshallingContext marshallingContext = bindingFactory.createMarshallingContext();
+ marshallingContext.marshalDocument(body, null, null, stream);
+ }
+
+ public Object unmarshal(Exchange exchange, InputStream stream) throws Exception {
+ ObjectHelper.notNull(getUnmarshallClass(), "unmarshallClass");
+ IBindingFactory bindingFactory = BindingDirectory.getFactory(getUnmarshallClass());
+ IUnmarshallingContext unmarshallingContext = bindingFactory.createUnmarshallingContext();
+ return unmarshallingContext.unmarshalDocument(stream, null);
+ }
+
+ public Class getUnmarshallClass() {
+ return unmarshallClass;
+ }
+
+ public void setUnmarshallClass(Class unmarshallClass) {
+ this.unmarshallClass = unmarshallClass;
+ }
+
+}
Propchange: camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/JibxDataFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/main/java/org/apache/camel/dataformat/jibx/JibxDataFormat.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-jibx/src/main/resources/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/main/resources/META-INF/LICENSE.txt?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/main/resources/META-INF/LICENSE.txt (added)
+++ camel/trunk/components/camel-jibx/src/main/resources/META-INF/LICENSE.txt Sat Nov 27 16:11:32 2010
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
Propchange: camel/trunk/components/camel-jibx/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/main/resources/META-INF/LICENSE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-jibx/src/main/resources/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/main/resources/META-INF/NOTICE.txt?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/main/resources/META-INF/NOTICE.txt (added)
+++ camel/trunk/components/camel-jibx/src/main/resources/META-INF/NOTICE.txt Sat Nov 27 16:11:32 2010
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
Propchange: camel/trunk/components/camel-jibx/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/main/resources/META-INF/NOTICE.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/org/apache/camel/dataformat/jibx
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/org/apache/camel/dataformat/jibx?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/org/apache/camel/dataformat/jibx (added)
+++ camel/trunk/components/camel-jibx/src/main/resources/META-INF/services/org/apache/camel/dataformat/jibx Sat Nov 27 16:11:32 2010
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.dataformat.jibx.JibxDataFormat
Added: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatMarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatMarshallTest.java?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatMarshallTest.java (added)
+++ camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatMarshallTest.java Sat Nov 27 16:11:32 2010
@@ -0,0 +1,80 @@
+/**
+ * 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.
+ */
+package org.apache.camel.dataformat.jibx;
+
+import java.io.IOException;
+import java.io.StringReader;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * @version $Revision$
+ */
+public class JibxDataFormatMarshallTest extends CamelTestSupport {
+
+ @Test
+ public void testMarshall() throws InterruptedException, ParserConfigurationException, IOException, SAXException {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ PurchaseOrder purchaseOrder = new PurchaseOrder();
+ String name = "foo";
+ purchaseOrder.setName(name);
+ double price = 49;
+ purchaseOrder.setPrice(price);
+ double amount = 3;
+ purchaseOrder.setAmount(amount);
+
+ template.sendBody("direct:start", purchaseOrder);
+
+ assertMockEndpointsSatisfied();
+
+ String body = mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ Element root = builder.parse(new InputSource(new StringReader(body))).getDocumentElement();
+
+ assertEquals(name, root.getAttribute("name"));
+ assertEquals(price + "", root.getAttribute("price"));
+ assertEquals(amount + "", root.getAttribute("amount"));
+ }
+
+
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ JibxDataFormat jibxDataFormat = new JibxDataFormat();
+
+ from("direct:start").
+ marshal(jibxDataFormat).
+ convertBodyTo(String.class).
+ to("mock:result");
+ }
+ };
+ }
+
+
+}
Propchange: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatMarshallTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatMarshallTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatSpringDslTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatSpringDslTest.java?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatSpringDslTest.java (added)
+++ camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatSpringDslTest.java Sat Nov 27 16:11:32 2010
@@ -0,0 +1,104 @@
+/**
+ * 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.
+ */
+package org.apache.camel.dataformat.jibx;
+
+import java.io.IOException;
+import java.io.StringReader;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Service;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+import org.springframework.context.support.AbstractXmlApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+public class JibxDataFormatSpringDslTest extends CamelTestSupport {
+
+ @Test
+ public void testMarshall() throws InterruptedException, ParserConfigurationException, IOException, SAXException {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ PurchaseOrder purchaseOrder = new PurchaseOrder();
+ String name = "foo";
+ purchaseOrder.setName(name);
+ double price = 49;
+ purchaseOrder.setPrice(price);
+ double amount = 3;
+ purchaseOrder.setAmount(amount);
+
+ template.sendBody("direct:marshall", purchaseOrder);
+
+ assertMockEndpointsSatisfied();
+
+ String body = mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ Element root = builder.parse(new InputSource(new StringReader(body))).getDocumentElement();
+
+ assertEquals(name, root.getAttribute("name"));
+ assertEquals(price + "", root.getAttribute("price"));
+ assertEquals(amount + "", root.getAttribute("amount"));
+ }
+
+ @Test
+ public void testUnmarshall() throws InterruptedException, ParserConfigurationException, IOException, SAXException {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ String name = "foo";
+ double price = 1;
+ double amount = 2;
+ String purchaseOrderXml = String.format("<order name='%s' price='%s' amount='%s' />", name, price + "", amount + "");
+
+ template.sendBody("direct:unmarshall", purchaseOrderXml);
+
+ assertMockEndpointsSatisfied();
+
+ PurchaseOrder body = mock.getReceivedExchanges().get(0).getIn().getBody(PurchaseOrder.class);
+ assertEquals(name, body.getName());
+ assertEquals(price, body.getPrice(), 1);
+ assertEquals(amount, body.getAmount(), 1);
+ }
+
+ protected CamelContext createCamelContext() throws Exception {
+ setUseRouteBuilder(false);
+
+ final AbstractXmlApplicationContext applicationContext = new ClassPathXmlApplicationContext(
+ "org/apache/camel/dataformat/jibx/SpringJibxConfigurationTest.xml");
+
+ setCamelContextService(new Service() {
+ public void start() throws Exception {
+ applicationContext.start();
+ }
+
+ public void stop() throws Exception {
+ applicationContext.stop();
+ }
+ });
+
+ return SpringCamelContext.springCamelContext(applicationContext);
+ }
+}
Propchange: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatSpringDslTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatSpringDslTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatUnmarshallTest.java?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatUnmarshallTest.java (added)
+++ camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatUnmarshallTest.java Sat Nov 27 16:11:32 2010
@@ -0,0 +1,64 @@
+/**
+ * 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.
+ */
+package org.apache.camel.dataformat.jibx;
+
+import java.io.IOException;
+import javax.xml.parsers.ParserConfigurationException;
+
+import org.xml.sax.SAXException;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class JibxDataFormatUnmarshallTest extends CamelTestSupport {
+
+ @Test
+ public void testUnmarshall() throws InterruptedException, ParserConfigurationException, IOException, SAXException {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ String name = "foo";
+ double price = 1;
+ double amount = 2;
+ String purchaseOrderXml = String.format("<order name='%s' price='%s' amount='%s' />", name, price + "", amount + "");
+
+ template.sendBody("direct:start", purchaseOrderXml);
+
+ assertMockEndpointsSatisfied();
+
+ PurchaseOrder body = mock.getReceivedExchanges().get(0).getIn().getBody(PurchaseOrder.class);
+ assertEquals(name, body.getName());
+ assertEquals(price, body.getPrice(), 1);
+ assertEquals(amount, body.getAmount(), 1);
+ }
+
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ JibxDataFormat jibxDataFormat = new JibxDataFormat(PurchaseOrder.class);
+
+ from("direct:start").
+ unmarshal(jibxDataFormat).
+ convertBodyTo(PurchaseOrder.class).
+ to("mock:result");
+ }
+ };
+ }
+
+}
Propchange: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatUnmarshallTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/JibxDataFormatUnmarshallTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/PurchaseOrder.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/PurchaseOrder.java?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/PurchaseOrder.java (added)
+++ camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/PurchaseOrder.java Sat Nov 27 16:11:32 2010
@@ -0,0 +1,72 @@
+/**
+ * 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.
+ */
+package org.apache.camel.dataformat.jibx;
+
+import org.apache.camel.util.ObjectHelper;
+
+/**
+ * @version $Revision$
+ */
+public class PurchaseOrder {
+ private String name;
+ private double price;
+ private double amount;
+
+ @Override
+ public String toString() {
+ return "PurchaseOrder[name: " + name + " amount: " + amount + " price: " + price + "]";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o instanceof PurchaseOrder) {
+ PurchaseOrder that = (PurchaseOrder) o;
+ return ObjectHelper.equal(this.name, that.name)
+ && ObjectHelper.equal(this.amount, that.amount)
+ && ObjectHelper.equal(this.price, that.price);
+ }
+ return false;
+ }
+
+ public int hashCode() {
+ return (int) (name.hashCode() + (price * 100) + (amount * 100));
+ }
+
+ public double getAmount() {
+ return amount;
+ }
+
+ public void setAmount(double amount) {
+ this.amount = amount;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public double getPrice() {
+ return price;
+ }
+
+ public void setPrice(double price) {
+ this.price = price;
+ }
+}
Propchange: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/PurchaseOrder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/test/java/org/apache/camel/dataformat/jibx/PurchaseOrder.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/components/camel-jibx/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/test/resources/log4j.properties?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/test/resources/log4j.properties (added)
+++ camel/trunk/components/camel-jibx/src/test/resources/log4j.properties Sat Nov 27 16:11:32 2010
@@ -0,0 +1,37 @@
+## ---------------------------------------------------------------------------
+## 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 logging properties used during tests..
+#
+log4j.rootLogger=INFO, out
+
+log4j.logger.org.apache.activemq.spring=WARN
+#log4j.logger.org.apache.camel=DEBUG
+
+# CONSOLE appender not used by default
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+# File appender
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=target/camel-jibx-test.log
+log4j.appender.out.append=true
+
Propchange: camel/trunk/components/camel-jibx/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-jibx/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/SpringJibxConfigurationTest.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/SpringJibxConfigurationTest.xml?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/SpringJibxConfigurationTest.xml (added)
+++ camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/SpringJibxConfigurationTest.xml Sat Nov 27 16:11:32 2010
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
+
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring">
+
+ <dataFormats>
+ <jibx id="jibx" unmarshallClass="org.apache.camel.dataformat.jibx.PurchaseOrder"/>
+ </dataFormats>
+
+ <route>
+ <from uri="direct:marshall"/>
+ <marshal ref="jibx"/>
+ <to uri="mock:result"/>
+ </route>
+ <route>
+ <from uri="direct:unmarshall"/>
+ <unmarshal ref="jibx"/>
+ <to uri="mock:result"/>
+ </route>
+
+ </camelContext>
+
+</beans>
Propchange: camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/SpringJibxConfigurationTest.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/SpringJibxConfigurationTest.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/SpringJibxConfigurationTest.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/purchaseOrder-jibx.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/purchaseOrder-jibx.xml?rev=1039701&view=auto
==============================================================================
--- camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/purchaseOrder-jibx.xml (added)
+++ camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/purchaseOrder-jibx.xml Sat Nov 27 16:11:32 2010
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<binding>
+ <mapping name="order" class="org.apache.camel.dataformat.jibx.PurchaseOrder">
+ <value name="name" field="name" style="attribute"/>
+ <value name="price" field="price" style="attribute"/>
+ <value name="amount" field="amount" style="attribute"/>
+ </mapping>
+</binding>
\ No newline at end of file
Propchange: camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/purchaseOrder-jibx.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/purchaseOrder-jibx.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: camel/trunk/components/camel-jibx/src/test/resources/org/apache/camel/dataformat/jibx/purchaseOrder-jibx.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/pom.xml?rev=1039701&r1=1039700&r2=1039701&view=diff
==============================================================================
--- camel/trunk/components/pom.xml (original)
+++ camel/trunk/components/pom.xml Sat Nov 27 16:11:32 2010
@@ -64,6 +64,7 @@
<module>camel-jackson</module>
<module>camel-javaspace</module>
<module>camel-jaxb</module>
+ <module>camel-jibx</module>
<module>camel-jdbc</module>
<module>camel-jetty</module>
<module>camel-jing</module>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1039701&r1=1039700&r2=1039701&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sat Nov 27 16:11:32 2010
@@ -94,6 +94,7 @@
<jetty-version>7.2.0.v20101020</jetty-version>
<jettison-version>1.2</jettison-version>
<jexcelapi-version>2.4.2</jexcelapi-version>
+ <jibx-version>1.2.2</jibx-version>
<jruby-version>1.5.2</jruby-version>
<jsch-version>0.1.44</jsch-version>
<juel-version>2.1.2</juel-version>