git commit: Revert the version change of avro which break the build of camel-avro
Repository: camel Updated Branches: refs/heads/camel-2.12.x 3e6fcc0ac -> 201bffbe0 Revert the version change of avro which break the build of camel-avro Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/201bffbe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/201bffbe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/201bffbe Branch: refs/heads/camel-2.12.x Commit: 201bffbe0ea579eb652748ac5caaf215b552144b Parents: 3e6fcc0 Author: Willem Jiang Authored: Thu Apr 10 09:00:53 2014 +0800 Committer: Willem Jiang Committed: Thu Apr 10 09:00:53 2014 +0800 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/201bffbe/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index cf04011..41c1b00 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -58,8 +58,8 @@ 3.8.0 4.3.1_1 4.3.1 -1.7.6 -1.7.6_1 +1.7.3 +1.7.3_1 1.5.1_1 1.5.1 1.2.14
buildbot success in ASF Buildbot on camel-site-production
The Buildbot has detected a restored build on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/18004 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: Build succeeded! sincerely, -The Buildbot
svn commit: r905613 [1/3] - in /websites/production/camel/content: book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache xstream.html
Author: buildbot
Date: Wed Apr 9 20:24:47 2014
New Revision: 905613
Log:
Production update by buildbot for camel
Modified:
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/xstream.html
Modified: websites/production/camel/content/book-dataformat-appendix.html
==
--- websites/production/camel/content/book-dataformat-appendix.html (original)
+++ websites/production/camel/content/book-dataformat-appendix.html Wed Apr 9
20:24:47 2014
@@ -544,6 +544,16 @@ from("activemq:My.Queue").
marshal().xstream().
to("mqseries:Another.Queue");
]]>
+If you would like to configure the XStream
instance used by the Camel for the message transformation, you can simply pass
a reference to that instance on the DSL level.
+
XMLInputFactory
and XMLOutputFactoryhttp://xstream.codehaus.org/"; rel="nofollow">The XStream library uses
the javax.xml.stream.XMLInputFactory and
javax.xml.stream.XMLOutputFactory, you can control which
implementation of this factory should be used.The Factory is discovered
using this algorithm: 1. Use the
javax.xml.stream.XMLInputFactory ,
javax.xml.stream.XMLOutputFactory system property. 2. Use the lib/xml.stream.properties file in the
JRE_HOME directory. 3. Use the Services API, if
available, to determine the classname by looking in the
META-INF/services/javax.xml.stream.XMLInputFactory,
META-INF/services/javax.xml.stream.XMLOutputFactory files in jars
available to the JRE. 4. Use the platform default XMLInputFactory,XMLOutputFactory
instance.How to
set the XML encoding in Xstream DataFormat?From Camel 2.2.0, you can
set the encoding of XML in Xstream DataFormat by setting the Exchange's
property with the key Exchange.CHARSET_NAME, or setting the
encoding property on Xstream from DSL or Spring config.
svn commit: r905613 [3/3] - in /websites/production/camel/content: book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache xstream.html
Modified: websites/production/camel/content/xstream.html
==
--- websites/production/camel/content/xstream.html (original)
+++ websites/production/camel/content/xstream.html Wed Apr 9 20:24:47 2014
@@ -100,6 +100,16 @@ from("activemq:My.Queue").
marshal().xstream().
to("mqseries:Another.Queue");
]]>
+If you would like to configure the XStream
instance used by the Camel for the message transformation, you can simply pass
a reference to that instance on the DSL level.
+
XMLInputFactory and
XMLOutputFactoryhttp://xstream.codehaus.org/"; rel="nofollow">The XStream library uses
the javax.xml.stream.XMLInputFactory and
javax.xml.stream.XMLOutputFactory, you can control which
implementation of this factory should be used.The Factory is discovered
using this algorithm: 1. Use the
javax.xml.stream.XMLInputFactory ,
javax.xml.stream.XMLOutputFactory system property. 2. Use the lib/xml.stream.properties file in the
JRE_HOME directory. 3. Use the Services API, if
available, to determine the classname by looking in the
META-INF/services/javax.xml.stream.XMLInputFactory,
META-INF/services/javax.xml.stream.XMLOutputFactory files in jars
available to the JRE. 4. Use the
platform default XMLInputFactory,XMLOutputFactory instance.How to set the XML
encoding in Xstream DataFormat?From Camel 2.2.0, you can set the
encoding of XML in Xstream DataFormat by setting the Exchange's property with
the key Exchange.CHARSET_NAME, or setting the encoding property on
Xstream from DSL or Spring config.
buildbot failure in ASF Buildbot on camel-site-production
The Buildbot has detected a new failure on builder camel-site-production while building ASF Buildbot. Full details are available at: http://ci.apache.org/builders/camel-site-production/builds/18003 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'camel-site-production' triggered this build Build Source Stamp: [branch camel/website] HEAD Blamelist: BUILD FAILED: failed compile sincerely, -The Buildbot
git commit: Added Javadoc.
Repository: camel
Updated Branches:
refs/heads/master de1985b3d -> 0a77f5347
Added Javadoc.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0a77f534
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0a77f534
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0a77f534
Branch: refs/heads/master
Commit: 0a77f53477dc64a118401fed41e548e61d950961
Parents: de1985b
Author: Henryk Konsek
Authored: Wed Apr 9 20:58:35 2014 +0200
Committer: Henryk Konsek
Committed: Wed Apr 9 20:58:35 2014 +0200
--
.../camel/dataformat/xstream/AbstractXStreamWrapper.java| 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0a77f534/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
--
diff --git
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
index e97c6fb..8fc2697 100644
---
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
+++
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
@@ -58,7 +58,14 @@ public abstract class AbstractXStreamWrapper implements
DataFormat {
public AbstractXStreamWrapper(XStream xstream) {
this.xstream = xstream;
}
-
+
+/**
+ * Resolves the XStream instance to be used by this data format. If
XStream is not explicitly set, new instance will
+ * be created and cached.
+ *
+ * @param resolver class resolver to be used during a configuration of the
XStream instance.
+ * @return XStream instance used by this data format.
+ */
public XStream getXStream(ClassResolver resolver) {
if (xstream == null) {
xstream = createXStream(resolver);
git commit: Removed empty version.
Repository: camel
Updated Branches:
refs/heads/master 09bb19851 -> de1985b3d
Removed empty version.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/de1985b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/de1985b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/de1985b3
Branch: refs/heads/master
Commit: de1985b3dd6eb59c18a9ee7e89ae6107bfbbe032
Parents: 09bb198
Author: Henryk Konsek
Authored: Wed Apr 9 20:53:54 2014 +0200
Committer: Henryk Konsek
Committed: Wed Apr 9 20:53:54 2014 +0200
--
.../apache/camel/dataformat/xstream/AbstractXStreamWrapper.java| 2 --
1 file changed, 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/de1985b3/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
--
diff --git
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
index 3aa8a01..e97c6fb 100644
---
a/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
+++
b/components/camel-xstream/src/main/java/org/apache/camel/dataformat/xstream/AbstractXStreamWrapper.java
@@ -41,8 +41,6 @@ import org.apache.camel.util.ObjectHelper;
/**
* An abstract class which implement http://camel.apache.org/data-format.html";>data format
* ({@link DataFormat}) interface which leverage the XStream library for XML
or JSON's marshaling and unmarshaling
- *
- * @version
*/
public abstract class AbstractXStreamWrapper implements DataFormat {
git commit: Fixed typo.
Repository: camel
Updated Branches:
refs/heads/master 5e7ae6928 -> 09bb19851
Fixed typo.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/09bb1985
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/09bb1985
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/09bb1985
Branch: refs/heads/master
Commit: 09bb198513b111ec5d7de067785862d831b4aaf6
Parents: 5e7ae69
Author: Henryk Konsek
Authored: Wed Apr 9 20:52:10 2014 +0200
Committer: Henryk Konsek
Committed: Wed Apr 9 20:52:10 2014 +0200
--
.../java/org/apache/camel/dataformat/xstream/MarshalListTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/09bb1985/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
--
diff --git
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
index 31e7dcf..350e3af 100644
---
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
+++
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
@@ -29,7 +29,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
/**
- * Marhsal tests with List objects.
+ * Marshal tests with List objects.
*/
public class MarshalListTest extends CamelTestSupport {
git commit: DRYied test.
Repository: camel
Updated Branches:
refs/heads/master abb03ae23 -> 5e7ae6928
DRYied test.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e7ae692
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e7ae692
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e7ae692
Branch: refs/heads/master
Commit: 5e7ae69281142dd3e3a36f94367cc6fe293c735a
Parents: abb03ae
Author: Henryk Konsek
Authored: Wed Apr 9 20:51:34 2014 +0200
Committer: Henryk Konsek
Committed: Wed Apr 9 20:51:34 2014 +0200
--
.../camel/dataformat/xstream/MarshalListTest.java | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5e7ae692/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
--
diff --git
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
index 2d49ac5..31e7dcf 100644
---
a/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
+++
b/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/MarshalListTest.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.apache.camel.EndpointInject;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -32,9 +33,11 @@ import org.junit.Test;
*/
public class MarshalListTest extends CamelTestSupport {
+@EndpointInject(uri = "mock:result")
+MockEndpoint mock;
+
@Test
public void testMarshalList() throws Exception {
-MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.expectedBodiesReceived(""
+ "Hello World");
@@ -49,7 +52,6 @@ public class MarshalListTest extends CamelTestSupport {
@Test
public void testMarshalListWithMap() throws Exception {
-MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.expectedBodiesReceived(
"city"
@@ -64,10 +66,9 @@ public class MarshalListTest extends CamelTestSupport {
mock.assertIsSatisfied();
}
-
+
@Test
public void testSetEncodingOnXstream() throws Exception {
-MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.expectedBodiesReceived(
"city"
@@ -86,8 +87,8 @@ public class MarshalListTest extends CamelTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
-from("direct:in").marshal().xstream().to("mock:result");
-
from("direct:in-UTF-8").marshal().xstream("UTF-8").to("mock:result");
+from("direct:in").marshal().xstream().to(mock);
+from("direct:in-UTF-8").marshal().xstream("UTF-8").to(mock);
}
};
}
[CONF] Apache Camel > XStream
Henryk Konsek edited the page:
XStream
Comment: Added more XStream Java DSL examples
...
Code Block
// lets turn Object messages into XML then send to MQSeries
from("activemq:My.Queue").
marshal().xstream().
to("mqseries:Another.Queue");
If you would like to configure the XStream instance used by the Camel for the message transformation, you can simply pass a reference to that instance on the DSL level.
Code Block
XStream xStream = new XStream();
xStream.aliasField("money", PurchaseOrder.class, "cash");
...
from("direct:marshal").
marshal(new XStreamDataFormat(xStream)).
to("mock:marshaled");
XMLInputFactory and XMLOutputFactory
...
View Online · Like · View Changes
Stop watching space · Manage Notifications
This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[2/2] git commit: Polish the camel-cxf test code to shutdown the spring application context when tearing down the test
Polish the camel-cxf test code to shutdown the spring application context when
tearing down the test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dea8545d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dea8545d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dea8545d
Branch: refs/heads/camel-2.13.x
Commit: dea8545d48f7400dc5c584b33eba7df6b4970a37
Parents: 685e60d
Author: Willem Jiang
Authored: Wed Apr 9 21:58:52 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 22:09:24 2014 +0800
--
.../cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java | 10 --
.../cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java| 9 +++--
2 files changed, 15 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/dea8545d/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
index f6c7d23..a71946a 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
@@ -31,6 +31,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -42,11 +43,12 @@ public class CxfRsProducerClientFactoryCache2Test extends
Assert {
private CamelContext context2;
private ProducerTemplate template2;
+private AbstractApplicationContext applicationContext;
@Before
public void setUp() throws Exception {
-AbstractApplicationContext ac = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest2.xml");
-context2 = SpringCamelContext.springCamelContext(ac, false);
+applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest2.xml");
+context2 = SpringCamelContext.springCamelContext(applicationContext,
false);
context2.start();
template2 = context2.createProducerTemplate();
@@ -59,6 +61,10 @@ public class CxfRsProducerClientFactoryCache2Test extends
Assert {
context2.stop();
template2.stop();
}
+// need to shutdown the application context to shutdown the bus
+if (applicationContext != null) {
+applicationContext.close();
+}
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/dea8545d/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
index ce2a54a..c0ebe14 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
@@ -41,11 +41,12 @@ public class CxfRsProducerClientFactoryCacheTest extends
Assert {
private CamelContext context1;
private ProducerTemplate template1;
+private AbstractApplicationContext applicationContext;
@Before
public void setUp() throws Exception {
-AbstractApplicationContext ac = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml");
-context1 = SpringCamelContext.springCamelContext(ac, false);
+applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml");
+context1 = SpringCamelContext.springCamelContext(applicationContext,
false);
context1.start();
template1 = context1.createProducerTemplate();
template1.start();
@@ -57,6 +58,10 @@ public class CxfRsProducerClientFactoryCacheTest extends
Assert {
context1.stop();
template1.stop();
}
+// need
[1/2] git commit: Polish the camel-cxf test code to shutdown the spring application context when tearing down the test
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x ad9a87acf -> 3e6fcc0ac
refs/heads/camel-2.13.x 685e60dc8 -> dea8545d4
Polish the camel-cxf test code to shutdown the spring application context when
tearing down the test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3e6fcc0a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3e6fcc0a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3e6fcc0a
Branch: refs/heads/camel-2.12.x
Commit: 3e6fcc0ac545e88b8b2b7837d624d65b2df6981f
Parents: ad9a87a
Author: Willem Jiang
Authored: Wed Apr 9 21:58:52 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 22:09:15 2014 +0800
--
.../cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java | 10 --
.../cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java| 9 +++--
2 files changed, 15 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3e6fcc0a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
index f6c7d23..a71946a 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
@@ -31,6 +31,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -42,11 +43,12 @@ public class CxfRsProducerClientFactoryCache2Test extends
Assert {
private CamelContext context2;
private ProducerTemplate template2;
+private AbstractApplicationContext applicationContext;
@Before
public void setUp() throws Exception {
-AbstractApplicationContext ac = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest2.xml");
-context2 = SpringCamelContext.springCamelContext(ac, false);
+applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest2.xml");
+context2 = SpringCamelContext.springCamelContext(applicationContext,
false);
context2.start();
template2 = context2.createProducerTemplate();
@@ -59,6 +61,10 @@ public class CxfRsProducerClientFactoryCache2Test extends
Assert {
context2.stop();
template2.stop();
}
+// need to shutdown the application context to shutdown the bus
+if (applicationContext != null) {
+applicationContext.close();
+}
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/3e6fcc0a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
index ce2a54a..c0ebe14 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
@@ -41,11 +41,12 @@ public class CxfRsProducerClientFactoryCacheTest extends
Assert {
private CamelContext context1;
private ProducerTemplate template1;
+private AbstractApplicationContext applicationContext;
@Before
public void setUp() throws Exception {
-AbstractApplicationContext ac = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml");
-context1 = SpringCamelContext.springCamelContext(ac, false);
+applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml");
+context1 = SpringCamelContext.springCamelContext(applicationContext,
false);
context1.start();
template1 = context1.createProducerTemplate();
template1.start();
@@ -57,6 +58,10 @@ public class CxfRsPr
git commit: Polish the camel-cxf test code to shutdown the spring application context when tearing down the test
Repository: camel
Updated Branches:
refs/heads/master 0b7588449 -> abb03ae23
Polish the camel-cxf test code to shutdown the spring application context when
tearing down the test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/abb03ae2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/abb03ae2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/abb03ae2
Branch: refs/heads/master
Commit: abb03ae23c0497ea035345c7c1a133102c90b7de
Parents: 0b75884
Author: Willem Jiang
Authored: Wed Apr 9 21:58:52 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 21:58:52 2014 +0800
--
.../cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java | 10 --
.../cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java| 9 +++--
2 files changed, 15 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/abb03ae2/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
index f6c7d23..a71946a 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCache2Test.java
@@ -31,6 +31,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.springframework.context.ApplicationContext;
import org.springframework.context.support.AbstractApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -42,11 +43,12 @@ public class CxfRsProducerClientFactoryCache2Test extends
Assert {
private CamelContext context2;
private ProducerTemplate template2;
+private AbstractApplicationContext applicationContext;
@Before
public void setUp() throws Exception {
-AbstractApplicationContext ac = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest2.xml");
-context2 = SpringCamelContext.springCamelContext(ac, false);
+applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest2.xml");
+context2 = SpringCamelContext.springCamelContext(applicationContext,
false);
context2.start();
template2 = context2.createProducerTemplate();
@@ -59,6 +61,10 @@ public class CxfRsProducerClientFactoryCache2Test extends
Assert {
context2.stop();
template2.stop();
}
+// need to shutdown the application context to shutdown the bus
+if (applicationContext != null) {
+applicationContext.close();
+}
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/abb03ae2/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
index ce2a54a..c0ebe14 100644
---
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest.java
@@ -41,11 +41,12 @@ public class CxfRsProducerClientFactoryCacheTest extends
Assert {
private CamelContext context1;
private ProducerTemplate template1;
+private AbstractApplicationContext applicationContext;
@Before
public void setUp() throws Exception {
-AbstractApplicationContext ac = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml");
-context1 = SpringCamelContext.springCamelContext(ac, false);
+applicationContext = new
ClassPathXmlApplicationContext("org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml");
+context1 = SpringCamelContext.springCamelContext(applicationContext,
false);
context1.start();
template1 = context1.createProducerTemplate();
template1.start();
@@ -57,6 +58,10 @@ public class CxfRsProducerClientFactoryCacheTest extends
Assert {
c
[1/2] git commit: Fixed the CxfRsProducerTest with CXF 2.7.11 staging kit
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x 1defc7b36 -> ad9a87acf
refs/heads/camel-2.13.x 27c4a5213 -> 685e60dc8
Fixed the CxfRsProducerTest with CXF 2.7.11 staging kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/685e60dc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/685e60dc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/685e60dc
Branch: refs/heads/camel-2.13.x
Commit: 685e60dc8c5331d4c689956b39336d8a10444cce
Parents: 27c4a52
Author: Willem Jiang
Authored: Wed Apr 9 21:33:10 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 21:48:51 2014 +0800
--
.../component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/685e60dc/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
--
diff --git
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
index f1a3e3b..4597ead 100644
---
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
+++
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
@@ -28,7 +28,7 @@
http://localhost:${CXFTestSupport.port1}/CxfRsProducerTest/";
+
address="http://localhost:${CXFTestSupport.port1}/CxfRsProducerClientFactoryCacheTest/";
staticSubresourceResolution="true">
@@ -37,7 +37,7 @@
- http://localhost:${CXFTestSupport.port1}/CxfRsProducerTest/"/>
+ http://localhost:${CXFTestSupport.port1}/CxfRsProducerClientFactoryCacheTest/"/>
http://camel.apache.org/schema/spring";>
[2/2] git commit: Fixed the CxfRsProducerTest with CXF 2.7.11 staging kit
Fixed the CxfRsProducerTest with CXF 2.7.11 staging kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ad9a87ac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ad9a87ac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ad9a87ac
Branch: refs/heads/camel-2.12.x
Commit: ad9a87acfec5a9d87a7830bf469c1e4162e9c054
Parents: 1defc7b
Author: Willem Jiang
Authored: Wed Apr 9 21:33:10 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 21:49:04 2014 +0800
--
.../component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ad9a87ac/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
--
diff --git
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
index f1a3e3b..4597ead 100644
---
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
+++
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
@@ -28,7 +28,7 @@
http://localhost:${CXFTestSupport.port1}/CxfRsProducerTest/";
+
address="http://localhost:${CXFTestSupport.port1}/CxfRsProducerClientFactoryCacheTest/";
staticSubresourceResolution="true">
@@ -37,7 +37,7 @@
- http://localhost:${CXFTestSupport.port1}/CxfRsProducerTest/"/>
+ http://localhost:${CXFTestSupport.port1}/CxfRsProducerClientFactoryCacheTest/"/>
http://camel.apache.org/schema/spring";>
git commit: Fixed the CxfRsProducerTest with CXF 2.7.11 staging kit
Repository: camel
Updated Branches:
refs/heads/master ed5105800 -> 0b7588449
Fixed the CxfRsProducerTest with CXF 2.7.11 staging kit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b758844
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b758844
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b758844
Branch: refs/heads/master
Commit: 0b7588449871cb814cb0be4c9d7798e8b138ab70
Parents: ed51058
Author: Willem Jiang
Authored: Wed Apr 9 21:33:10 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 21:34:33 2014 +0800
--
.../component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0b758844/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
--
diff --git
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
index f1a3e3b..4597ead 100644
---
a/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
+++
b/components/camel-cxf/src/test/resources/org/apache/camel/component/cxf/jaxrs/CxfRsProducerClientFactoryCacheTest1.xml
@@ -28,7 +28,7 @@
http://localhost:${CXFTestSupport.port1}/CxfRsProducerTest/";
+
address="http://localhost:${CXFTestSupport.port1}/CxfRsProducerClientFactoryCacheTest/";
staticSubresourceResolution="true">
@@ -37,7 +37,7 @@
- http://localhost:${CXFTestSupport.port1}/CxfRsProducerTest/"/>
+ http://localhost:${CXFTestSupport.port1}/CxfRsProducerClientFactoryCacheTest/"/>
http://camel.apache.org/schema/spring";>
[4/5] git commit: Tidy up test for https://issues.apache.org/jira/browse/CAMEL-6918
Tidy up test for https://issues.apache.org/jira/browse/CAMEL-6918
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/665230da
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/665230da
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/665230da
Branch: refs/heads/camel-2.12.x
Commit: 665230dade43ae2e3e02e81be8615bcd25c49adc
Parents: ac492eb
Author: Christian Posta
Authored: Tue Nov 5 08:06:26 2013 -0700
Committer: Willem Jiang
Committed: Wed Apr 9 16:49:00 2014 +0800
--
.../java/org/apache/camel/component/seda/SedaErrorTest.java | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/665230da/camel-core/src/test/java/org/apache/camel/component/seda/SedaErrorTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/seda/SedaErrorTest.java
b/camel-core/src/test/java/org/apache/camel/component/seda/SedaErrorTest.java
index 992d79c..abbf54d 100644
---
a/camel-core/src/test/java/org/apache/camel/component/seda/SedaErrorTest.java
+++
b/camel-core/src/test/java/org/apache/camel/component/seda/SedaErrorTest.java
@@ -30,12 +30,8 @@ public class SedaErrorTest extends ContextTestSupport {
MockEndpoint mockDLC = getMockEndpoint("mock:dlc");
mockDLC.expectedMessageCount(1);
-try {
-for (int i = 0; i < 3; i++) {
-template.send("direct:start",
ExchangeBuilder.anExchange(context).withBody("msg" + i).build());
-}
-} catch (Exception ex) {
-// noop
+for (int i = 0; i < 3; i++) {
+template.send("direct:start",
ExchangeBuilder.anExchange(context).withBody("msg" + i).build());
}
assertMockEndpointsSatisfied();
[2/5] git commit: CAMEL-7353 fixed camel-http4 issue when the hostname stars with http with thanks to Andreas
CAMEL-7353 fixed camel-http4 issue when the hostname stars with http with
thanks to Andreas
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/27c4a521
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/27c4a521
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/27c4a521
Branch: refs/heads/camel-2.13.x
Commit: 27c4a52133406760c5d2769d1ed6807d83a96a27
Parents: dd5faf3
Author: Willem Jiang
Authored: Wed Apr 9 16:14:25 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 16:48:38 2014 +0800
--
.../apache/camel/component/http4/HttpComponent.java| 9 +
.../camel/component/http4/HttpEndpointURLTest.java | 13 -
2 files changed, 13 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/27c4a521/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index 5eb3ee3..e7820cd 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -208,14 +208,7 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
boolean secure = HttpHelper.isSecureConnection(uri) ||
sslContextParameters != null;
// need to set scheme on address uri depending on if its secure or not
-String addressUri = remaining.startsWith("http") ? remaining : null;
-if (addressUri == null) {
-if (secure) {
-addressUri = "https://"; + remaining;
-} else {
-addressUri = "http://"; + remaining;
-}
-}
+String addressUri = (secure ? "https://"; : "http://";) + remaining;
addressUri = UnsafeUriCharactersEncoder.encodeHttpURI(addressUri);
URI uriHttpUriAddress = new URI(addressUri);
http://git-wip-us.apache.org/repos/asf/camel/blob/27c4a521/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
--
diff --git
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
index eadd2b5..2fa01a5 100644
---
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
+++
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.http4;
+import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -32,10 +33,20 @@ public class HttpEndpointURLTest extends CamelTestSupport {
HttpEndpoint http1 = context.getEndpoint("http4://www.google.com",
HttpEndpoint.class);
HttpEndpoint http2 =
context.getEndpoint("https4://www.google.com?test=parameter&proxyAuthHost=myotherproxy&proxyAuthPort=2345",
HttpEndpoint.class);
HttpEndpoint http3 =
context.getEndpoint("https4://www.google.com?test=parameter",
HttpEndpoint.class);
-
+
assertEquals("Get a wrong HttpUri of http1", "http://www.google.com";,
http1.getHttpUri().toString());
assertEquals("Get a wrong HttpUri of http2",
"https://www.google.com?test=parameter";, http2.getHttpUri().toString());
assertEquals("Get a wrong HttpUri of http2 andhttp3",
http2.getHttpUri(), http3.getHttpUri());
+
+try {
+// need to catch the exception here
+context.getEndpoint("https4://http://www.google.com";,
HttpEndpoint.class);
+fail("need to throw an exception here");
+} catch (ResolveEndpointFailedException ex) {
+assertTrue("Get a wrong exception message",
ex.getMessage().indexOf("You have duplicated the http(s) protocol") > 0);
+}
+
+
}
}
[5/5] git commit: CAMEL-7353 fixed camel-http4 issue when the hostname stars with http with thanks to Andreas
CAMEL-7353 fixed camel-http4 issue when the hostname stars with http with
thanks to Andreas
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1defc7b3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1defc7b3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1defc7b3
Branch: refs/heads/camel-2.12.x
Commit: 1defc7b363e021c8265883ea2bf7fca559114cd2
Parents: 665230d
Author: Willem Jiang
Authored: Wed Apr 9 16:14:25 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 16:49:33 2014 +0800
--
.../apache/camel/component/http4/HttpComponent.java| 9 +
.../camel/component/http4/HttpEndpointURLTest.java | 13 -
2 files changed, 13 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1defc7b3/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index 1406968..aa4083b 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -208,14 +208,7 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
boolean secure = HttpHelper.isSecureConnection(uri) ||
sslContextParameters != null;
// need to set scheme on address uri depending on if its secure or not
-String addressUri = remaining.startsWith("http") ? remaining : null;
-if (addressUri == null) {
-if (secure) {
-addressUri = "https://"; + remaining;
-} else {
-addressUri = "http://"; + remaining;
-}
-}
+String addressUri = (secure ? "https://"; : "http://";) + remaining;
addressUri = UnsafeUriCharactersEncoder.encodeHttpURI(addressUri);
URI uriHttpUriAddress = new URI(addressUri);
http://git-wip-us.apache.org/repos/asf/camel/blob/1defc7b3/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
--
diff --git
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
index eadd2b5..2fa01a5 100644
---
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
+++
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.http4;
+import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -32,10 +33,20 @@ public class HttpEndpointURLTest extends CamelTestSupport {
HttpEndpoint http1 = context.getEndpoint("http4://www.google.com",
HttpEndpoint.class);
HttpEndpoint http2 =
context.getEndpoint("https4://www.google.com?test=parameter&proxyAuthHost=myotherproxy&proxyAuthPort=2345",
HttpEndpoint.class);
HttpEndpoint http3 =
context.getEndpoint("https4://www.google.com?test=parameter",
HttpEndpoint.class);
-
+
assertEquals("Get a wrong HttpUri of http1", "http://www.google.com";,
http1.getHttpUri().toString());
assertEquals("Get a wrong HttpUri of http2",
"https://www.google.com?test=parameter";, http2.getHttpUri().toString());
assertEquals("Get a wrong HttpUri of http2 andhttp3",
http2.getHttpUri(), http3.getHttpUri());
+
+try {
+// need to catch the exception here
+context.getEndpoint("https4://http://www.google.com";,
HttpEndpoint.class);
+fail("need to throw an exception here");
+} catch (ResolveEndpointFailedException ex) {
+assertTrue("Get a wrong exception message",
ex.getMessage().indexOf("You have duplicated the http(s) protocol") > 0);
+}
+
+
}
}
[1/5] git commit: CAMEL-7355 Moving HttpPollingConsumer to use HttpClient 4.3.x API
Repository: camel
Updated Branches:
refs/heads/camel-2.12.x d6a956bd7 -> 1defc7b36
refs/heads/camel-2.13.x b70ce042b -> 27c4a5213
CAMEL-7355 Moving HttpPollingConsumer to use HttpClient 4.3.x API
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dd5faf3a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dd5faf3a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dd5faf3a
Branch: refs/heads/camel-2.13.x
Commit: dd5faf3a3c5d0e2e856de2bef37a7d0bc521ce0d
Parents: b70ce04
Author: Willem Jiang
Authored: Wed Apr 9 16:08:50 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 16:48:28 2014 +0800
--
.../apache/camel/component/http4/HttpComponent.java | 14 --
.../camel/component/http4/HttpPollingConsumer.java| 9 ++---
.../camel/component/http4/helper/HttpHelper.java | 2 +-
3 files changed, 7 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/dd5faf3a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index 1e80f00..5eb3ee3 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -302,20 +302,6 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return endpoint;
}
-
-private static int getPort(URI uri) {
-int port = uri.getPort();
-if (port < 0) {
-if ("http4".equals(uri.getScheme()) ||
"http".equals(uri.getScheme())) {
-port = 80;
-} else if ("https4".equals(uri.getScheme()) ||
"https".equals(uri.getScheme())) {
-port = 443;
-} else {
-throw new IllegalArgumentException("Unknown scheme, cannot
determine port number for uri: " + uri);
-}
-}
-return port;
-}
protected Registry
createConnectionRegistry(X509HostnameVerifier x509HostnameVerifier,
SSLContextParameters sslContextParams)
throws GeneralSecurityException, IOException {
http://git-wip-us.apache.org/repos/asf/camel/blob/dd5faf3a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
index 9ecf668..3cfb8ec 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
@@ -28,9 +28,10 @@ import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.util.EntityUtils;
/**
@@ -63,16 +64,18 @@ public class HttpPollingConsumer extends
PollingConsumerSupport {
protected Exchange doReceive(int timeout) {
Exchange exchange = endpoint.createExchange();
HttpRequestBase method = createMethod(exchange);
+HttpClientContext httpClientContext = new HttpClientContext();
// set optional timeout in millis
if (timeout > 0) {
-HttpConnectionParams.setSoTimeout(method.getParams(), timeout);
+RequestConfig requestConfig =
RequestConfig.custom().setSocketTimeout(timeout).build();
+httpClientContext.setRequestConfig(requestConfig);
}
HttpEntity responeEntity = null;
try {
// execute request
-HttpResponse response = httpClient.execute(method);
+HttpResponse response = httpClient.execute(method,
httpClientContext);
int responseCode = response.getStatusLine().getStatusCode();
responeEntity = response.getEntity();
Object body =
HttpHelper.readResponseBodyFromInputStream(responeEntity.getContent(),
exchange);
http://git-wip-us.apache.org/repos/asf/camel/blob/dd5faf3a/components/camel-http4/src/main/java/org/apache/camel/compon
[3/5] git commit: Fix for https://issues.apache.org/jira/browse/CAMEL-6918 - Error handler for SEDA producer doesn't work - added exception handling in the SendProducer + tests
Fix for https://issues.apache.org/jira/browse/CAMEL-6918 - Error handler for
SEDA producer doesn't work - added exception handling in the SendProducer +
tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ac492ebc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ac492ebc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ac492ebc
Branch: refs/heads/camel-2.12.x
Commit: ac492ebcc7f4bdd6b63cb7f9eaea7958833f09f3
Parents: d6a956b
Author: Christian Posta
Authored: Mon Nov 4 15:25:28 2013 -0700
Committer: Willem Jiang
Committed: Wed Apr 9 16:49:00 2014 +0800
--
.../apache/camel/processor/SendProcessor.java | 35 +++-
.../camel/component/seda/SedaErrorTest.java | 56
2 files changed, 79 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ac492ebc/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
b/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
index b7d3c3c..6ba6fc8 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/SendProcessor.java
@@ -107,20 +107,31 @@ public class SendProcessor extends ServiceSupport
implements AsyncProcessor, Tra
EventHelper.notifyExchangeSending(exchange.getContext(), target,
destination);
LOG.debug(" {} {}", destination, exchange);
-return producer.process(exchange, new AsyncCallback() {
-@Override
-public void done(boolean doneSync) {
-try {
-// restore previous MEP
-target.setPattern(existingPattern);
-// emit event that the exchange was sent to the
endpoint
-long timeTaken = watch.stop();
-EventHelper.notifyExchangeSent(target.getContext(),
target, destination, timeTaken);
-} finally {
-callback.done(doneSync);
+
+boolean sync = true;
+try {
+sync = producer.process(exchange, new AsyncCallback() {
+@Override
+public void done(boolean doneSync) {
+try {
+// restore previous MEP
+target.setPattern(existingPattern);
+// emit event that the exchange was sent to the
endpoint
+long timeTaken = watch.stop();
+
EventHelper.notifyExchangeSent(target.getContext(), target, destination,
timeTaken);
+} finally {
+callback.done(doneSync);
+}
}
+});
+} catch (Throwable throwable) {
+if (exchange != null) {
+exchange.setException(throwable);
}
-});
+
+}
+
+return sync;
}
// send the exchange to the destination using the producer cache for
the non optimized producers
http://git-wip-us.apache.org/repos/asf/camel/blob/ac492ebc/camel-core/src/test/java/org/apache/camel/component/seda/SedaErrorTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/seda/SedaErrorTest.java
b/camel-core/src/test/java/org/apache/camel/component/seda/SedaErrorTest.java
new file mode 100644
index 000..992d79c
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/component/seda/SedaErrorTest.java
@@ -0,0 +1,56 @@
+/**
+ * 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.seda;
+
+import org.apache.camel.ContextTestSupport;
+import o
[2/2] git commit: CAMEL-7355 Moving HttpPollingConsumer to use HttpClient 4.3.x API
CAMEL-7355 Moving HttpPollingConsumer to use HttpClient 4.3.x API
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4fa5ffcf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4fa5ffcf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4fa5ffcf
Branch: refs/heads/master
Commit: 4fa5ffcf9833281b09bff09315810436e41529b3
Parents: 504b12c
Author: Willem Jiang
Authored: Wed Apr 9 16:08:50 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 16:41:58 2014 +0800
--
.../apache/camel/component/http4/HttpComponent.java | 14 --
.../camel/component/http4/HttpPollingConsumer.java| 9 ++---
.../camel/component/http4/helper/HttpHelper.java | 2 +-
3 files changed, 7 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4fa5ffcf/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index 1e80f00..5eb3ee3 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -302,20 +302,6 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return endpoint;
}
-
-private static int getPort(URI uri) {
-int port = uri.getPort();
-if (port < 0) {
-if ("http4".equals(uri.getScheme()) ||
"http".equals(uri.getScheme())) {
-port = 80;
-} else if ("https4".equals(uri.getScheme()) ||
"https".equals(uri.getScheme())) {
-port = 443;
-} else {
-throw new IllegalArgumentException("Unknown scheme, cannot
determine port number for uri: " + uri);
-}
-}
-return port;
-}
protected Registry
createConnectionRegistry(X509HostnameVerifier x509HostnameVerifier,
SSLContextParameters sslContextParams)
throws GeneralSecurityException, IOException {
http://git-wip-us.apache.org/repos/asf/camel/blob/4fa5ffcf/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
index 9ecf668..3cfb8ec 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpPollingConsumer.java
@@ -28,9 +28,10 @@ import org.apache.http.Header;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
+import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.params.HttpConnectionParams;
+import org.apache.http.client.protocol.HttpClientContext;
import org.apache.http.util.EntityUtils;
/**
@@ -63,16 +64,18 @@ public class HttpPollingConsumer extends
PollingConsumerSupport {
protected Exchange doReceive(int timeout) {
Exchange exchange = endpoint.createExchange();
HttpRequestBase method = createMethod(exchange);
+HttpClientContext httpClientContext = new HttpClientContext();
// set optional timeout in millis
if (timeout > 0) {
-HttpConnectionParams.setSoTimeout(method.getParams(), timeout);
+RequestConfig requestConfig =
RequestConfig.custom().setSocketTimeout(timeout).build();
+httpClientContext.setRequestConfig(requestConfig);
}
HttpEntity responeEntity = null;
try {
// execute request
-HttpResponse response = httpClient.execute(method);
+HttpResponse response = httpClient.execute(method,
httpClientContext);
int responseCode = response.getStatusLine().getStatusCode();
responeEntity = response.getEntity();
Object body =
HttpHelper.readResponseBodyFromInputStream(responeEntity.getContent(),
exchange);
http://git-wip-us.apache.org/repos/asf/camel/blob/4fa5ffcf/components/camel-http4/src/main/java/org/apache/camel/component/http4/helper/HttpHelper.java
--
diff --git
a/components/camel-http4/s
[1/2] git commit: CAMEL-7353 fixed camel-http4 issue when the hostname stars with http with thanks to Andreas
Repository: camel
Updated Branches:
refs/heads/master 504b12caf -> ed5105800
CAMEL-7353 fixed camel-http4 issue when the hostname stars with http with
thanks to Andreas
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed510580
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed510580
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed510580
Branch: refs/heads/master
Commit: ed51058008cf92bc10da3a4ccbfc80292d3f3241
Parents: 4fa5ffc
Author: Willem Jiang
Authored: Wed Apr 9 16:14:25 2014 +0800
Committer: Willem Jiang
Committed: Wed Apr 9 16:41:58 2014 +0800
--
.../apache/camel/component/http4/HttpComponent.java| 9 +
.../camel/component/http4/HttpEndpointURLTest.java | 13 -
2 files changed, 13 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ed510580/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index 5eb3ee3..e7820cd 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -208,14 +208,7 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
boolean secure = HttpHelper.isSecureConnection(uri) ||
sslContextParameters != null;
// need to set scheme on address uri depending on if its secure or not
-String addressUri = remaining.startsWith("http") ? remaining : null;
-if (addressUri == null) {
-if (secure) {
-addressUri = "https://"; + remaining;
-} else {
-addressUri = "http://"; + remaining;
-}
-}
+String addressUri = (secure ? "https://"; : "http://";) + remaining;
addressUri = UnsafeUriCharactersEncoder.encodeHttpURI(addressUri);
URI uriHttpUriAddress = new URI(addressUri);
http://git-wip-us.apache.org/repos/asf/camel/blob/ed510580/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
--
diff --git
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
index eadd2b5..2fa01a5 100644
---
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
+++
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpEndpointURLTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.http4;
+import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -32,10 +33,20 @@ public class HttpEndpointURLTest extends CamelTestSupport {
HttpEndpoint http1 = context.getEndpoint("http4://www.google.com",
HttpEndpoint.class);
HttpEndpoint http2 =
context.getEndpoint("https4://www.google.com?test=parameter&proxyAuthHost=myotherproxy&proxyAuthPort=2345",
HttpEndpoint.class);
HttpEndpoint http3 =
context.getEndpoint("https4://www.google.com?test=parameter",
HttpEndpoint.class);
-
+
assertEquals("Get a wrong HttpUri of http1", "http://www.google.com";,
http1.getHttpUri().toString());
assertEquals("Get a wrong HttpUri of http2",
"https://www.google.com?test=parameter";, http2.getHttpUri().toString());
assertEquals("Get a wrong HttpUri of http2 andhttp3",
http2.getHttpUri(), http3.getHttpUri());
+
+try {
+// need to catch the exception here
+context.getEndpoint("https4://http://www.google.com";,
HttpEndpoint.class);
+fail("need to throw an exception here");
+} catch (ResolveEndpointFailedException ex) {
+assertTrue("Get a wrong exception message",
ex.getMessage().indexOf("You have duplicated the http(s) protocol") > 0);
+}
+
+
}
}
git commit: upgrade slf4j from 1.7.5 to 1.7.7
Repository: camel Updated Branches: refs/heads/camel-2.12.x fb84e1915 -> d6a956bd7 upgrade slf4j from 1.7.5 to 1.7.7 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d6a956bd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d6a956bd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d6a956bd Branch: refs/heads/camel-2.12.x Commit: d6a956bd77b13fc8759456c41709539724a998fd Parents: fb84e19 Author: cmueller Authored: Wed Apr 9 09:00:17 2014 +0200 Committer: cmueller Committed: Wed Apr 9 09:00:17 2014 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/d6a956bd/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 69b3cac..cf04011 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -355,7 +355,7 @@ 1.2.3 1.6.6 -1.7.5 +1.7.7 3.2.1_1 3.2.1 1.0.4.1_1
