[1/2] git commit: Try to fix the unit test error of CafeRouteBuilderTest in CI
Updated Branches:
refs/heads/camel-2.10.x 5de9332d8 -> d66ffae17
Try to fix the unit test error of CafeRouteBuilderTest in CI
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f3cfecae
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f3cfecae
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f3cfecae
Branch: refs/heads/camel-2.10.x
Commit: f3cfecaef8b3a25cad7726dd7f0e36c37ae3b1d1
Parents: 5de9332
Author: Willem Jiang
Authored: Mon Sep 2 09:33:52 2013 +0800
Committer: Willem Jiang
Committed: Tue Sep 3 09:42:34 2013 +0800
--
.../src/main/java/org/apache/camel/example/cafe/stuff/Barista.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f3cfecae/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
--
diff --git
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
b/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
index da15044..4d3adcc 100644
---
a/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
+++
b/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/stuff/Barista.java
@@ -23,7 +23,7 @@ import org.apache.camel.example.cafe.OrderItem;
public class Barista {
-private long hotDrinkDelay = 500;
+private long hotDrinkDelay = 300;
private long coldDrinkDelay = 100;
[2/2] git commit: Try to fixed the unit test errors of CI slower box
Try to fixed the unit test errors of CI slower box
Conflicts:
components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
Conflicts:
components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d66ffae1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d66ffae1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d66ffae1
Branch: refs/heads/camel-2.10.x
Commit: d66ffae171489c94fb21cc0381e445465993a9ae
Parents: f3cfeca
Author: Willem Jiang
Authored: Tue Sep 3 09:44:20 2013 +0800
Committer: Willem Jiang
Committed: Tue Sep 3 09:44:20 2013 +0800
--
.../apache/camel/processor/jpa/JpaProducerConcurrentTest.java| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d66ffae1/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
--
diff --git
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
index 48ce655..f206df7 100644
---
a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
+++
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
@@ -76,7 +76,7 @@ public class JpaProducerConcurrentTest extends
CamelTestSupport {
responses.put(index, out);
}
-assertMockEndpointsSatisfied();
+assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
assertEquals(files, responses.size());
@@ -133,4 +133,4 @@ public class JpaProducerConcurrentTest extends
CamelTestSupport {
}
});
}
-}
\ No newline at end of file
+}
git commit: CAMEL-6696 camel-cxf should not setup the holder and wrapperClass interceptors in CXF_MESSAGE data format
Updated Branches:
refs/heads/camel-2.10.x 7c8059a09 -> 5de9332d8
CAMEL-6696 camel-cxf should not setup the holder and wrapperClass interceptors
in CXF_MESSAGE data format
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5de9332d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5de9332d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5de9332d
Branch: refs/heads/camel-2.10.x
Commit: 5de9332d874acefb3a0b8bf589f472a87915b676
Parents: 7c8059a
Author: Willem Jiang
Authored: Tue Sep 3 09:33:45 2013 +0800
Committer: Willem Jiang
Committed: Tue Sep 3 09:41:41 2013 +0800
--
.../feature/CXFMessageDataFormatFeature.java| 23 ++
.../mtom/CxfMtomRouterCxfMessageModeTest.java | 46
.../CxfMtomRouterCxfMessageModeTest-context.xml | 79
3 files changed, 148 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5de9332d/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index 1d24126..ad1147d 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -17,6 +17,9 @@
package org.apache.camel.component.cxf.feature;
+import java.util.ArrayList;
+import java.util.Collection;
+
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
@@ -29,8 +32,13 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
+import org.apache.cxf.interceptor.ClientFaultConverter;
+import org.apache.cxf.jaxws.interceptors.HolderInInterceptor;
+import org.apache.cxf.jaxws.interceptors.HolderOutInterceptor;
import org.apache.cxf.jaxws.interceptors.MessageModeInInterceptor;
import org.apache.cxf.jaxws.interceptors.MessageModeOutInterceptor;
+import org.apache.cxf.jaxws.interceptors.WrapperClassInInterceptor;
+import org.apache.cxf.jaxws.interceptors.WrapperClassOutInterceptor;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
@@ -46,6 +54,18 @@ import org.slf4j.LoggerFactory;
public class CXFMessageDataFormatFeature extends AbstractDataFormatFeature {
private static final Logger LOG =
LoggerFactory.getLogger(CXFMessageDataFormatFeature.class);
+private static final Collection> REMOVING_IN_INTERCEPTORS;
+private static final Collection> REMOVING_OUT_INTERCEPTORS;
+
+static {
+REMOVING_IN_INTERCEPTORS = new ArrayList>();
+REMOVING_IN_INTERCEPTORS.add(HolderInInterceptor.class);
+REMOVING_IN_INTERCEPTORS.add(WrapperClassInInterceptor.class);
+
+REMOVING_OUT_INTERCEPTORS = new ArrayList>();
+REMOVING_OUT_INTERCEPTORS.add(HolderOutInterceptor.class);
+REMOVING_OUT_INTERCEPTORS.add(WrapperClassOutInterceptor.class);
+}
@Override
public void initialize(Client client, Bus bus) {
@@ -72,6 +92,9 @@ public class CXFMessageDataFormatFeature extends
AbstractDataFormatFeature {
}
ep.getInInterceptors().add(new MessageModeInInterceptor(fmt,
ep.getBinding().getBindingInfo().getName()));
ep.put(AbstractInDatabindingInterceptor.NO_VALIDATE_PARTS,
Boolean.TRUE);
+// need to remove the wrapper class and holder interceptor
+removeInterceptors(ep.getInInterceptors(), REMOVING_IN_INTERCEPTORS);
+removeInterceptors(ep.getOutInterceptors(), REMOVING_OUT_INTERCEPTORS);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/5de9332d/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
new file mode 100644
index 000..62c5117
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor l
[4/4] git commit: CAMEL-6696 camel-cxf should not setup the holder and wrapperClass interceptors in CXF_MESSAGE data format
CAMEL-6696 camel-cxf should not setup the holder and wrapperClass interceptors
in CXF_MESSAGE data format
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80d24a15
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80d24a15
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80d24a15
Branch: refs/heads/camel-2.11.x
Commit: 80d24a15e792f9b253f56bbe888d0bb25ea7b568
Parents: 42659f8
Author: Willem Jiang
Authored: Tue Sep 3 09:33:45 2013 +0800
Committer: Willem Jiang
Committed: Tue Sep 3 09:38:44 2013 +0800
--
.../feature/CXFMessageDataFormatFeature.java| 23 ++
.../mtom/CxfMtomRouterCxfMessageModeTest.java | 46
.../CxfMtomRouterCxfMessageModeTest-context.xml | 79
3 files changed, 148 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/80d24a15/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index 1d24126..ad1147d 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -17,6 +17,9 @@
package org.apache.camel.component.cxf.feature;
+import java.util.ArrayList;
+import java.util.Collection;
+
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
@@ -29,8 +32,13 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
+import org.apache.cxf.interceptor.ClientFaultConverter;
+import org.apache.cxf.jaxws.interceptors.HolderInInterceptor;
+import org.apache.cxf.jaxws.interceptors.HolderOutInterceptor;
import org.apache.cxf.jaxws.interceptors.MessageModeInInterceptor;
import org.apache.cxf.jaxws.interceptors.MessageModeOutInterceptor;
+import org.apache.cxf.jaxws.interceptors.WrapperClassInInterceptor;
+import org.apache.cxf.jaxws.interceptors.WrapperClassOutInterceptor;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
@@ -46,6 +54,18 @@ import org.slf4j.LoggerFactory;
public class CXFMessageDataFormatFeature extends AbstractDataFormatFeature {
private static final Logger LOG =
LoggerFactory.getLogger(CXFMessageDataFormatFeature.class);
+private static final Collection> REMOVING_IN_INTERCEPTORS;
+private static final Collection> REMOVING_OUT_INTERCEPTORS;
+
+static {
+REMOVING_IN_INTERCEPTORS = new ArrayList>();
+REMOVING_IN_INTERCEPTORS.add(HolderInInterceptor.class);
+REMOVING_IN_INTERCEPTORS.add(WrapperClassInInterceptor.class);
+
+REMOVING_OUT_INTERCEPTORS = new ArrayList>();
+REMOVING_OUT_INTERCEPTORS.add(HolderOutInterceptor.class);
+REMOVING_OUT_INTERCEPTORS.add(WrapperClassOutInterceptor.class);
+}
@Override
public void initialize(Client client, Bus bus) {
@@ -72,6 +92,9 @@ public class CXFMessageDataFormatFeature extends
AbstractDataFormatFeature {
}
ep.getInInterceptors().add(new MessageModeInInterceptor(fmt,
ep.getBinding().getBindingInfo().getName()));
ep.put(AbstractInDatabindingInterceptor.NO_VALIDATE_PARTS,
Boolean.TRUE);
+// need to remove the wrapper class and holder interceptor
+removeInterceptors(ep.getInInterceptors(), REMOVING_IN_INTERCEPTORS);
+removeInterceptors(ep.getOutInterceptors(), REMOVING_OUT_INTERCEPTORS);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/80d24a15/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
new file mode 100644
index 000..62c5117
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this wor
[2/4] git commit: Fixed the unit test error of SmppConsumerTest
Fixed the unit test error of SmppConsumerTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b7121442
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b7121442
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b7121442
Branch: refs/heads/camel-2.12.x
Commit: b7121442aebcc82a694792c74b0a054eed711dce
Parents: 72807c4
Author: Willem Jiang
Authored: Tue Sep 3 08:40:58 2013 +0800
Committer: Willem Jiang
Committed: Tue Sep 3 09:36:34 2013 +0800
--
.../org/apache/camel/component/smpp/SmppConsumerTest.java | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b7121442/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
--
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
index 0c8729e..3349e1f 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.smpp;
+import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
import org.jsmpp.bean.BindType;
import org.jsmpp.bean.NumberingPlanIndicator;
@@ -42,6 +43,7 @@ public class SmppConsumerTest {
private SmppConfiguration configuration;
private Processor processor;
private SMPPSession session;
+private CamelContext camelContext;
@Before
public void setUp() {
@@ -50,6 +52,7 @@ public class SmppConsumerTest {
processor = createMock(Processor.class);
session = createMock(SMPPSession.class);
+// the construction of SmppConsumer will trigger the getCamelContext
call
consumer = new SmppConsumer(
endpoint,
configuration,
@@ -63,6 +66,7 @@ public class SmppConsumerTest {
@Test
public void doStartShouldStartANewSmppSession() throws Exception {
+resetToNice(endpoint, session);
expect(endpoint.getConnectionString())
.andReturn("smpp://smppclient@localhost:2775")
.times(2);
@@ -82,9 +86,11 @@ public class SmppConsumerTest {
NumberingPlanIndicator.UNKNOWN,
""))).andReturn("1");
expect(endpoint.getConnectionString()).andReturn("smpp://smppclient@localhost:2775");
+
replay(endpoint, processor, session);
+
consumer.doStart();
verify(endpoint, processor, session);
@@ -92,6 +98,7 @@ public class SmppConsumerTest {
@Test
public void doStopShouldNotCloseTheSMPPSessionIfItIsNull() throws
Exception {
+resetToNice(endpoint, session);
expect(endpoint.getConnectionString())
.andReturn("smpp://smppclient@localhost:2775")
.times(3);
[3/4] git commit: CAMEL-6696 camel-cxf should not setup the holder and wrapperClass interceptors in CXF_MESSAGE data format
CAMEL-6696 camel-cxf should not setup the holder and wrapperClass interceptors
in CXF_MESSAGE data format
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/61e4948c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/61e4948c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/61e4948c
Branch: refs/heads/camel-2.12.x
Commit: 61e4948cefb4351c13bb29a95a5445263e0a2323
Parents: b712144
Author: Willem Jiang
Authored: Tue Sep 3 09:33:45 2013 +0800
Committer: Willem Jiang
Committed: Tue Sep 3 09:36:41 2013 +0800
--
.../feature/CXFMessageDataFormatFeature.java| 23 ++
.../mtom/CxfMtomRouterCxfMessageModeTest.java | 46
.../CxfMtomRouterCxfMessageModeTest-context.xml | 79
.../mtom/CxfMtomRouterRawModeTest-context.xml | 4 +-
4 files changed, 150 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/61e4948c/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index 1d24126..ad1147d 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -17,6 +17,9 @@
package org.apache.camel.component.cxf.feature;
+import java.util.ArrayList;
+import java.util.Collection;
+
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
@@ -29,8 +32,13 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
+import org.apache.cxf.interceptor.ClientFaultConverter;
+import org.apache.cxf.jaxws.interceptors.HolderInInterceptor;
+import org.apache.cxf.jaxws.interceptors.HolderOutInterceptor;
import org.apache.cxf.jaxws.interceptors.MessageModeInInterceptor;
import org.apache.cxf.jaxws.interceptors.MessageModeOutInterceptor;
+import org.apache.cxf.jaxws.interceptors.WrapperClassInInterceptor;
+import org.apache.cxf.jaxws.interceptors.WrapperClassOutInterceptor;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
@@ -46,6 +54,18 @@ import org.slf4j.LoggerFactory;
public class CXFMessageDataFormatFeature extends AbstractDataFormatFeature {
private static final Logger LOG =
LoggerFactory.getLogger(CXFMessageDataFormatFeature.class);
+private static final Collection> REMOVING_IN_INTERCEPTORS;
+private static final Collection> REMOVING_OUT_INTERCEPTORS;
+
+static {
+REMOVING_IN_INTERCEPTORS = new ArrayList>();
+REMOVING_IN_INTERCEPTORS.add(HolderInInterceptor.class);
+REMOVING_IN_INTERCEPTORS.add(WrapperClassInInterceptor.class);
+
+REMOVING_OUT_INTERCEPTORS = new ArrayList>();
+REMOVING_OUT_INTERCEPTORS.add(HolderOutInterceptor.class);
+REMOVING_OUT_INTERCEPTORS.add(WrapperClassOutInterceptor.class);
+}
@Override
public void initialize(Client client, Bus bus) {
@@ -72,6 +92,9 @@ public class CXFMessageDataFormatFeature extends
AbstractDataFormatFeature {
}
ep.getInInterceptors().add(new MessageModeInInterceptor(fmt,
ep.getBinding().getBindingInfo().getName()));
ep.put(AbstractInDatabindingInterceptor.NO_VALIDATE_PARTS,
Boolean.TRUE);
+// need to remove the wrapper class and holder interceptor
+removeInterceptors(ep.getInInterceptors(), REMOVING_IN_INTERCEPTORS);
+removeInterceptors(ep.getOutInterceptors(), REMOVING_OUT_INTERCEPTORS);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/61e4948c/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
new file mode 100644
index 000..62c5117
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contribut
[1/4] git commit: CAMEL-6696 camel-cxf should not setup the holder and wrapperClass interceptors in CXF_MESSAGE data format
Updated Branches:
refs/heads/camel-2.11.x 42659f8e7 -> 80d24a15e
refs/heads/camel-2.12.x 72807c486 -> 61e4948ce
refs/heads/master c0c130072 -> b99fd1e44
CAMEL-6696 camel-cxf should not setup the holder and wrapperClass interceptors
in CXF_MESSAGE data format
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b99fd1e4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b99fd1e4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b99fd1e4
Branch: refs/heads/master
Commit: b99fd1e449f57012335de5a7e4759579c87c1aee
Parents: c0c1300
Author: Willem Jiang
Authored: Tue Sep 3 09:33:45 2013 +0800
Committer: Willem Jiang
Committed: Tue Sep 3 09:34:46 2013 +0800
--
.../feature/CXFMessageDataFormatFeature.java| 23 ++
.../mtom/CxfMtomRouterCxfMessageModeTest.java | 46
.../CxfMtomRouterCxfMessageModeTest-context.xml | 79
.../mtom/CxfMtomRouterRawModeTest-context.xml | 4 +-
4 files changed, 150 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b99fd1e4/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
index 1d24126..ad1147d 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/feature/CXFMessageDataFormatFeature.java
@@ -17,6 +17,9 @@
package org.apache.camel.component.cxf.feature;
+import java.util.ArrayList;
+import java.util.Collection;
+
import javax.xml.soap.SOAPMessage;
import javax.xml.transform.Source;
@@ -29,8 +32,13 @@ import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.AbstractInDatabindingInterceptor;
+import org.apache.cxf.interceptor.ClientFaultConverter;
+import org.apache.cxf.jaxws.interceptors.HolderInInterceptor;
+import org.apache.cxf.jaxws.interceptors.HolderOutInterceptor;
import org.apache.cxf.jaxws.interceptors.MessageModeInInterceptor;
import org.apache.cxf.jaxws.interceptors.MessageModeOutInterceptor;
+import org.apache.cxf.jaxws.interceptors.WrapperClassInInterceptor;
+import org.apache.cxf.jaxws.interceptors.WrapperClassOutInterceptor;
import org.apache.cxf.service.model.BindingMessageInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.service.model.MessageInfo;
@@ -46,6 +54,18 @@ import org.slf4j.LoggerFactory;
public class CXFMessageDataFormatFeature extends AbstractDataFormatFeature {
private static final Logger LOG =
LoggerFactory.getLogger(CXFMessageDataFormatFeature.class);
+private static final Collection> REMOVING_IN_INTERCEPTORS;
+private static final Collection> REMOVING_OUT_INTERCEPTORS;
+
+static {
+REMOVING_IN_INTERCEPTORS = new ArrayList>();
+REMOVING_IN_INTERCEPTORS.add(HolderInInterceptor.class);
+REMOVING_IN_INTERCEPTORS.add(WrapperClassInInterceptor.class);
+
+REMOVING_OUT_INTERCEPTORS = new ArrayList>();
+REMOVING_OUT_INTERCEPTORS.add(HolderOutInterceptor.class);
+REMOVING_OUT_INTERCEPTORS.add(WrapperClassOutInterceptor.class);
+}
@Override
public void initialize(Client client, Bus bus) {
@@ -72,6 +92,9 @@ public class CXFMessageDataFormatFeature extends
AbstractDataFormatFeature {
}
ep.getInInterceptors().add(new MessageModeInInterceptor(fmt,
ep.getBinding().getBindingInfo().getName()));
ep.put(AbstractInDatabindingInterceptor.NO_VALIDATE_PARTS,
Boolean.TRUE);
+// need to remove the wrapper class and holder interceptor
+removeInterceptors(ep.getInInterceptors(), REMOVING_IN_INTERCEPTORS);
+removeInterceptors(ep.getOutInterceptors(), REMOVING_OUT_INTERCEPTORS);
}
@Override
http://git-wip-us.apache.org/repos/asf/camel/blob/b99fd1e4/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/mtom/CxfMtomRouterCxfMessageModeTest.java
new file mode 100644
index 000..62c5117
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/compone
git commit: Fixed the unit test error of SmppConsumerTest
Updated Branches:
refs/heads/master eed23e3e8 -> c0c130072
Fixed the unit test error of SmppConsumerTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0c13007
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0c13007
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0c13007
Branch: refs/heads/master
Commit: c0c13007277b058d5130ec60a7323dab629222fc
Parents: eed23e3
Author: Willem Jiang
Authored: Tue Sep 3 08:40:58 2013 +0800
Committer: Willem Jiang
Committed: Tue Sep 3 08:40:58 2013 +0800
--
.../org/apache/camel/component/smpp/SmppConsumerTest.java | 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c0c13007/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
--
diff --git
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
index 0c8729e..3349e1f 100644
---
a/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
+++
b/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppConsumerTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.smpp;
+import org.apache.camel.CamelContext;
import org.apache.camel.Processor;
import org.jsmpp.bean.BindType;
import org.jsmpp.bean.NumberingPlanIndicator;
@@ -42,6 +43,7 @@ public class SmppConsumerTest {
private SmppConfiguration configuration;
private Processor processor;
private SMPPSession session;
+private CamelContext camelContext;
@Before
public void setUp() {
@@ -50,6 +52,7 @@ public class SmppConsumerTest {
processor = createMock(Processor.class);
session = createMock(SMPPSession.class);
+// the construction of SmppConsumer will trigger the getCamelContext
call
consumer = new SmppConsumer(
endpoint,
configuration,
@@ -63,6 +66,7 @@ public class SmppConsumerTest {
@Test
public void doStartShouldStartANewSmppSession() throws Exception {
+resetToNice(endpoint, session);
expect(endpoint.getConnectionString())
.andReturn("smpp://smppclient@localhost:2775")
.times(2);
@@ -82,9 +86,11 @@ public class SmppConsumerTest {
NumberingPlanIndicator.UNKNOWN,
""))).andReturn("1");
expect(endpoint.getConnectionString()).andReturn("smpp://smppclient@localhost:2775");
+
replay(endpoint, processor, session);
+
consumer.doStart();
verify(endpoint, processor, session);
@@ -92,6 +98,7 @@ public class SmppConsumerTest {
@Test
public void doStopShouldNotCloseTheSMPPSessionIfItIsNull() throws
Exception {
+resetToNice(endpoint, session);
expect(endpoint.getConnectionString())
.andReturn("smpp://smppclient@localhost:2775")
.times(3);
svn commit: r877046 - in /websites/production/camel/content: cache/main.pageCache camel-2120-release.html
Author: buildbot Date: Mon Sep 2 16:20:47 2013 New Revision: 877046 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2120-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2120-release.html == --- websites/production/camel/content/camel-2120-release.html (original) +++ websites/production/camel/content/camel-2120-release.html Mon Sep 2 16:20:47 2013 @@ -99,7 +99,7 @@ Fixed Issues -Fixed setting .id in Java DSL on some EIPs such as the ValidateFixed Dead Letter Channel always handled exception, which wasn't the case if an Exception Clause was in use, which didn't had handled=true.Fixed Using PropertyPlaceholder in attributes defined on.All Camel Components will configure their consumers when being created to ensure you can configure from URIs with consumer. as prefix.Fixed QuickfixJEndpoint to adhere a given InOut MEP correctly.Fixed using property placeholders in a Simple predicate used inside a when in a Content Based Router when using Java DSLFixed a race condition in File consumer which may lead to a tiny window for another process to pickup a file, as the read lock is committed before the file is moved afterwards etc. Now read locks is executed last.HTTP4 now validates that only one instance of org.apache.camel.util.jsse.SSLContextParameters is used per component, as multiple is not supported, and could lead to undesired side effects.Fixed possible dead-lock during Graceful Shutdown if a route starts from SEDA and uses Splitter or Multicast and maximumRedeliveries was enabled as well.Fixed TokenizeXML to support self closing tags.Fixed Blueprint Testing to work with isMockEndpointsAndSkip and other similar functionality of the CamelBlueprintTestSupport class.Fixed Routing Slip to emit ExchangeSentEvents alsoFixed Quartz routes with stateful jobs may not trigger if redeployment with changed endpoint uris.Fixed Recipient List, Routing Slip, and Dynamic Router EIPs to work with Stream cachingFixed suspending/resuming Camel Quartz routesFixed SQL Component using queries with a single parameter and the data is JSON like structure (having comma separators)Fixed Jetty to be able to use stream cached streams that was spooled to disk, as its reply message when sending back reply to the caller.Fixed endChoice() in Java DSL to work when being nested in parent Content Based Router(s)Fixed Lucene to reuse existing index directory if Camel is being restarted etc.Fixed using to not share the routes when using multiple , but each have their own route instances to not cause side-effects between the CamelContexts.Fixed using type converter from NodeList -> NodeFixed having 2+ routes from the same JMS queue, not stop the endpoint if there are still active listeners when a route is stopped.Fixed SEDA when using queueSize not able to identify its same queue size, when using multiple SEDA endpoints for the same queue name/size. +Fixed setting .id in Java DSL on some EIPs such as the ValidateFixed Dead Letter Channel always handled exception, which wasn't the case if an Exception Clause was in use, which didn't had handled=true.Fixed Using PropertyPlaceholder in attributes defined on .All Camel Components will configure their consumers when being created to ensure you can configure from URIs with consumer. as prefix.Fixed QuickfixJEndpoint to adhere a given InOut MEP correctly.Fixed using property placeholders in a Simple predicate used inside a when in a Content Based Router when using Java DSLFixed a race condition in File consumer which may lead to a tiny window for another process to pickup a file, as the read lock is committed before the file is moved afterwards etc. Now read locks is executed last.HTTP4 now validates that only one instance of org.apache.camel.util.jsse.SSLContextParameters is used per component, as multiple is not supported, and could lead to undesired side effects.Fixed possible dead-lock during Graceful Shutdown if a route starts from SEDA and uses Splitter or Multicast and maximumRedeliveries was enabled as well.Fixed TokenizeXML to support self closing tags.Fixed Blueprint Testing to work with isMockEndpointsAndSkip and other similar functionality of the CamelBlueprintTestSupport class.Fixed Routing Slip to emit ExchangeSentEvents alsoFixed Quartz routes with stateful jobs may not trigger if redeployment with changed endpoint uris.Fixed Recipient List, Routing Slip, and Dynamic Router EIPs to work with Stream cachingFixed suspending/resuming Camel Quartz routesFixed SQL Component usi
[CONF] Apache Camel > Camel 2.12.0 Release
Camel 2.12.0 Release
Page edited by Claus Ibsen
Changes (1)
...
* Fixed having 2+ routes from the *same* JMS queue, not stop the endpoint if there are still active listeners when a route is stopped. * Fixed [SEDA] when using {{queueSize}} not able to identify its same queue size, when using multiple [SEDA] endpoints for the same queue name/size.
* Fixed using {{}} in OSGi Blueprint when referring to a {{RouteBuilder}} from another bundle, exposed in the OSGi service registry.
h3. New [Enterprise Integration Patterns]
...
Full Content
Camel 2.12.0 release (currently in progress)
New and Noteworthy
Welcome to the 2.12.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)
Endpoint Annotations along with automatically created HTML documentation for the endpoint parameters; this makes it easier for component developers to add a few refactoring-safe annotations to their Endpoint or Consumer implementations and, (along with javadoc comments on the field or setter method), get nice user documentation on how to use the endpoint for free.
ComponentConfiguration API provides a handy API for tools developers to introspect on a Component to find all the possible parameters, their types and any extra annotations (like Bean Validation Annotations) to be able to create/edit endpoints or URI strings so that tools can generate nicer UIs for configuring endpoints than just letting folks edit Strings.
EndpointCompleter API provides a hook so that command line tools (like Karaf's shell), IDEs and web tools can get (bash tab like) auto-completion on endpoint paths (such as file or directory names, message queue names, database table names) when creating or using new endpoints
Reduced stack-frames in use during routing, that also makes Camel's stack traces being logged much less verbose. This also allows people to easier debug the internals of Camel as less AsyncCallback callbacks are in use during routing.
Easy to use Message History out of the box. And included message history as "route stack-trace" when exceptions logged by Error Handler to make it easier for end users to spot where the exception occurred.
Spring Web Services now supports setting/receiving SOAP headers more easily using a header on the Camel Message.
Evaluating Groovy expressions is faster as we cache the compiled scripts.
Added base64 option to Shiro Security to allow transferring security token over JMS and other transports as base64 encoded representation.
Made it easier to use Shiro Security as the credentials can be provided in headers, when sending a message to a secured route.
Bindy now supports enums.
Added new BacklogDebugger to perform live debugging of messages during routing. The BacklogDebugger has JMX API allows tooling to control the debugger.
While using the Jackson library through the JSON Dataformat there's now a jsonView attribute you could make use of directly inside the DSL itself.
SMPP now supports optional parameters in all commands where they are possible.
JDBC now supports named parameters.
Added timeout support for Direct producers to wait for consumer to become active.
Added stats action to ControlBus to easily get performance statics in a single XML message.
Added support for request timeout on Netty producer, and to configure logging level on Netty consumer to be less noisy for ChannelClosedException which can flood the logs when client disconnects abruptly.
Spring Batch component producer now returns the JobExecution instance as the output message. Users can use the JobExecution instance to perform some operations using the Spring Batch API directly.
Added support for NULL values in SQL with named parameters.
Optimized Jetty streaming responses in non-chunked mode; and as well using buffer sizes based on HttpServletResponse.getBufferSize() instead of fixed size of 4kb.
Added greedy option to scheduled polling consumer.
Added support for accessing the length field on Java arrays in Simple language.
Added support for using JAXB annotations with Camel's Jackson JSON component.
Added the ability for Bindy to skip content when parsing fixed-length records.
MongoDB now supports aggregation queries.
Netty allows to use shared Netty boss and worker thread pools.
The Camel Maven Archetypes for component and data format now packages as OSGi bundles out of the box.
Easier Stream caching configuration using StreamCachingStrategy. Also allows spool directory per CamelContext instead of shared per JVM. And insight at runtime using JMX management. As well allowing to plugin 3rd party implementations.
Improved Netty to be able to join an UDP multicast group.
Using Camel Spring is now setting up Ca
[3/5] git commit: CAMEL-6699: Fixed using in OSGi Blueprint.
CAMEL-6699: Fixed using in OSGi Blueprint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/72807c48
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/72807c48
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/72807c48
Branch: refs/heads/camel-2.12.x
Commit: 72807c48679ec2819b8fcf46712c129c4c4b71cd
Parents: 20b60b7
Author: Claus Ibsen
Authored: Mon Sep 2 17:40:31 2013 +0200
Committer: Claus Ibsen
Committed: Mon Sep 2 17:40:55 2013 +0200
--
.../core/xml/AbstractCamelContextFactoryBean.java | 17 +
1 file changed, 5 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/72807c48/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
--
diff --git
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 8e0b498..621d645 100644
---
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -721,21 +721,14 @@ public abstract class AbstractCamelContextFactoryBean builders = new ArrayList();
-// lets add route builders added from references
+// lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
for (RouteBuilderDefinition builderRef : getBuilderRefs()) {
-RouteBuilder builder =
builderRef.createRouteBuilder(getContext());
-if (builder != null) {
-builders.add(builder);
+RoutesBuilder routes = builderRef.createRoutes(getContext());
+if (routes != null) {
+this.builders.add(routes);
} else {
-// support to get the route here
-RoutesBuilder routes =
builderRef.createRoutes(getContext());
-if (routes != null) {
-this.builders.add(routes);
-} else {
-// Throw the exception that we can't find any build
here
-throw new CamelException("Cannot find any routes with
this RouteBuilder reference: " + builderRef);
-}
+throw new CamelException("Cannot find any routes with this
RouteBuilder reference: " + builderRef);
}
}
}
[2/5] git commit: CAMEL-6699: Fixed using in OSGi Blueprint.
CAMEL-6699: Fixed using in OSGi Blueprint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eed23e3e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eed23e3e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eed23e3e
Branch: refs/heads/master
Commit: eed23e3e8abe98c5d939badb951cda8ebbe6d51d
Parents: b23317f
Author: Claus Ibsen
Authored: Mon Sep 2 17:40:31 2013 +0200
Committer: Claus Ibsen
Committed: Mon Sep 2 17:40:31 2013 +0200
--
.../core/xml/AbstractCamelContextFactoryBean.java | 17 +
1 file changed, 5 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/eed23e3e/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
--
diff --git
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 8e0b498..621d645 100644
---
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -721,21 +721,14 @@ public abstract class AbstractCamelContextFactoryBean builders = new ArrayList();
-// lets add route builders added from references
+// lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
for (RouteBuilderDefinition builderRef : getBuilderRefs()) {
-RouteBuilder builder =
builderRef.createRouteBuilder(getContext());
-if (builder != null) {
-builders.add(builder);
+RoutesBuilder routes = builderRef.createRoutes(getContext());
+if (routes != null) {
+this.builders.add(routes);
} else {
-// support to get the route here
-RoutesBuilder routes =
builderRef.createRoutes(getContext());
-if (routes != null) {
-this.builders.add(routes);
-} else {
-// Throw the exception that we can't find any build
here
-throw new CamelException("Cannot find any routes with
this RouteBuilder reference: " + builderRef);
-}
+throw new CamelException("Cannot find any routes with this
RouteBuilder reference: " + builderRef);
}
}
}
[1/5] git commit: Polished javadoc
Updated Branches:
refs/heads/camel-2.10.x ef84e968d -> 7c8059a09
refs/heads/camel-2.11.x e2c1a4041 -> 42659f8e7
refs/heads/camel-2.12.x 20b60b702 -> 72807c486
refs/heads/master bb9e3d1ec -> eed23e3e8
Polished javadoc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b23317f2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b23317f2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b23317f2
Branch: refs/heads/master
Commit: b23317f266f6483a46e67f9dc959b810187fe4e2
Parents: bb9e3d1
Author: Claus Ibsen
Authored: Mon Sep 2 16:35:32 2013 +0200
Committer: Claus Ibsen
Committed: Mon Sep 2 16:35:32 2013 +0200
--
.../org/apache/camel/model/RouteContextRefDefinitionHelper.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b23317f2/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
index 08617ae..500aca9 100644
---
a/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
+++
b/camel-core/src/main/java/org/apache/camel/model/RouteContextRefDefinitionHelper.java
@@ -48,12 +48,12 @@ public final class RouteContextRefDefinitionHelper {
*
* This implmementation must be used to lookup the routes as it performs a
deep clone of the routes
* as a {@link RouteContextRefDefinition} can be re-used with multiple
{@link CamelContext} and each
- * context should have their own instances of the routes. This is to
ensure no side-effefts and sharing
+ * context should have their own instances of the routes. This is to
ensure no side-effects and sharing
* of instances between the contexts. For example such as property
placeholders may be context specific
* so the routes should not use placeholders from another {@link
CamelContext}.
*
* @param camelContext the CamelContext
- * @param ref the id of the {@link RouteContextRefDefinition} to
lookup and get the rotues.
+ * @param ref the id of the {@link RouteContextRefDefinition} to
lookup and get the routes.
* @return the routes.
*/
@SuppressWarnings("unchecked")
[4/5] git commit: CAMEL-6699: Fixed using in OSGi Blueprint.
CAMEL-6699: Fixed using in OSGi Blueprint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42659f8e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42659f8e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42659f8e
Branch: refs/heads/camel-2.11.x
Commit: 42659f8e771ee3f6ac157ee0f24de0f8df8741c5
Parents: e2c1a40
Author: Claus Ibsen
Authored: Mon Sep 2 17:40:31 2013 +0200
Committer: Claus Ibsen
Committed: Mon Sep 2 17:41:07 2013 +0200
--
.../core/xml/AbstractCamelContextFactoryBean.java | 17 +
1 file changed, 5 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/42659f8e/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
--
diff --git
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index c6e5bd3..20bae2f 100644
---
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -634,21 +634,14 @@ public abstract class AbstractCamelContextFactoryBean builders = new ArrayList();
-// lets add route builders added from references
+// lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
for (RouteBuilderDefinition builderRef : getBuilderRefs()) {
-RouteBuilder builder =
builderRef.createRouteBuilder(getContext());
-if (builder != null) {
-builders.add(builder);
+RoutesBuilder routes = builderRef.createRoutes(getContext());
+if (routes != null) {
+this.builders.add(routes);
} else {
-// support to get the route here
-RoutesBuilder routes =
builderRef.createRoutes(getContext());
-if (routes != null) {
-this.builders.add(routes);
-} else {
-// Throw the exception that we can't find any build
here
-throw new CamelException("Cannot find any routes with
this RouteBuilder reference: " + builderRef);
-}
+throw new CamelException("Cannot find any routes with this
RouteBuilder reference: " + builderRef);
}
}
}
[5/5] git commit: CAMEL-6699: Fixed using in OSGi Blueprint.
CAMEL-6699: Fixed using in OSGi Blueprint.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7c8059a0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7c8059a0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7c8059a0
Branch: refs/heads/camel-2.10.x
Commit: 7c8059a09e07c34af0a6bb2b492a303ad82b4e96
Parents: ef84e96
Author: Claus Ibsen
Authored: Mon Sep 2 17:40:31 2013 +0200
Committer: Claus Ibsen
Committed: Mon Sep 2 17:41:25 2013 +0200
--
.../core/xml/AbstractCamelContextFactoryBean.java | 17 +
1 file changed, 5 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7c8059a0/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
--
diff --git
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
index 4173d64..ddd51f5 100644
---
a/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
+++
b/components/camel-core-xml/src/main/java/org/apache/camel/core/xml/AbstractCamelContextFactoryBean.java
@@ -618,21 +618,14 @@ public abstract class AbstractCamelContextFactoryBean builders = new ArrayList();
-// lets add route builders added from references
+// lets add RoutesBuilder's added from references
if (getBuilderRefs() != null) {
for (RouteBuilderDefinition builderRef : getBuilderRefs()) {
-RouteBuilder builder =
builderRef.createRouteBuilder(getContext());
-if (builder != null) {
-builders.add(builder);
+RoutesBuilder routes = builderRef.createRoutes(getContext());
+if (routes != null) {
+this.builders.add(routes);
} else {
-// support to get the route here
-RoutesBuilder routes =
builderRef.createRoutes(getContext());
-if (routes != null) {
-this.builders.add(routes);
-} else {
-// Throw the exception that we can't find any build
here
-throw new CamelException("Cannot find any routes with
this RouteBuilder reference: " + builderRef);
-}
+throw new CamelException("Cannot find any routes with this
RouteBuilder reference: " + builderRef);
}
}
}
svn commit: r877029 [1/2] - in /websites/production/camel/content: ./ cache/
Author: buildbot Date: Mon Sep 2 12:21:47 2013 New Revision: 877029 Log: Production update by buildbot for camel Added: websites/production/camel/content/xml-security-component.html Modified: websites/production/camel/content/book-architecture.html websites/production/camel/content/book-dataformat-appendix.html websites/production/camel/content/book-in-one-page.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2120-release.html websites/production/camel/content/component-list.html websites/production/camel/content/components.html websites/production/camel/content/security.html websites/production/camel/content/transport.html websites/production/camel/content/uris.html websites/production/camel/content/xmlsecurity-dataformat.html Modified: websites/production/camel/content/book-architecture.html == --- websites/production/camel/content/book-architecture.html (original) +++ websites/production/camel/content/book-architecture.html Mon Sep 2 12:21:47 2013 @@ -817,7 +817,13 @@ weather://[scheme]?[options] - Communicating with http://wiki.eclipse.org/Jetty/Feature/WebSockets"; rel="nofollow">Websocket clients XMPP / camel-xmpp + Communicating with http://wiki.eclipse.org/Jetty/Feature/WebSockets"; rel="nofollow">Websocket clients XML Security / camel-xmlsecurity + + + Used to sign and verify exchanges using the XML signature specification. XMPP / camel-xmpp