You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/11/26 12:15:41 UTC
svn commit: r598226 - in /activemq/camel/trunk: ./
apache-camel/src/main/descriptors/
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-...
Author: jstrachan
Date: Mon Nov 26 03:15:32 2007
New Revision: 598226
URL: http://svn.apache.org/viewvc?rev=598226&view=rev
Log:
added support for the CSV data format for https://issues.apache.org/activemq/browse/CAMEL-244
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeClause.java (contents, props changed)
- copied, changed from r597315, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeExpression.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
- copied, changed from r597315, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java
activemq/camel/trunk/components/camel-csv/
activemq/camel/trunk/components/camel-csv/pom.xml (with props)
activemq/camel/trunk/components/camel-csv/src/
activemq/camel/trunk/components/camel-csv/src/main/
activemq/camel/trunk/components/camel-csv/src/main/java/
activemq/camel/trunk/components/camel-csv/src/main/java/org/
activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/
activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/
activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/
activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/
activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java (with props)
activemq/camel/trunk/components/camel-csv/src/main/resources/
activemq/camel/trunk/components/camel-csv/src/main/resources/META-INF/
activemq/camel/trunk/components/camel-csv/src/main/resources/META-INF/services/
activemq/camel/trunk/components/camel-csv/src/main/resources/META-INF/services/org/
activemq/camel/trunk/components/camel-csv/src/main/resources/META-INF/services/org/apache/
activemq/camel/trunk/components/camel-csv/src/main/resources/META-INF/services/org/apache/camel/
activemq/camel/trunk/components/camel-csv/src/test/
activemq/camel/trunk/components/camel-csv/src/test/java/
activemq/camel/trunk/components/camel-csv/src/test/java/org/
activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/
activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/
activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/
activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/
activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java (with props)
activemq/camel/trunk/components/camel-csv/src/test/resources/
activemq/camel/trunk/components/camel-csv/src/test/resources/log4j.properties (with props)
activemq/camel/trunk/components/camel-supercsv/
activemq/camel/trunk/components/camel-supercsv/pom.xml (with props)
activemq/camel/trunk/components/camel-supercsv/src/
activemq/camel/trunk/components/camel-supercsv/src/main/
activemq/camel/trunk/components/camel-supercsv/src/main/java/
activemq/camel/trunk/components/camel-supercsv/src/main/java/org/
activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/
activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/camel/
activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/camel/dataformat/
activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/camel/dataformat/supercsv/
activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/camel/dataformat/supercsv/CsvDataFormat.java (with props)
activemq/camel/trunk/components/camel-supercsv/src/main/resources/
activemq/camel/trunk/components/camel-supercsv/src/main/resources/META-INF/
activemq/camel/trunk/components/camel-supercsv/src/main/resources/META-INF/services/
activemq/camel/trunk/components/camel-supercsv/src/main/resources/META-INF/services/org/
activemq/camel/trunk/components/camel-supercsv/src/main/resources/META-INF/services/org/apache/
activemq/camel/trunk/components/camel-supercsv/src/main/resources/META-INF/services/org/apache/camel/
activemq/camel/trunk/components/camel-supercsv/src/test/
activemq/camel/trunk/components/camel-supercsv/src/test/data/
activemq/camel/trunk/components/camel-supercsv/src/test/java/
activemq/camel/trunk/components/camel-supercsv/src/test/java/org/
activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/
activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/camel/
activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/camel/dataformat/
activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/camel/dataformat/supercsv/
activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/camel/dataformat/supercsv/CsvRouteTest.java (with props)
activemq/camel/trunk/components/camel-supercsv/src/test/resources/
activemq/camel/trunk/components/camel-supercsv/src/test/resources/log4j.properties (with props)
Removed:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeExpression.java
Modified:
activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
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/ProcessorType.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/UnmarshalType.java
activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
activemq/camel/trunk/components/pom.xml
activemq/camel/trunk/pom.xml
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml?rev=598226&r1=598225&r2=598226&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/unix-bin.xml Mon Nov 26 03:15:32 2007
@@ -84,6 +84,7 @@
<include>org.apache.camel:camel-atom</include>
<include>org.apache.camel:camel-bam</include>
<include>org.apache.camel:camel-core</include>
+ <include>org.apache.camel:camel-csv</include>
<include>org.apache.camel:camel-cxf</include>
<include>org.apache.camel:camel-ftp</include>
<include>org.apache.camel:camel-http</include>
Modified: activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml?rev=598226&r1=598225&r2=598226&view=diff
==============================================================================
--- activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml (original)
+++ activemq/camel/trunk/apache-camel/src/main/descriptors/windows-bin.xml Mon Nov 26 03:15:32 2007
@@ -90,6 +90,7 @@
<include>org.apache.camel:camel-atom</include>
<include>org.apache.camel:camel-bam</include>
<include>org.apache.camel:camel-core</include>
+ <include>org.apache.camel:camel-csv</include>
<include>org.apache.camel:camel-cxf</include>
<include>org.apache.camel:camel-ftp</include>
<include>org.apache.camel:camel-http</include>
@@ -112,6 +113,7 @@
<include>org.apache.camel:camel-saxon</include>
<include>org.apache.camel:camel-script</include>
<include>org.apache.camel:camel-spring</include>
+ <include>org.apache.camel:camel-stringtemplate</include>
<include>org.apache.camel:camel-xmlbeans</include>
<include>org.apache.camel:camel-xmpp</include>
<include>org.apache.camel:camel-xstream</include>
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeClause.java (from r597315, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeExpression.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeClause.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeClause.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeExpression.java&r1=597315&r2=598226&rev=598226&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeExpression.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeClause.java Mon Nov 26 03:15:32 2007
@@ -20,6 +20,7 @@
import org.apache.camel.model.ProcessorType;
import org.apache.camel.model.dataformat.ArtixDSContentType;
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
+import org.apache.camel.model.dataformat.CsvDataFormat;
import org.apache.camel.model.dataformat.DataFormatType;
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
@@ -34,7 +35,7 @@
*
* @version $Revision: 1.1 $
*/
-public class DataTypeExpression<T extends ProcessorType> {
+public class DataTypeClause<T extends ProcessorType> {
private final T processorType;
private final Operation operation;
@@ -42,7 +43,7 @@
Marshal, Unmarshal
};
- public DataTypeExpression(T processorType, Operation operation) {
+ public DataTypeClause(T processorType, Operation operation) {
this.processorType = processorType;
this.operation = operation;
}
@@ -85,6 +86,13 @@
*/
public T artixDS(ArtixDSContentType contentType) {
return dataFormat(new ArtixDSDataFormat(contentType));
+ }
+
+ /**
+ * Uses the JAXB data format
+ */
+ public T csv() {
+ return dataFormat(new CsvDataFormat());
}
/**
Propchange: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DataTypeClause.java
------------------------------------------------------------------------------
svn:eol-style = native
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=598226&r1=598225&r2=598226&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 Mon Nov 26 03:15:32 2007
@@ -26,6 +26,7 @@
import org.apache.camel.Processor;
import org.apache.camel.impl.RouteContext;
import org.apache.camel.model.dataformat.ArtixDSDataFormat;
+import org.apache.camel.model.dataformat.CsvDataFormat;
import org.apache.camel.model.dataformat.DataFormatType;
import org.apache.camel.model.dataformat.JaxbDataFormat;
import org.apache.camel.model.dataformat.SerializationDataFormat;
@@ -48,6 +49,7 @@
// @XmlElementRef
@XmlElements({
@XmlElement(required = false, name = "artixDS", type = ArtixDSDataFormat.class),
+ @XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java?rev=598226&r1=598225&r2=598226&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/ProcessorType.java Mon Nov 26 03:15:32 2007
@@ -34,7 +34,7 @@
import org.apache.camel.Route;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.Builder;
-import org.apache.camel.builder.DataTypeExpression;
+import org.apache.camel.builder.DataTypeClause;
import org.apache.camel.builder.DeadLetterChannelBuilder;
import org.apache.camel.builder.ErrorHandlerBuilder;
import org.apache.camel.builder.ExpressionClause;
@@ -1001,8 +1001,8 @@
*
* @return the expression to create the {@link DataFormat}
*/
- public DataTypeExpression<ProcessorType<Type>> unmarshal() {
- return new DataTypeExpression<ProcessorType<Type>>(this, DataTypeExpression.Operation.Unmarshal);
+ public DataTypeClause<ProcessorType<Type>> unmarshal() {
+ return new DataTypeClause<ProcessorType<Type>>(this, DataTypeClause.Operation.Unmarshal);
}
/**
@@ -1043,8 +1043,8 @@
*
* @return the expression to create the {@link DataFormat}
*/
- public DataTypeExpression<ProcessorType<Type>> marshal() {
- return new DataTypeExpression<ProcessorType<Type>>(this, DataTypeExpression.Operation.Marshal);
+ public DataTypeClause<ProcessorType<Type>> marshal() {
+ return new DataTypeClause<ProcessorType<Type>>(this, DataTypeClause.Operation.Marshal);
}
/**
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=598226&r1=598225&r2=598226&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 Mon Nov 26 03:15:32 2007
@@ -31,6 +31,7 @@
import org.apache.camel.model.dataformat.SerializationDataFormat;
import org.apache.camel.model.dataformat.XMLBeansDataFormat;
import org.apache.camel.model.dataformat.StringDataFormat;
+import org.apache.camel.model.dataformat.CsvDataFormat;
import org.apache.camel.processor.UnmarshalProcessor;
import org.apache.camel.spi.DataFormat;
@@ -48,6 +49,7 @@
// @XmlElementRef
@XmlElements({
@XmlElement(required = false, name = "artixDS", type = ArtixDSDataFormat.class),
+ @XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
@XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
@XmlElement(required = false, name = "serialization", type = SerializationDataFormat.class),
@XmlElement(required = false, name = "string", type = StringDataFormat.class),
Copied: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java (from r597315, activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java)
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java?p2=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java&p1=activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java&r1=597315&r2=598226&rev=598226&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/JaxbDataFormat.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java Mon Nov 26 03:15:32 2007
@@ -26,48 +26,17 @@
import org.apache.camel.spi.DataFormat;
/**
- * Represents the JAXB2 XML {@link DataFormat}
+ * Represents a CSV (Comma Separated Values) {@link DataFormat}
*
* @version $Revision: 1.1 $
*/
-@XmlRootElement(name = "jaxb")
+@XmlRootElement(name = "csv")
@XmlAccessorType(XmlAccessType.FIELD)
-public class JaxbDataFormat extends DataFormatType {
- @XmlAttribute(required = true)
- private String contextPath;
- @XmlAttribute(required = false)
- private Boolean prettyPrint;
+public class CsvDataFormat extends DataFormatType {
- public JaxbDataFormat() {
- super("org.apache.camel.converter.jaxb.JaxbDataFormat");
+ public CsvDataFormat() {
+ super("org.apache.camel.dataformat.csv.CsvDataFormat");
}
- public JaxbDataFormat(boolean prettyPrint) {
- this();
- setPrettyPrint(prettyPrint);
- }
-
- public String getContextPath() {
- return contextPath;
- }
-
- public void setContextPath(String contextPath) {
- this.contextPath = contextPath;
- }
- public Boolean getPrettyPrint() {
- return prettyPrint;
- }
-
- public void setPrettyPrint(Boolean prettyPrint) {
- this.prettyPrint = prettyPrint;
- }
-
- @Override
- protected void configureDataFormat(DataFormat dataFormat) {
- if (ObjectConverter.toBool(getPrettyPrint())) {
- setProperty(dataFormat, "prettyPrint", Boolean.TRUE);
- }
- setProperty(dataFormat, "contextPath", contextPath);
- }
}
Modified: activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index?rev=598226&r1=598225&r2=598226&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index (original)
+++ activemq/camel/trunk/camel-core/src/main/resources/org/apache/camel/model/dataformat/jaxb.index Mon Nov 26 03:15:32 2007
@@ -16,6 +16,7 @@
## ------------------------------------------------------------------------
ArtixDSContentType
ArtixDSDataFormat
+CsvDataFormat
DataFormatType
JaxbDataFormat
SerializationDataFormat
Added: activemq/camel/trunk/components/camel-csv/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-csv/pom.xml?rev=598226&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-csv/pom.xml (added)
+++ activemq/camel/trunk/components/camel-csv/pom.xml Mon Nov 26 03:15:32 2007
@@ -0,0 +1,106 @@
+<?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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-csv</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: CSV</name>
+ <description>Camel CSV support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.dataformat.csv*</camel.osgi.export.pkg>
+ </properties>
+
+ <repositories>
+ <!-- TODO we can remove this when the commons-csv release syncs to the main repo -->
+ <repository>
+ <id>open.iona.m2</id>
+ <name>IONA Open Source Community Release Repository</name>
+ <url>http://repo.open.iona.com/maven2</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-csv</artifactId>
+ <version>1.0.0-fuse</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <excludes>
+ <exclude>**/FooTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: activemq/camel/trunk/components/camel-csv/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java?rev=598226&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java (added)
+++ activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java Mon Nov 26 03:15:32 2007
@@ -0,0 +1,107 @@
+/**
+ *
+ * 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.csv;
+
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.spi.DataFormat;
+import org.apache.camel.util.ExchangeHelper;
+import org.apache.commons.csv.CSVParser;
+import org.apache.commons.csv.CSVStrategy;
+import org.apache.commons.csv.writer.CSVConfig;
+import org.apache.commons.csv.writer.CSVField;
+import org.apache.commons.csv.writer.CSVWriter;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class CsvDataFormat implements DataFormat {
+ private CSVStrategy strategy = CSVStrategy.DEFAULT_STRATEGY;
+ private CSVConfig config = new CSVConfig();
+
+ public void marshal(Exchange exchange, Object object, OutputStream outputStream) throws Exception {
+ OutputStreamWriter out = new OutputStreamWriter(outputStream);
+ Map map = ExchangeHelper.convertToMandatoryType(exchange, Map.class, object);
+ CSVConfig conf = createConfig();
+ // lets add fields
+ Set set = map.keySet();
+ for (Object value : set) {
+ if (value != null) {
+ String text = value.toString();
+ CSVField field = new CSVField(text);
+ conf.addField(field);
+ }
+ }
+ CSVWriter writer = new CSVWriter(conf);
+ writer.setWriter(out);
+ writer.writeRecord(map);
+ out.close();
+ }
+
+ public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
+ CSVParser parser = new CSVParser(new InputStreamReader(inputStream), getStrategy());
+ List<List<String>> list = new ArrayList<List<String>>();
+ while (true) {
+ String[] strings = parser.getLine();
+ if (strings == null) {
+ break;
+ }
+ List<String> line = Arrays.asList(strings);
+ list.add(line);
+ }
+ if (list.size() == 1) {
+ return list.get(0);
+ }
+ else {
+ return list;
+ }
+ }
+
+ public CSVConfig getConfig() {
+ if (config == null) {
+ config = createConfig();
+ }
+ return config;
+ }
+
+ public void setConfig(CSVConfig config) {
+ this.config = config;
+ }
+
+ public CSVStrategy getStrategy() {
+ return strategy;
+ }
+
+ public void setStrategy(CSVStrategy strategy) {
+ this.strategy = strategy;
+ }
+
+ protected CSVConfig createConfig() {
+ return new CSVConfig();
+ }
+}
Propchange: activemq/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java?rev=598226&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java (added)
+++ activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java Mon Nov 26 03:15:32 2007
@@ -0,0 +1,66 @@
+/**
+ *
+ * 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.csv;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.ObjectHelper;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class CsvRouteTest extends ContextTestSupport {
+ private static final transient Log LOG = LogFactory.getLog(CsvRouteTest.class);
+
+ public void testSendMessage() throws Exception {
+ MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
+ resultEndpoint.expectedMessageCount(1);
+
+ Map body = new HashMap();
+ body.put("foo", "abc");
+ body.put("bar", 123);
+ template.sendBody("direct:start", body);
+
+ resultEndpoint.assertIsSatisfied();
+ List<Exchange> list = resultEndpoint.getReceivedExchanges();
+ for (Exchange exchange : list) {
+ Message in = exchange.getIn();
+ String text = in.getBody(String.class);
+ log.debug("Received: " + text);
+ }
+ }
+
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:start").
+ marshal().csv().
+ to("mock:result");
+ }
+ };
+ }
+}
Propchange: activemq/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-csv/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-csv/src/test/resources/log4j.properties?rev=598226&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-csv/src/test/resources/log4j.properties (added)
+++ activemq/camel/trunk/components/camel-csv/src/test/resources/log4j.properties Mon Nov 26 03:15:32 2007
@@ -0,0 +1,53 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+## ---------------------------------------------------------------------------
+## 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
+
+# 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-test.log
+log4j.appender.out.append=true
+
Propchange: activemq/camel/trunk/components/camel-csv/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-supercsv/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-supercsv/pom.xml?rev=598226&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-supercsv/pom.xml (added)
+++ activemq/camel/trunk/components/camel-supercsv/pom.xml Mon Nov 26 03:15:32 2007
@@ -0,0 +1,92 @@
+<?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.
+-->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-parent</artifactId>
+ <version>1.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>camel-supercsv</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: SuperCSV</name>
+ <description>Camel SuperCSV support</description>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.dataformat.supercsv*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.supercsv</groupId>
+ <artifactId>supercsv</artifactId>
+ <version>1.20</version>
+ </dependency>
+
+ <!-- testing -->
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <childDelegation>false</childDelegation>
+ <useFile>true</useFile>
+ <excludes>
+ <exclude>**/FooTest.*</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: activemq/camel/trunk/components/camel-supercsv/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/camel/dataformat/supercsv/CsvDataFormat.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/camel/dataformat/supercsv/CsvDataFormat.java?rev=598226&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/camel/dataformat/supercsv/CsvDataFormat.java (added)
+++ activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/camel/dataformat/supercsv/CsvDataFormat.java Mon Nov 26 03:15:32 2007
@@ -0,0 +1,111 @@
+/**
+ *
+ * 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.supercsv;
+
+import java.beans.PropertyDescriptor;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.spi.DataFormat;
+import org.springframework.beans.BeanUtils;
+import org.supercsv.io.CsvBeanWriter;
+import org.supercsv.io.CsvMapReader;
+import org.supercsv.io.CsvMapWriter;
+import org.supercsv.io.ICsvBeanWriter;
+import org.supercsv.io.ICsvMapReader;
+import org.supercsv.io.ICsvMapWriter;
+import org.supercsv.prefs.CsvPreference;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class CsvDataFormat implements DataFormat {
+ private CsvPreference preference = CsvPreference.STANDARD_PREFERENCE;
+
+ public void marshal(Exchange exchange, Object object, OutputStream outputStream) throws Exception {
+ OutputStreamWriter out = new OutputStreamWriter(outputStream);
+ if (object instanceof Map) {
+ ICsvMapWriter writer = new CsvMapWriter(out, preference);
+ Map<String, ? extends Object> map = (Map<String, ? extends Object>) object;
+
+ Set<String> keys = map.keySet();
+ String[] headers = new String[keys.size()];
+ keys.toArray(headers);
+ writer.writeHeader(headers);
+ writer.write(map, headers);
+ }
+ else if (object != null) {
+ ICsvBeanWriter writer = new CsvBeanWriter(out, preference);
+ PropertyDescriptor[] properties = BeanUtils.getPropertyDescriptors(object.getClass());
+ int size = properties.length;
+ String[] headers = new String[size];
+ for (int i = 0; i < size; i++) {
+ headers[i] = properties[i].getName();
+ }
+ writer.writeHeader(headers);
+ writer.write(object, headers);
+ }
+ out.close();
+ }
+
+ public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
+ ICsvMapReader reader = new CsvMapReader(new InputStreamReader(inputStream), preference);
+ String[] headers = reader.getCSVHeader(true);
+ List<Map<String, String>> list = new ArrayList<Map<String, String>>();
+ try {
+ while (true) {
+ Map<String, String> map = reader.read(headers);
+ if (map == null) {
+ break;
+ }
+ else {
+ list.add(map);
+ }
+ }
+ }
+ catch (EOFException e) {
+ // ignore exception
+ }
+ catch (IOException e) {
+ throw e;
+ }
+ if (list.size() == 1) {
+ return list.get(0);
+ }
+ else {
+ return list;
+ }
+ }
+
+ public CsvPreference getPreference() {
+ return preference;
+ }
+
+ public void setPreference(CsvPreference preference) {
+ this.preference = preference;
+ }
+}
Propchange: activemq/camel/trunk/components/camel-supercsv/src/main/java/org/apache/camel/dataformat/supercsv/CsvDataFormat.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/camel/dataformat/supercsv/CsvRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/camel/dataformat/supercsv/CsvRouteTest.java?rev=598226&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/camel/dataformat/supercsv/CsvRouteTest.java (added)
+++ activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/camel/dataformat/supercsv/CsvRouteTest.java Mon Nov 26 03:15:32 2007
@@ -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.supercsv;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.util.ObjectHelper;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class CsvRouteTest extends ContextTestSupport {
+ public void testSendMessage() throws Exception {
+ MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
+ resultEndpoint.expectedMessageCount(1);
+
+ Map body = new HashMap();
+ body.put("foo", "abc");
+ body.put("bar", 123);
+ template.sendBody("direct:start", body);
+
+ resultEndpoint.assertIsSatisfied();
+ List<Exchange> list = resultEndpoint.getReceivedExchanges();
+ for (Exchange exchange : list) {
+ Message in = exchange.getIn();
+ Object value = in.getBody();
+ System.out.println("Body is: " + value + " of type: " + ObjectHelper.className(value));
+ String text = in.getBody(String.class);
+ System.out.println("Received: " + text);
+ }
+ }
+
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("direct:start").
+ marshal().csv().
+ to("mock:result");
+ }
+ };
+ }
+}
Propchange: activemq/camel/trunk/components/camel-supercsv/src/test/java/org/apache/camel/dataformat/supercsv/CsvRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: activemq/camel/trunk/components/camel-supercsv/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-supercsv/src/test/resources/log4j.properties?rev=598226&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-supercsv/src/test/resources/log4j.properties (added)
+++ activemq/camel/trunk/components/camel-supercsv/src/test/resources/log4j.properties Mon Nov 26 03:15:32 2007
@@ -0,0 +1,53 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+## ---------------------------------------------------------------------------
+## 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
+
+# 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-test.log
+log4j.appender.out.append=true
+
Propchange: activemq/camel/trunk/components/camel-supercsv/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/components/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/pom.xml?rev=598226&r1=598225&r2=598226&view=diff
==============================================================================
--- activemq/camel/trunk/components/pom.xml (original)
+++ activemq/camel/trunk/components/pom.xml Mon Nov 26 03:15:32 2007
@@ -37,6 +37,7 @@
<module>camel-amqp</module>
<module>camel-atom</module>
<module>camel-bam</module>
+ <module>camel-csv</module>
<module>camel-cxf</module>
<module>camel-ftp</module>
<module>camel-groovy</module>
@@ -64,6 +65,7 @@
<module>camel-script</module>
<module>camel-spring</module>
<module>camel-stringtemplate</module>
+ <!--<module>camel-supercsv</module>-->
<module>camel-velocity</module>
<module>camel-xmlbeans</module>
<module>camel-xmpp</module>
Modified: activemq/camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/pom.xml?rev=598226&r1=598225&r2=598226&view=diff
==============================================================================
--- activemq/camel/trunk/pom.xml (original)
+++ activemq/camel/trunk/pom.xml Mon Nov 26 03:15:32 2007
@@ -211,6 +211,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-csv</artifactId>
+ <version>${camel-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-cxf</artifactId>
<version>${camel-version}</version>
<exclusions>