svn commit: r1301660 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/model/dataformat/ components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/ components/camel-csv/src/test/resources/org/apache/camel/dataforma...

[bvahdat]

Author: bvahdat
Date: Fri Mar 16 17:32:39 2012
New Revision: 1301660

URL: http://svn.apache.org/viewvc?rev=1301660&view=rev
Log:
Merged revisions 1301656 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1301656 | bvahdat | 2012-03-16 18:18:44 +0100 (Fr, 16 Mrz 2012) | 1 line
  
  CAMEL-5100: Add option autogenColumns to csv data format in XML DSL.
........

Added:
    
camel/branches/camel-2.9.x/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java
      - copied unchanged from r1301656, 
camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest.java
    
camel/branches/camel-2.9.x/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest-context.xml
      - copied unchanged from r1301656, 
camel/trunk/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringTest-context.xml
Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 16 17:32:39 2012
@@ -1 +1 @@
-/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399,1300720-1300722,1300805,1300826,1300831,1300959,1301376,1301394,1301571,1301631
+/camel/trunk:1243046,1243057,1243234,1244518,1244644,1244859,1244861,1244864,1244870,1244872,1245021,1291555,1291727,1291848,1291864,1292114,1292384,1292725,1292760,1292767,1293079,1293268,1293288,1293330,1293590,1293828,1293852,1293855,1294130,1294482,1294502,1294533,1294588,1294639,1294709,1294909,1294976,1295073,1295108,1295120,1296653,1296790,1298125,1298155,1298447,1298795,1298821,1298993,1299383,1299399,1300720-1300722,1300805,1300826,1300831,1300959,1301376,1301394,1301571,1301631,1301656

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java?rev=1301660&r1=1301659&r2=1301660&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java
 Fri Mar 16 17:32:39 2012
@@ -33,17 +33,27 @@ import org.apache.camel.spi.DataFormat;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class CsvDataFormat extends DataFormatDefinition {
     @XmlAttribute
+    private Boolean autogenColumns;
+    @XmlAttribute
     private String delimiter;
 
     public CsvDataFormat() {
         super("csv");
     }
-    
+
     public CsvDataFormat(String delimiter) {
         this();
         setDelimiter(delimiter);
     }
 
+    public boolean isAutogenColumns() {
+        return autogenColumns;
+    }
+
+    public void setAutogenColumns(boolean autogenColumns) {
+        this.autogenColumns = autogenColumns;
+    }
+
     public String getDelimiter() {
         return delimiter;
     }
@@ -51,15 +61,20 @@ public class CsvDataFormat extends DataF
     public void setDelimiter(String delimiter) {
         this.delimiter = delimiter;
     }
-    
+
     @Override
     protected void configureDataFormat(DataFormat dataFormat) {
+        if (autogenColumns != null) {
+            setProperty(dataFormat, "autogenColumns", autogenColumns);
+        }
+
         if (delimiter != null) {
             if (delimiter.length() > 1) {
                 throw new IllegalArgumentException("Delimiter must have a 
length of one!");
             }
             setProperty(dataFormat, "delimiter", delimiter);
-        } else { // the default delimiter is ','
+        } else {
+            // the default delimiter is ','
             setProperty(dataFormat, "delimiter", ",");
         }
     }