You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2011/09/19 23:29:05 UTC
svn commit: r1172844 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/model/dataformat/
components/camel-bindy/src/main/resources/META-INF/services/org/apache/camel/dataformat/
components/camel-bindy/src/test/java/org/apac...
Author: dkulp
Date: Mon Sep 19 21:29:05 2011
New Revision: 1172844
URL: http://svn.apache.org/viewvc?rev=1172844&view=rev
Log:
Merged revisions 1160552 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1160552 | davsclaus | 2011-08-23 01:37:15 -0400 (Tue, 23 Aug 2011) | 1 line
CAMEL-4369: Added missing BindyType.Fixed so using fixed length bindy in java dsl is easier.
........
Added:
camel/branches/camel-2.8.x/components/camel-bindy/src/main/resources/META-INF/services/org/apache/camel/dataformat/bindy-fixed
- copied unchanged from r1160552, camel/trunk/components/camel-bindy/src/main/resources/META-INF/services/org/apache/camel/dataformat/bindy-fixed
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java
camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java?rev=1172844&r1=1172843&r2=1172844&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyDataFormat.java Mon Sep 19 21:29:05 2011
@@ -70,6 +70,8 @@ public class BindyDataFormat extends Dat
protected DataFormat createDataFormat(RouteContext routeContext) {
if (type == BindyType.Csv) {
setDataFormatName("bindy-csv");
+ } else if (type == BindyType.Fixed) {
+ setDataFormatName("bindy-fixed");
} else {
setDataFormatName("bindy-kvp");
}
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java?rev=1172844&r1=1172843&r2=1172844&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/dataformat/BindyType.java Mon Sep 19 21:29:05 2011
@@ -28,5 +28,5 @@ import javax.xml.bind.annotation.XmlType
@XmlEnum(String.class)
public enum BindyType {
- Csv, KeyValue
+ Csv, Fixed, KeyValue
}
Modified: camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java?rev=1172844&r1=1172843&r2=1172844&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallTest.java Mon Sep 19 21:29:05 2011
@@ -35,6 +35,7 @@ import org.apache.camel.dataformat.bindy
import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
import org.apache.camel.dataformat.bindy.model.simple.oneclass.Order;
+import org.apache.camel.model.dataformat.BindyType;
import org.apache.camel.processor.interceptor.Tracer;
import org.junit.Test;
import org.springframework.test.annotation.DirtiesContext;
@@ -98,8 +99,6 @@ public class BindySimpleFixedLengthMarsh
}
public static class ContextConfig extends RouteBuilder {
- BindyFixedLengthDataFormat camelDataFormat = new BindyFixedLengthDataFormat("org.apache.camel.dataformat.bindy.fixed.marshall.simple");
-
public void configure() {
Tracer tracer = new Tracer();
@@ -113,7 +112,9 @@ public class BindySimpleFixedLengthMarsh
onException(Exception.class).maximumRedeliveries(0).handled(true);
- from(URI_DIRECT_START).marshal(camelDataFormat).to(URI_MOCK_RESULT);
+ from(URI_DIRECT_START)
+ .marshal().bindy(BindyType.Fixed, "org.apache.camel.dataformat.bindy.fixed.marshall.simple")
+ .to(URI_MOCK_RESULT);
}
}