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/12/22 22:08:37 UTC
svn commit: r1222454 [3/4] - in /camel/branches/camel-2.8.x:
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/builder/xml/
camel-core/src/main/java/org/apache/camel/...
Modified: camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.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/BindySimpleFixedLengthMarshallWithClipTest.java?rev=1222454&r1=1222453&r2=1222454&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java Thu Dec 22 21:08:26 2011
@@ -1,223 +1,223 @@
-/**
- * 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.marshall.simple;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.builder.RouteBuilder;
-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.test.CamelTestSupport;
-import org.junit.Test;
-
-public class BindySimpleFixedLengthMarshallWithClipTest extends CamelTestSupport {
-
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- BindyFixedLengthDataFormat bindy = new BindyFixedLengthDataFormat("org.apache.camel.dataformat.bindy.fixed.marshall.simple");
-
- from("direct:start")
- .marshal(bindy)
- .to("mock:result");
- }
- };
- }
-
- @Test
- public void testMarshallMessage() throws Exception {
- String expected = "10A9Madame deM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n";
- getMockEndpoint("mock:result").expectedBodiesReceived(expected);
-
- template.sendBody("direct:start", generateModel());
-
- assertMockEndpointsSatisfied();
- }
-
- public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
-
- Order order = new Order();
- order.setOrderNr(10);
- order.setOrderType("BUY");
- order.setClientNr("A98");
- order.setFirstName("Madame de Sol");
- order.setLastName("M");
- order.setAmount(new BigDecimal("2500.45"));
- order.setInstrumentCode("ISIN");
- order.setInstrumentNumber("XD12345678");
- order.setInstrumentType("Share");
- order.setCurrency("USD");
-
- Calendar calendar = new GregorianCalendar();
- calendar.set(2009, 7, 1);
- order.setOrderDate(calendar.getTime());
-
- modelObjects.put(order.getClass().getName(), order);
-
- models.add(modelObjects);
-
- return models;
- }
-
- @FixedLengthRecord(length = 65, paddingChar = ' ')
- public static class Order {
-
- @DataField(pos = 1, length = 2)
- private int orderNr;
-
- @DataField(pos = 3, length = 2, clip = true)
- private String clientNr;
-
- @DataField(pos = 5, length = 9, clip = true)
- 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);
- }
- }
-
-
-}
+/**
+ * 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.marshall.simple;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.builder.RouteBuilder;
+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.test.CamelTestSupport;
+import org.junit.Test;
+
+public class BindySimpleFixedLengthMarshallWithClipTest extends CamelTestSupport {
+
+ private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ BindyFixedLengthDataFormat bindy = new BindyFixedLengthDataFormat("org.apache.camel.dataformat.bindy.fixed.marshall.simple");
+
+ from("direct:start")
+ .marshal(bindy)
+ .to("mock:result");
+ }
+ };
+ }
+
+ @Test
+ public void testMarshallMessage() throws Exception {
+ String expected = "10A9Madame deM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n";
+ getMockEndpoint("mock:result").expectedBodiesReceived(expected);
+
+ template.sendBody("direct:start", generateModel());
+
+ assertMockEndpointsSatisfied();
+ }
+
+ public List<Map<String, Object>> generateModel() {
+ Map<String, Object> modelObjects = new HashMap<String, Object>();
+
+ Order order = new Order();
+ order.setOrderNr(10);
+ order.setOrderType("BUY");
+ order.setClientNr("A98");
+ order.setFirstName("Madame de Sol");
+ order.setLastName("M");
+ order.setAmount(new BigDecimal("2500.45"));
+ order.setInstrumentCode("ISIN");
+ order.setInstrumentNumber("XD12345678");
+ order.setInstrumentType("Share");
+ order.setCurrency("USD");
+
+ Calendar calendar = new GregorianCalendar();
+ calendar.set(2009, 7, 1);
+ order.setOrderDate(calendar.getTime());
+
+ modelObjects.put(order.getClass().getName(), order);
+
+ models.add(modelObjects);
+
+ return models;
+ }
+
+ @FixedLengthRecord(length = 65, paddingChar = ' ')
+ public static class Order {
+
+ @DataField(pos = 1, length = 2)
+ private int orderNr;
+
+ @DataField(pos = 3, length = 2, clip = true)
+ private String clientNr;
+
+ @DataField(pos = 5, length = 9, clip = true)
+ 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/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithClipTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.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/BindySimpleFixedLengthMarshallWithNoClipTest.java?rev=1222454&r1=1222453&r2=1222454&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java Thu Dec 22 21:08:26 2011
@@ -1,225 +1,225 @@
-/**
- * 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.marshall.simple;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.CamelExecutionException;
-import org.apache.camel.builder.RouteBuilder;
-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.test.CamelTestSupport;
-import org.junit.Test;
-
-public class BindySimpleFixedLengthMarshallWithNoClipTest extends CamelTestSupport {
-
- private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
-
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- BindyFixedLengthDataFormat bindy = new BindyFixedLengthDataFormat("org.apache.camel.dataformat.bindy.fixed.marshall.simple");
-
- from("direct:start")
- .marshal(bindy)
- .to("mock:result");
- }
- };
- }
-
- @Test
- public void testMarshallMessage() throws Exception {
- try {
- template.sendBody("direct:start", generateModel());
- fail("Should have thrown an exception");
- } catch (CamelExecutionException e) {
- IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
- assertEquals("Length for the firstName must not be larger than allowed, was: 13, allowed: 9", cause.getMessage());
- }
- }
-
- public List<Map<String, Object>> generateModel() {
- Map<String, Object> modelObjects = new HashMap<String, Object>();
-
- Order order = new Order();
- order.setOrderNr(10);
- order.setOrderType("BUY");
- order.setClientNr("A98");
- order.setFirstName("Madame de Sol");
- order.setLastName("M");
- order.setAmount(new BigDecimal("2500.45"));
- order.setInstrumentCode("ISIN");
- order.setInstrumentNumber("XD12345678");
- order.setInstrumentType("Share");
- order.setCurrency("USD");
-
- Calendar calendar = new GregorianCalendar();
- calendar.set(2009, 7, 1);
- order.setOrderDate(calendar.getTime());
-
- modelObjects.put(order.getClass().getName(), order);
-
- models.add(modelObjects);
-
- return models;
- }
-
- @FixedLengthRecord(length = 65, paddingChar = ' ')
- public static class Order {
-
- @DataField(pos = 1, length = 2)
- private int orderNr;
-
- @DataField(pos = 3, length = 2, clip = true)
- 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);
- }
- }
-
-
-}
+/**
+ * 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.marshall.simple;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.builder.RouteBuilder;
+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.test.CamelTestSupport;
+import org.junit.Test;
+
+public class BindySimpleFixedLengthMarshallWithNoClipTest extends CamelTestSupport {
+
+ private List<Map<String, Object>> models = new ArrayList<Map<String, Object>>();
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ BindyFixedLengthDataFormat bindy = new BindyFixedLengthDataFormat("org.apache.camel.dataformat.bindy.fixed.marshall.simple");
+
+ from("direct:start")
+ .marshal(bindy)
+ .to("mock:result");
+ }
+ };
+ }
+
+ @Test
+ public void testMarshallMessage() throws Exception {
+ try {
+ template.sendBody("direct:start", generateModel());
+ fail("Should have thrown an exception");
+ } catch (CamelExecutionException e) {
+ IllegalArgumentException cause = assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+ assertEquals("Length for the firstName must not be larger than allowed, was: 13, allowed: 9", cause.getMessage());
+ }
+ }
+
+ public List<Map<String, Object>> generateModel() {
+ Map<String, Object> modelObjects = new HashMap<String, Object>();
+
+ Order order = new Order();
+ order.setOrderNr(10);
+ order.setOrderType("BUY");
+ order.setClientNr("A98");
+ order.setFirstName("Madame de Sol");
+ order.setLastName("M");
+ order.setAmount(new BigDecimal("2500.45"));
+ order.setInstrumentCode("ISIN");
+ order.setInstrumentNumber("XD12345678");
+ order.setInstrumentType("Share");
+ order.setCurrency("USD");
+
+ Calendar calendar = new GregorianCalendar();
+ calendar.set(2009, 7, 1);
+ order.setOrderDate(calendar.getTime());
+
+ modelObjects.put(order.getClass().getName(), order);
+
+ models.add(modelObjects);
+
+ return models;
+ }
+
+ @FixedLengthRecord(length = 65, paddingChar = ' ')
+ public static class Order {
+
+ @DataField(pos = 1, length = 2)
+ private int orderNr;
+
+ @DataField(pos = 3, length = 2, clip = true)
+ 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/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthMarshallWithNoClipTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/withoutsection/Order.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/withoutsection/Order.java?rev=1222454&r1=1222453&r2=1222454&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/withoutsection/Order.java (original)
+++ camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/withoutsection/Order.java Thu Dec 22 21:08:26 2011
@@ -1,105 +1,105 @@
-/**
- * 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.model.fix.withoutsection;
-
-import org.apache.camel.dataformat.bindy.annotation.KeyValuePairField;
-import org.apache.camel.dataformat.bindy.annotation.Link;
-import org.apache.camel.dataformat.bindy.annotation.Message;
-
-// No section has been defined
-@Message(keyValuePairSeparator = "=", pairSeparator = "\\u0001", type = "FIX", version = "4.1", isOrdered = true)
-public class Order {
-
- @KeyValuePairField(tag = 1)
- // Client reference
- private String account;
-
- @KeyValuePairField(tag = 11)
- // Order reference
- private String clOrdId;
-
- @KeyValuePairField(tag = 22)
- // Fund ID type (Sedol, ISIN, ...)
- private String iDSource;
-
- @KeyValuePairField(tag = 48)
- // Fund code
- private String securityId;
-
- @KeyValuePairField(tag = 54)
- // Movement type ( 1 = Buy, 2 = sell)
- private String side;
-
- @KeyValuePairField(tag = 58)
- // Free text
- private String text;
-
- public String getAccount() {
- return account;
- }
-
- public void setAccount(String account) {
- this.account = account;
- }
-
- public String getClOrdId() {
- return clOrdId;
- }
-
- public void setClOrdId(String clOrdId) {
- this.clOrdId = clOrdId;
- }
-
- public String getIDSource() {
- return iDSource;
- }
-
- public void setIDSource(String source) {
- this.iDSource = source;
- }
-
- public String getSecurityId() {
- return securityId;
- }
-
- public void setSecurityId(String securityId) {
- this.securityId = securityId;
- }
-
- public String getSide() {
- return side;
- }
-
- public void setSide(String side) {
- this.side = side;
- }
-
- public String getText() {
- return this.text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- @Override
- public String toString() {
- return Order.class.getName() + " --> 1: " + this.account + ", 11: " + this.clOrdId + ", 22: " + this.iDSource
- + ", 48: " + this.securityId + ", 54: " + this.side + ", 58: " + this.text;
- }
-
-}
+/**
+ * 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.model.fix.withoutsection;
+
+import org.apache.camel.dataformat.bindy.annotation.KeyValuePairField;
+import org.apache.camel.dataformat.bindy.annotation.Link;
+import org.apache.camel.dataformat.bindy.annotation.Message;
+
+// No section has been defined
+@Message(keyValuePairSeparator = "=", pairSeparator = "\\u0001", type = "FIX", version = "4.1", isOrdered = true)
+public class Order {
+
+ @KeyValuePairField(tag = 1)
+ // Client reference
+ private String account;
+
+ @KeyValuePairField(tag = 11)
+ // Order reference
+ private String clOrdId;
+
+ @KeyValuePairField(tag = 22)
+ // Fund ID type (Sedol, ISIN, ...)
+ private String iDSource;
+
+ @KeyValuePairField(tag = 48)
+ // Fund code
+ private String securityId;
+
+ @KeyValuePairField(tag = 54)
+ // Movement type ( 1 = Buy, 2 = sell)
+ private String side;
+
+ @KeyValuePairField(tag = 58)
+ // Free text
+ private String text;
+
+ public String getAccount() {
+ return account;
+ }
+
+ public void setAccount(String account) {
+ this.account = account;
+ }
+
+ public String getClOrdId() {
+ return clOrdId;
+ }
+
+ public void setClOrdId(String clOrdId) {
+ this.clOrdId = clOrdId;
+ }
+
+ public String getIDSource() {
+ return iDSource;
+ }
+
+ public void setIDSource(String source) {
+ this.iDSource = source;
+ }
+
+ public String getSecurityId() {
+ return securityId;
+ }
+
+ public void setSecurityId(String securityId) {
+ this.securityId = securityId;
+ }
+
+ public String getSide() {
+ return side;
+ }
+
+ public void setSide(String side) {
+ this.side = side;
+ }
+
+ public String getText() {
+ return this.text;
+ }
+
+ public void setText(String text) {
+ this.text = text;
+ }
+
+ @Override
+ public String toString() {
+ return Order.class.getName() + " --> 1: " + this.account + ", 11: " + this.clOrdId + ", 22: " + this.iDSource
+ + ", 48: " + this.securityId + ", 54: " + this.side + ", 58: " + this.text;
+ }
+
+}
Propchange: camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/fix/withoutsection/Order.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclassandremovewhitespace/Order.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/pipeline/MyData.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/tab/PurchaseOrder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-blueprint/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-cache/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-castor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-cometd/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.project
.pmd
.checkstyle
-.classpath
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-context/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-core-osgi/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-core-xml/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-crypto/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-csv/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.project
.pmd
.checkstyle
-.classpath
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-cxf/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.checkstyle
.pmd
-eclipse-classes
+.checkstyle
+.ruleset
target
+.settings
.classpath
.project
-.settings
-*.i??
-write
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-cxf-transport/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,4 +1,16 @@
+.pmd
+.checkstyle
+.ruleset
+target
+.settings
.classpath
.project
-.settings
-target
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-dns/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-dozer/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-eclipse/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-ejb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-eventadmin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-exec/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-flatpack/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.checkstyle
.pmd
+.checkstyle
+.ruleset
target
-eclipse-classes
+.settings
.classpath
.project
-.settings
-res
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-freemarker/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
-eclipse-classes
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
velocity.log
-*.i??
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-ftp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.checkstyle
.pmd
+.checkstyle
+.ruleset
target
-eclipse-classes
+.settings
.classpath
.project
-.settings
-res
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-gae/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.checkstyle
.pmd
-eclipse-classes
+.checkstyle
+.ruleset
target
+.settings
.classpath
.project
-.settings
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-groovy/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.project
.pmd
.checkstyle
-.classpath
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-guice/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-hawtdb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-hazelcast/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-hdfs/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-hl7/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.checkstyle
.pmd
-eclipse-classes
+.checkstyle
+.ruleset
target
+.settings
.classpath
.project
-.settings
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-http/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-http4/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.checkstyle
.pmd
-eclipse-classes
+.checkstyle
+.ruleset
target
+.settings
.classpath
.project
-.settings
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpConstants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-http4/src/test/data/logo.jpeg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Thu Dec 22 21:08:26 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg
Propchange: camel/branches/camel-2.8.x/components/camel-ibatis/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-irc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-target
.pmd
.checkstyle
-eclipse-classes
+.ruleset
+target
+.settings
.classpath
.project
-.settings
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jackson/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jasypt/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-javaspace/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.checkstyle
.pmd
+.checkstyle
+.ruleset
target
-eclipse-classes
-classes
+.settings
.classpath
.project
-.settings
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jaxb/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-eclipse-classes
.pmd
.checkstyle
+.ruleset
target
+.settings
.classpath
.project
-.settings
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jcr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
.pmd
.checkstyle
-.classpath
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-derby.log
-*.i??
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jdbc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.checkstyle
.pmd
+.checkstyle
+.ruleset
target
-eclipse-classes
+.settings
.classpath
.project
-.settings
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelFilterWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java?rev=1222454&r1=1222453&r2=1222454&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java Thu Dec 22 21:08:26 2011
@@ -1,37 +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.
- */
-package org.apache.camel.component.jetty;
-
-import java.io.IOException;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-/**
- * Please use the CamelFilterWrapper instead of using this classs
- */
-@Deprecated
-class CamelMultipartFilter extends CamelFilterWrapper {
-
- public CamelMultipartFilter(Filter wrapped) {
- super(wrapped);
- }
-
-}
+/**
+ * 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.component.jetty;
+
+import java.io.IOException;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+/**
+ * Please use the CamelFilterWrapper instead of using this classs
+ */
+@Deprecated
+class CamelMultipartFilter extends CamelFilterWrapper {
+
+ public CamelMultipartFilter(Filter wrapped) {
+ super(wrapped);
+ }
+
+}
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/CamelMultipartFilter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/main/java/org/apache/camel/component/jetty/JettyConverter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpBindingRefTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/HttpProducerTwoParametersWithSameKeyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyContinuationDisabledTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEndpointContinuationDisabledTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationDisabledTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncContinuationTimeoutTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/async/JettyAsyncDefaultContinuationTimeoutTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/HttpJavaBodyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/javabody/MyCoolBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/HttpJettyProducerTwoParametersWithSameKeyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerJavaBodyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerSynchronousFalseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/JettyHttpProducerTransferExceptionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/jettyproducer/MyCoolBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/HttpClientProxyTransferExceptionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/MyAppException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/MyCoolService.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/proxy/MyCoolServiceBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jibx/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.project
-.checkstyle
.pmd
-.classpath
+.checkstyle
+.ruleset
target
.settings
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
eclipse-classes
-*.i??
-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jing/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-.project
.pmd
.checkstyle
-.classpath
+.ruleset
target
-eclipse-classes
.settings
-*.i??
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jms/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-eclipse-classes
.pmd
.checkstyle
-.project
-.classpath
+.ruleset
target
.settings
-activemq-data
-*.i??
+.classpath
+.project
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/DefaultJmsMessageListenerContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/SimpleJmsMessageListenerContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/CorrelationListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/ExclusivePersistentQueueMessageListenerContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/main/java/org/apache/camel/component/jms/reply/SharedPersistentQueueMessageListenerContainer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/CamelJmsTestHelper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/FromTextToBytesMessageTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsBatchResequencerJMSPriorityTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsDestinationResolverTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsFilterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyDisableTimeToLiveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToAsHeaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToDisabledTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToNotPreservedTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOnlyWithReplyToTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutDisableTimeToLiveTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutFixedReplyQueueTimeoutUseMessageIDAsCorrelationIDTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsInOutSynchronousFalseTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsLoadBalanceFailoverWithForceSendOriginalJmsMessageTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMessageBodySetNullTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsMultipleConsumersTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyExclusiveReplyToComponentTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyProcessRepliesConcurrentUsingThreadsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplySharedReplyToTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRouteDeliveryModePreserveQoSTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRoutingSlipInOutTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/MyDestinationResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsRoutingSlipInOutTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/SpringJmsXPathHeaderTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/TwoConsumerOnSameTopicTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/activemq/ActiveMQConsumeWildcardQueuesTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/MyAsyncComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/MyAsyncEndpoint.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/async/MyAsyncProducer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/JmsInOutRoutingSlipTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/MyFailureProcessor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/issues/RequestReplyWithProducerIssueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/ISay.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/remoting/SayService.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java?rev=1222454&r1=1222453&r2=1222454&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java (original)
+++ camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java Thu Dec 22 21:08:26 2011
@@ -1,120 +1,120 @@
-/**
- * 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.component.jms.temp;
-
-import junit.framework.Assert;
-
-import org.apache.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.broker.BrokerService;
-import org.apache.camel.Produce;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jms.JmsComponent;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.spring.CamelBeanPostProcessor;
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Test for issue CAMEL-3193. Camel should support reconnects in case of
- * connection loss to jms server. After reconnect Temporary destinations have to
- * be recreated as they may become invalid
- */
-public class JmsReconnectTest {
- public interface MyService {
- String echo(String st);
- }
-
- private final class EchoServiceImpl implements MyService {
- public String echo(String st) {
- return st;
- }
- }
-
- @Produce(uri = "direct:test")
- MyService proxy;
-
- /**
- * This test is disabled as the problem can currently not be reproduced using ActiveMQ.
- * TODO Find a way to recreate the problem with ActiveMQ and fully automate the test
- * @throws Exception
- */
- @Ignore
- @Test
- public void testRequestReply() throws Exception {
- BrokerService broker = new BrokerService();
- broker.addConnector("tcp://localhost:61616");
- broker.setPersistent(false);
- broker.setTimeBeforePurgeTempDestinations(1000);
- broker.start();
-
- DefaultCamelContext context = new DefaultCamelContext();
- JmsComponent jmsComponent = new JmsComponent();
-
- /**
- *
- */
- ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory();
- connectionFactory.setBrokerURL("failover://(tcp://localhost:61616)?maxReconnectAttempts=1");
-
- /**
- * When using Tibco EMS the problem can be recreated. As the broker is
- * external it has to be stopped and started by hand.
- */
- // TibjmsConnectionFactory connectionFactory = new
- // TibjmsConnectionFactory();
- // connectionFactory.setReconnAttemptCount(1);
-
- jmsComponent.setConnectionFactory(connectionFactory);
- jmsComponent.setRequestTimeout(1000);
- jmsComponent.setReceiveTimeout(1000);
- context.addComponent("jms", jmsComponent);
- context.addRoutes(new RouteBuilder() {
-
- @Override
- public void configure() throws Exception {
- from("jms:testqueue").bean(new EchoServiceImpl());
- from("direct:test").to("jms:testqueue");
- }
- });
- CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
- processor.setCamelContext(context);
- processor.postProcessBeforeInitialization(this, "this");
- context.start();
-
- String ret = proxy.echo("test");
- Assert.assertEquals("test", ret);
-
- broker.stop();
- /**
- * Wait long enough for the jms client to do a full reconnect. In the
- * Tibco EMS case this means that a Temporary Destination created before
- * is invalid now
- */
- Thread.sleep(5000);
-
- System.in.read();
- broker.start(true);
-
- /**
- * Before the fix to this issue this call will throw a spring UncategorizedJmsException
- * which contains an InvalidJmsDestination
- */
- String ret2 = proxy.echo("test");
- Assert.assertEquals("test", ret2);
-
- }
-}
+/**
+ * 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.component.jms.temp;
+
+import junit.framework.Assert;
+
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.camel.Produce;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jms.JmsComponent;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.spring.CamelBeanPostProcessor;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Test for issue CAMEL-3193. Camel should support reconnects in case of
+ * connection loss to jms server. After reconnect Temporary destinations have to
+ * be recreated as they may become invalid
+ */
+public class JmsReconnectTest {
+ public interface MyService {
+ String echo(String st);
+ }
+
+ private final class EchoServiceImpl implements MyService {
+ public String echo(String st) {
+ return st;
+ }
+ }
+
+ @Produce(uri = "direct:test")
+ MyService proxy;
+
+ /**
+ * This test is disabled as the problem can currently not be reproduced using ActiveMQ.
+ * TODO Find a way to recreate the problem with ActiveMQ and fully automate the test
+ * @throws Exception
+ */
+ @Ignore
+ @Test
+ public void testRequestReply() throws Exception {
+ BrokerService broker = new BrokerService();
+ broker.addConnector("tcp://localhost:61616");
+ broker.setPersistent(false);
+ broker.setTimeBeforePurgeTempDestinations(1000);
+ broker.start();
+
+ DefaultCamelContext context = new DefaultCamelContext();
+ JmsComponent jmsComponent = new JmsComponent();
+
+ /**
+ *
+ */
+ ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory();
+ connectionFactory.setBrokerURL("failover://(tcp://localhost:61616)?maxReconnectAttempts=1");
+
+ /**
+ * When using Tibco EMS the problem can be recreated. As the broker is
+ * external it has to be stopped and started by hand.
+ */
+ // TibjmsConnectionFactory connectionFactory = new
+ // TibjmsConnectionFactory();
+ // connectionFactory.setReconnAttemptCount(1);
+
+ jmsComponent.setConnectionFactory(connectionFactory);
+ jmsComponent.setRequestTimeout(1000);
+ jmsComponent.setReceiveTimeout(1000);
+ context.addComponent("jms", jmsComponent);
+ context.addRoutes(new RouteBuilder() {
+
+ @Override
+ public void configure() throws Exception {
+ from("jms:testqueue").bean(new EchoServiceImpl());
+ from("direct:test").to("jms:testqueue");
+ }
+ });
+ CamelBeanPostProcessor processor = new CamelBeanPostProcessor();
+ processor.setCamelContext(context);
+ processor.postProcessBeforeInitialization(this, "this");
+ context.start();
+
+ String ret = proxy.echo("test");
+ Assert.assertEquals("test", ret);
+
+ broker.stop();
+ /**
+ * Wait long enough for the jms client to do a full reconnect. In the
+ * Tibco EMS case this means that a Temporary Destination created before
+ * is invalid now
+ */
+ Thread.sleep(5000);
+
+ System.in.read();
+ broker.start(true);
+
+ /**
+ * Before the fix to this issue this call will throw a spring UncategorizedJmsException
+ * which contains an InvalidJmsDestination
+ */
+ String ret2 = proxy.echo("test");
+ Assert.assertEquals("test", ret2);
+
+ }
+}
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/temp/JmsReconnectTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JMSTXInOutPersistentQueueTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/java/org/apache/camel/component/jms/tx/JmsToJmsTransactedSecurityTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsDestinationResolver.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/branches/camel-2.8.x/components/camel-jms/src/test/resources/org/apache/camel/component/jms/jmsDestinationResolver.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Propchange: camel/branches/camel-2.8.x/components/camel-jmx/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-.checkstyle
.pmd
+.checkstyle
+.ruleset
target
-eclipse-classes
+.settings
.classpath
.project
-.settings
-res
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-josql/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,8 +1,16 @@
-eclipse-classes
.pmd
.checkstyle
+.ruleset
target
+.settings
.classpath
.project
-.settings
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws
Propchange: camel/branches/camel-2.8.x/components/camel-jpa/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Dec 22 21:08:26 2011
@@ -1,9 +1,16 @@
-eclipse-classes
.pmd
.checkstyle
+.ruleset
target
+.settings
.classpath
.project
-derby.log
-.settings
-*.i??
+.wtpmodules
+prj.el
+.jdee_classpath
+.jdee_sources
+velocity.log
+eclipse-classes
+*.ipr
+*.iml
+*.iws