Author: akarpe
Date: Thu Jan 20 17:55:21 2011
New Revision: 1061420
URL: http://svn.apache.org/viewvc?rev=1061420&view=rev
Log:
CAMEL-3562 BindyFixedLengthDataFormat does a trim on Fixed Length record
Added:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java
(with props)
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest-context.xml
(with props)
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest-context.xml
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest-context.xml
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java?rev=1061420&r1=1061419&r2=1061420&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
Thu Jan 20 17:55:21 2011
@@ -61,6 +61,7 @@ public class BindyFixedLengthFactory ext
private boolean hasFooter;
private char paddingChar;
private int recordLength;
+ private boolean trimRecordOnUnmarshal;
public BindyFixedLengthFactory(PackageScanClassResolver resolver,
String... packageNames) throws Exception {
super(resolver, packageNames);
@@ -459,6 +460,17 @@ public class BindyFixedLengthFactory ext
LOG.debug("Length of the record : " + recordLength);
}
+ // Get length of the record
+ recordLength = record.length();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Length of the record : " + recordLength);
+ }
+
+ // Get trimRecord parameter
+ trimRecordOnUnmarshal = record.trimRecordOnUnmarshal();
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Trim record : " + trimRecordOnUnmarshal);
+ }
}
}
}
@@ -494,4 +506,14 @@ public class BindyFixedLengthFactory ext
return recordLength;
}
+ /**
+ * Flag indicating whether the fixed length record should be trimmed
+ *
+ * @return boolean
+ */
+
+ public boolean isTrimRecordOnUnmarshal() {
+ return trimRecordOnUnmarshal;
+ }
+
}
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java?rev=1061420&r1=1061419&r2=1061420&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/annotation/FixedLengthRecord.java
Thu Jan 20 17:55:21 2011
@@ -59,5 +59,7 @@ public @interface FixedLengthRecord {
boolean hasHeader() default false;
boolean hasFooter() default false;
+
+ boolean trimRecordOnUnmarshal() default true;
}
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java?rev=1061420&r1=1061419&r2=1061420&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
(original)
+++
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
Thu Jan 20 17:55:21 2011
@@ -115,9 +115,14 @@ public class BindyFixedLengthDataFormat
// TODO Test if we have a Footer (containing by example checksum)
while (scanner.hasNextLine()) {
-
+ String line;
+
// Read the line
- String line = scanner.nextLine().trim();
+ if (factory.isTrimRecordOnUnmarshal()) {
+ line = scanner.nextLine().trim();
+ } else {
+ line = scanner.nextLine();
+ }
if (ObjectHelper.isEmpty(line)) {
// skip if line is empty
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest.java?rev=1061420&r1=1061419&r2=1061420&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest.java
Thu Jan 20 17:55:21 2011
@@ -1,215 +0,0 @@
-/**
- * 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.bindy.fixed.unmarshall.simple;
-
-import java.math.BigDecimal;
-import java.util.Date;
-
-import org.apache.camel.EndpointInject;
-import org.apache.camel.Produce;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
-import org.apache.camel.dataformat.bindy.annotation.DataField;
-import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
-import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
-import
org.apache.camel.dataformat.bindy.fixed.marshall.simple.BindySimpleFixedLengthMarshallTest.Order;
-import org.apache.camel.test.junit4.TestSupport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
-
-import static org.junit.Assert.assertEquals;
-
-@ContextConfiguration
-public class BindySimpleFixedLengthUnmarshallTest extends
AbstractJUnit4SpringContextTests {
-
- private static final transient Log LOG =
LogFactory.getLog(BindySimpleFixedLengthUnmarshallTest.class);
-
- private static final String URI_MOCK_RESULT = "mock:result";
- private static final String URI_MOCK_ERROR = "mock:error";
- private static final String URI_DIRECT_START = "direct:start";
-
- @Produce(uri = URI_DIRECT_START)
- private ProducerTemplate template;
-
- @EndpointInject(uri = URI_MOCK_RESULT)
- private MockEndpoint result;
-
- @EndpointInject(uri = URI_MOCK_ERROR)
- private MockEndpoint error;
-
- private String expected;
-
- @Test
- @DirtiesContext
- public void testUnMarshallMessage() throws Exception {
-
- expected = "10A9 PaulineM
ISINXD12345678BUYShare000002500.45USD01-08-2009";
-
- template.sendBody(expected);
-
- result.expectedMessageCount(1);
- result.assertIsSatisfied();
- }
-
- public static class ContextConfig extends RouteBuilder {
- BindyFixedLengthDataFormat camelDataFormat = new
BindyFixedLengthDataFormat("org.apache.camel.dataformat.bindy.fixed.unmarshall.simple");
-
- public void configure() {
-
from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
- }
-
- }
-
- @FixedLengthRecord(length = 65, paddingChar = ' ')
- public static class Order {
-
- @DataField(pos = 1, length = 2)
- private int orderNr;
-
- @DataField(pos = 3, length = 2)
- private String clientNr;
-
- @DataField(pos = 5, length = 9)
- private String firstName;
-
- @DataField(pos = 14, length = 5, align = "L")
- private String lastName;
-
- @DataField(pos = 19, length = 4)
- private String instrumentCode;
-
- @DataField(pos = 23, length = 10)
- private String instrumentNumber;
-
- @DataField(pos = 33, length = 3)
- private String orderType;
-
- @DataField(pos = 36, length = 5)
- private String instrumentType;
-
- @DataField(pos = 41, precision = 2, length = 12, paddingChar = '0')
- private BigDecimal amount;
-
- @DataField(pos = 53, length = 3)
- private String currency;
-
- @DataField(pos = 56, length = 10, pattern = "dd-MM-yyyy")
- private Date orderDate;
-
- public int getOrderNr() {
- return orderNr;
- }
-
- public void setOrderNr(int orderNr) {
- this.orderNr = orderNr;
- }
-
- public String getClientNr() {
- return clientNr;
- }
-
- public void setClientNr(String clientNr) {
- this.clientNr = clientNr;
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
-
- public String getInstrumentCode() {
- return instrumentCode;
- }
-
- public void setInstrumentCode(String instrumentCode) {
- this.instrumentCode = instrumentCode;
- }
-
- public String getInstrumentNumber() {
- return instrumentNumber;
- }
-
- public void setInstrumentNumber(String instrumentNumber) {
- this.instrumentNumber = instrumentNumber;
- }
-
- public String getOrderType() {
- return orderType;
- }
-
- public void setOrderType(String orderType) {
- this.orderType = orderType;
- }
-
- public String getInstrumentType() {
- return instrumentType;
- }
-
- public void setInstrumentType(String instrumentType) {
- this.instrumentType = instrumentType;
- }
-
- public BigDecimal getAmount() {
- return amount;
- }
-
- public void setAmount(BigDecimal amount) {
- this.amount = amount;
- }
-
- public String getCurrency() {
- return currency;
- }
-
- public void setCurrency(String currency) {
- this.currency = currency;
- }
-
- public Date getOrderDate() {
- return orderDate;
- }
-
- public void setOrderDate(Date orderDate) {
- this.orderDate = orderDate;
- }
-
- @Override
- public String toString() {
- return "Model : " + Order.class.getName() + " : " + this.orderNr +
", " + this.orderType + ", " + String.valueOf(this.amount) + ", " +
this.instrumentCode + ", "
- + this.instrumentNumber + ", " + this.instrumentType + ", "
+ this.currency + ", " + this.clientNr + ", " + this.firstName + ", " +
this.lastName + ", "
- + String.valueOf(this.orderDate);
- }
- }
-
-}
Added:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java?rev=1061420&view=auto
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java
(added)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java
Thu Jan 20 17:55:21 2011
@@ -0,0 +1,215 @@
+/**
+ * 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.bindy.fixed.unmarshall.simple.notrim;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
+import org.apache.camel.dataformat.bindy.annotation.DataField;
+import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
+import org.apache.camel.dataformat.bindy.fixed.BindyFixedLengthDataFormat;
+import
org.apache.camel.dataformat.bindy.fixed.marshall.simple.BindySimpleFixedLengthMarshallTest.Order;
+import org.apache.camel.test.junit4.TestSupport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import
org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+import static org.junit.Assert.assertEquals;
+
+@ContextConfiguration
+public class BindySimpleFixedLengthNoTrimUnmarshallTest extends
AbstractJUnit4SpringContextTests {
+
+ private static final transient Log LOG =
LogFactory.getLog(BindySimpleFixedLengthNoTrimUnmarshallTest.class);
+
+ private static final String URI_MOCK_RESULT = "mock:result";
+ private static final String URI_MOCK_ERROR = "mock:error";
+ private static final String URI_DIRECT_START = "direct:start";
+
+ @Produce(uri = URI_DIRECT_START)
+ private ProducerTemplate template;
+
+ @EndpointInject(uri = URI_MOCK_RESULT)
+ private MockEndpoint result;
+
+ @EndpointInject(uri = URI_MOCK_ERROR)
+ private MockEndpoint error;
+
+ private String expected;
+
+ @Test
+ @DirtiesContext
+ public void testUnMarshallMessage() throws Exception {
+
+ expected = "10A9 PaulineM
ISINXD12345678BUYShare000002500.45USD01-08-2009 ";
+
+ template.sendBody(expected);
+
+ result.expectedMessageCount(1);
+ result.assertIsSatisfied();
+ }
+
+ public static class ContextConfig extends RouteBuilder {
+ BindyFixedLengthDataFormat camelDataFormat = new
BindyFixedLengthDataFormat("org.apache.camel.dataformat.bindy.fixed.unmarshall.simple.notrim");
+
+ public void configure() {
+
from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
+ }
+
+ }
+
+ @FixedLengthRecord(length = 69, paddingChar = ' ', trimRecordOnUnmarshal =
false)
+ public static class Order {
+
+ @DataField(pos = 1, length = 2)
+ private int orderNr;
+
+ @DataField(pos = 3, length = 2)
+ private String clientNr;
+
+ @DataField(pos = 5, length = 9)
+ private String firstName;
+
+ @DataField(pos = 14, length = 5, align = "L")
+ private String lastName;
+
+ @DataField(pos = 19, length = 4)
+ private String instrumentCode;
+
+ @DataField(pos = 23, length = 10)
+ private String instrumentNumber;
+
+ @DataField(pos = 33, length = 3)
+ private String orderType;
+
+ @DataField(pos = 36, length = 5)
+ private String instrumentType;
+
+ @DataField(pos = 41, precision = 2, length = 12, paddingChar = '0')
+ private BigDecimal amount;
+
+ @DataField(pos = 53, length = 3)
+ private String currency;
+
+ @DataField(pos = 56, length = 10, pattern = "dd-MM-yyyy")
+ private Date orderDate;
+
+ public int getOrderNr() {
+ return orderNr;
+ }
+
+ public void setOrderNr(int orderNr) {
+ this.orderNr = orderNr;
+ }
+
+ public String getClientNr() {
+ return clientNr;
+ }
+
+ public void setClientNr(String clientNr) {
+ this.clientNr = clientNr;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public String getInstrumentCode() {
+ return instrumentCode;
+ }
+
+ public void setInstrumentCode(String instrumentCode) {
+ this.instrumentCode = instrumentCode;
+ }
+
+ public String getInstrumentNumber() {
+ return instrumentNumber;
+ }
+
+ public void setInstrumentNumber(String instrumentNumber) {
+ this.instrumentNumber = instrumentNumber;
+ }
+
+ public String getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(String orderType) {
+ this.orderType = orderType;
+ }
+
+ public String getInstrumentType() {
+ return instrumentType;
+ }
+
+ public void setInstrumentType(String instrumentType) {
+ this.instrumentType = instrumentType;
+ }
+
+ public BigDecimal getAmount() {
+ return amount;
+ }
+
+ public void setAmount(BigDecimal amount) {
+ this.amount = amount;
+ }
+
+ public String getCurrency() {
+ return currency;
+ }
+
+ public void setCurrency(String currency) {
+ this.currency = currency;
+ }
+
+ public Date getOrderDate() {
+ return orderDate;
+ }
+
+ public void setOrderDate(Date orderDate) {
+ this.orderDate = orderDate;
+ }
+
+ @Override
+ public String toString() {
+ return "Model : " + Order.class.getName() + " : " + this.orderNr +
", " + this.orderType + ", " + String.valueOf(this.amount) + ", " +
this.instrumentCode + ", "
+ + this.instrumentNumber + ", " + this.instrumentType + ", "
+ this.currency + ", " + this.clientNr + ", " + this.firstName + ", " +
this.lastName + ", "
+ + String.valueOf(this.orderDate);
+ }
+ }
+
+}
Propchange:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java?rev=1061420&r1=1061419&r2=1061420&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
(original)
+++
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest.java
Thu Jan 20 17:55:21 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dataformat.bindy.fixed.unmarshall.simple;
+package org.apache.camel.dataformat.bindy.fixed.unmarshall.simple.trim;
import java.math.BigDecimal;
import java.util.Date;
@@ -72,7 +72,7 @@ public class BindySimpleFixedLengthUnmar
}
public static class ContextConfig extends RouteBuilder {
- BindyFixedLengthDataFormat camelDataFormat = new
BindyFixedLengthDataFormat("org.apache.camel.dataformat.bindy.fixed.unmarshall.simple");
+ BindyFixedLengthDataFormat camelDataFormat = new
BindyFixedLengthDataFormat("org.apache.camel.dataformat.bindy.fixed.unmarshall.simple.trim");
public void configure() {
from(URI_DIRECT_START).unmarshal(camelDataFormat).to(URI_MOCK_RESULT);
Modified:
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest-context.xml?rev=1061420&r1=1061419&r2=1061420&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest-context.xml
(original)
+++
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/BindySimpleFixedLengthUnmarshallTest-context.xml
Thu Jan 20 17:55:21 2011
@@ -1,32 +0,0 @@
-<?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 xmlns="http://camel.apache.org/schema/spring";>
- <routeBuilder ref="myBuilder" />
- </camelContext>
-
- <bean id="myBuilder"
class="org.apache.camel.dataformat.bindy.fixed.unmarshall.simple.BindySimpleFixedLengthUnmarshallTest$ContextConfig"/>
-
-</beans>
\ No newline at end of file
Added:
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest-context.xml?rev=1061420&view=auto
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest-context.xml
(added)
+++
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest-context.xml
Thu Jan 20 17:55:21 2011
@@ -0,0 +1,32 @@
+<?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 xmlns="http://camel.apache.org/schema/spring";>
+ <routeBuilder ref="myBuilder" />
+ </camelContext>
+
+ <bean id="myBuilder"
class="org.apache.camel.dataformat.bindy.fixed.unmarshall.simple.notrim.BindySimpleFixedLengthNoTrimUnmarshallTest$ContextConfig"/>
+
+</beans>
\ No newline at end of file
Propchange:
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/notrim/BindySimpleFixedLengthNoTrimUnmarshallTest-context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest-context.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest-context.xml?rev=1061420&r1=1061419&r2=1061420&view=diff
==============================================================================
---
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest-context.xml
(original)
+++
camel/trunk/components/camel-bindy/src/test/resources/org/apache/camel/dataformat/bindy/fixed/unmarshall/simple/trim/BindySimpleFixedLengthUnmarshallTest-context.xml
Thu Jan 20 17:55:21 2011
@@ -27,6 +27,6 @@
<routeBuilder ref="myBuilder" />
</camelContext>
- <bean id="myBuilder"
class="org.apache.camel.dataformat.bindy.fixed.unmarshall.simple.BindySimpleFixedLengthUnmarshallTest$ContextConfig"/>
+ <bean id="myBuilder"
class="org.apache.camel.dataformat.bindy.fixed.unmarshall.simple.trim.BindySimpleFixedLengthUnmarshallTest$ContextConfig"/>
-</beans>
\ No newline at end of file
+</beans>
