camel git commit: CAMEL-8383: CXFRS Consumer processors should be able to use JAX-RS contexts. Thanks to Sergey for the patch.
Repository: camel
Updated Branches:
refs/heads/master 6560d5bbf - e086d29fa
CAMEL-8383: CXFRS Consumer processors should be able to use JAX-RS contexts.
Thanks to Sergey for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e086d29f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e086d29f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e086d29f
Branch: refs/heads/master
Commit: e086d29fa73cf4bcd628f3874a450d8bb662593b
Parents: 6560d5b
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 09:24:49 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Mar 1 09:24:49 2015 +0100
--
.../component/cxf/jaxrs/CxfRsEndpoint.java | 10
.../camel/component/cxf/jaxrs/CxfRsInvoker.java | 56
.../component/cxf/jaxrs/CxfRsConsumerTest.java | 28 +-
3 files changed, 71 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e086d29f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
index 3680c58..68a0cbe 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java
@@ -121,6 +121,8 @@ public class CxfRsEndpoint extends DefaultEndpoint
implements HeaderFilterStrate
@UriParam
private boolean performInvocation;
@UriParam
+private boolean propagateContexts;
+@UriParam
private String modelRef;
private ListFeature features = new
ModCountCopyOnWriteArrayListFeature();
private InterceptorHolder interceptorHolder = new InterceptorHolder();
@@ -621,4 +623,12 @@ public class CxfRsEndpoint extends DefaultEndpoint
implements HeaderFilterStrate
public void setPerformInvocation(boolean performInvocation) {
this.performInvocation = performInvocation;
}
+
+public boolean isPropagateContexts() {
+return propagateContexts;
+}
+
+public void setPropagateContexts(boolean propagateContexts) {
+this.propagateContexts = propagateContexts;
+}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/e086d29f/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
index 179ec05..fb999f0 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/jaxrs/CxfRsInvoker.java
@@ -19,6 +19,10 @@ package org.apache.camel.component.cxf.jaxrs;
import java.lang.reflect.Method;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.Request;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
import org.apache.camel.AsyncCallback;
import org.apache.camel.ExchangePattern;
@@ -26,6 +30,10 @@ import org.apache.camel.RuntimeCamelException;
import org.apache.cxf.continuations.Continuation;
import org.apache.cxf.continuations.ContinuationProvider;
import org.apache.cxf.jaxrs.JAXRSInvoker;
+import org.apache.cxf.jaxrs.impl.HttpHeadersImpl;
+import org.apache.cxf.jaxrs.impl.RequestImpl;
+import org.apache.cxf.jaxrs.impl.SecurityContextImpl;
+import org.apache.cxf.jaxrs.impl.UriInfoImpl;
import org.apache.cxf.jaxrs.model.OperationResourceInfo;
import org.apache.cxf.message.Exchange;
import org.slf4j.Logger;
@@ -74,16 +82,7 @@ public class CxfRsInvoker extends JAXRSInvoker {
Object[] paramArray, final Continuation
continuation, Object response) throws Exception {
synchronized (continuation) {
if (continuation.isNew()) {
-ExchangePattern ep = ExchangePattern.InOut;
-if (method.getReturnType() == Void.class) {
-ep = ExchangePattern.InOnly;
-}
-final org.apache.camel.Exchange camelExchange =
endpoint.createExchange(ep);
-if (response != null) {
-camelExchange.getOut().setBody(response);
-}
-CxfRsBinding binding = endpoint.getBinding();
-binding.populateExchangeFromCxfRsRequest(cxfExchange,
[5/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ed62696d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ed62696d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ed62696d
Branch: refs/heads/master
Commit: ed62696dddabf62126486b382a9673c5215334fb
Parents: 13dd368
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 10:54:35 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Mar 1 10:54:35 2015 +0100
--
parent/pom.xml | 5 +++--
platforms/karaf/features/src/main/resources/features.xml | 7 ++-
2 files changed, 5 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ed62696d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 055c598..ffaa2e9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -290,7 +290,7 @@
jt400-bundle-version6.7_1/jt400-bundle-version
juel-bundle-version2.1.3_1/juel-bundle-version
juel-version2.1.3/juel-version
-junit-bundle-version4.12_1/junit-bundle-version
+junit-bundle-version4.11_2/junit-bundle-version
junit-version4.12/junit-version
jython-version2.5.3/jython-version
jzlib-version1.1.3/jzlib-version
@@ -344,7 +344,8 @@
mqtt-client-version1.10/mqtt-client-version
msv-version2013.6.1/msv-version
mustache-java-version0.9.0/mustache-java-version
-mustache-bundle-version0.9.0_1/mustache-bundle-version
+mustache-guava-version16.0/mustache-guava-version
+mustache-bundle-version0.8.16_1/mustache-bundle-version
mvel-version2.2.1.Final/mvel-version
mybatis-version3.2.8/mybatis-version
neethi-bundle-version3.0.1/neethi-bundle-version
http://git-wip-us.apache.org/repos/asf/camel/blob/ed62696d/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 59fba34..f089606 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -972,13 +972,10 @@
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.isorelax/${isorelax-bundle-version}/bundle
feature version='${project.version}'camel-core/feature
bundlemvn:org.apache.camel/camel-msv/${project.version}/bundle
- /feature
- !-- TODO: The mustache bundle is flawed and requires ruby and scala and
guava 13.0, see SMX4-1477 --
+ /feature
feature name='camel-mustache' version='${project.version}' resolver='(obr)'
start-level='50'
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.mustache-compiler/${mustache-bundle-version}/bundle
-bundle dependency='true'mvn:com.google.guava/guava/13.0.1/bundle
-feature version='${project.version}'camel-ruby/feature
-feature version='${project.version}'camel-scala/feature
+bundle
dependency='true'mvn:com.google.guava/guava/${mustache-guava-version}/bundle
feature version='${project.version}'camel-core/feature
bundlemvn:org.apache.camel/camel-mustache/${project.version}/bundle
/feature
[4/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/13dd3684
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/13dd3684
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/13dd3684
Branch: refs/heads/master
Commit: 13dd3684314ec50327c7e1e329829915366fcfd7
Parents: 995ac55
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 09:58:05 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Mar 1 09:58:05 2015 +0100
--
parent/pom.xml | 6 +++---
platforms/karaf/features/src/main/resources/features.xml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/13dd3684/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 243a8511..055c598 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -250,7 +250,7 @@
jcr-version2.0/jcr-version
jdom-bundle-version1.1_4/jdom-bundle-version
jdom-version1.1.3/jdom-version
-jedis-client-bundle-version2.1.0_1/jedis-client-bundle-version
+jedis-client-bundle-version2.6.2_1/jedis-client-bundle-version
jetty6-bundle-version6.1.26_4/jetty6-bundle-version
jetty6-version6.1.26/jetty6-version
jetty8-version8.1.16.v20140903/jetty8-version
@@ -359,7 +359,6 @@
oncrpc-version1.1.2/oncrpc-version
openejb-version4.6.0.2/openejb-version
openjpa-version2.3.0/openjpa-version
-opensaml-version2.5.1_2/opensaml-version
openshift-java-client-version2.5.0.Final/openshift-java-client-version
optaplanner-version6.1.0.Final/optaplanner-version
oro-bundle-version2.0.8_6/oro-bundle-version
@@ -400,7 +399,8 @@
scala-maven-plugin-version3.2.0/scala-maven-plugin-version
scalatest-version2.2.0/scalatest-version
scalaxml-version1.0.3/scalaxml-version
-scribe-version1.3.5/scribe-version
+scribe-version1.3.7/scribe-version
+scribe-bundle-version1.3.7_1/scribe-bundle-version
scriptengines-version1.1.1/scriptengines-version
serp-bundle-version1.14.1_1/serp-bundle-version
servicemix-specs-version2.2.0/servicemix-specs-version
http://git-wip-us.apache.org/repos/asf/camel/blob/13dd3684/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 8c4e9e4..59fba34 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1571,7 +1571,7 @@
feature name='camel-yammer' version='${project.version}' resolver='(obr)'
start-level='50'
bundle
dependency='true'mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}/bundle
bundle
dependency='true'mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}/bundle
-bundle
dependency='true'wrap:mvn:org.scribe/scribe/${scribe-version}/bundle
+bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scribe/${scribe-bundle-version}/bundle
feature version='${project.version}'camel-core/feature
bundlemvn:org.apache.camel/camel-yammer/${project.version}/bundle
/feature
[3/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
CAMEL-8331: OSGi bundle upgrades Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/995ac557 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/995ac557 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/995ac557 Branch: refs/heads/master Commit: 995ac557810dbd87f6c34e2707aa6eb8df883380 Parents: ef82722 Author: Claus Ibsen davscl...@apache.org Authored: Sun Mar 1 09:51:14 2015 +0100 Committer: Claus Ibsen davscl...@apache.org Committed: Sun Mar 1 09:51:14 2015 +0100 -- parent/pom.xml | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/995ac557/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 6b45ad8..243a8511 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -137,7 +137,7 @@ easymock-version3.2/easymock-version eclipse-compiler-version4.2.2/eclipse-compiler-version eclipse-equinox-common-version3.3.0-v20070426/eclipse-equinox-common-version -ehcache-version2.9.0/ehcache-version +ehcache-version2.9.1/ehcache-version egit-github-core-version2.1.5/egit-github-core-version elasticsearch-bundle-version1.4.2_1/elasticsearch-bundle-version elasticsearch-version1.4.2/elasticsearch-version @@ -290,8 +290,8 @@ jt400-bundle-version6.7_1/jt400-bundle-version juel-bundle-version2.1.3_1/juel-bundle-version juel-version2.1.3/juel-version -junit-bundle-version4.11_2/junit-bundle-version -junit-version4.11/junit-version +junit-bundle-version4.12_1/junit-bundle-version +junit-version4.12/junit-version jython-version2.5.3/jython-version jzlib-version1.1.3/jzlib-version kafka-version0.8.1.1/kafka-version @@ -343,8 +343,8 @@ mongo-java-driver-version2.12.4/mongo-java-driver-version mqtt-client-version1.10/mqtt-client-version msv-version2013.6.1/msv-version -mustache-java-version0.8.17/mustache-java-version -mustache-bundle-version0.8.16_1/mustache-bundle-version +mustache-java-version0.9.0/mustache-java-version +mustache-bundle-version0.9.0_1/mustache-bundle-version mvel-version2.2.1.Final/mvel-version mybatis-version3.2.8/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version @@ -420,7 +420,7 @@ solr-version-range[4.9,5)/solr-version-range spark-rest-version2.0.0/spark-rest-version spark-rest-bundle-version2.0.0_1/spark-rest-bundle-version -splunk-version1.3.0_1/splunk-version +splunk-version1.3.2.0_1/splunk-version spring-batch-version3.0.3.RELEASE/spring-batch-version spring-batch-bundle-version3.0.3.RELEASE_1/spring-batch-bundle-version spring-boot-version1.2.1.RELEASE/spring-boot-version
[1/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
Repository: camel
Updated Branches:
refs/heads/master e086d29fa - df4a9413e
CAMEL-8331: OSGi bundle upgrades
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ead9be3d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ead9be3d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ead9be3d
Branch: refs/heads/master
Commit: ead9be3d186f5655b66d35b60582551abf73bc5d
Parents: e086d29
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 09:40:53 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Mar 1 09:40:53 2015 +0100
--
parent/pom.xml | 1 +
platforms/karaf/features/src/main/resources/features.xml | 7 +++
2 files changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ead9be3d/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 05459fb..0c5f2d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -419,6 +419,7 @@
solr-version4.9.0/solr-version
solr-version-range[4.9,5)/solr-version-range
spark-rest-version2.0.0/spark-rest-version
+spark-rest-bundle-version2.0.0_1/spark-rest-bundle-version
splunk-version1.3.0_1/splunk-version
spring-batch-version3.0.3.RELEASE/spring-batch-version
spring-batch-bundle-version3.0.3.RELEASE_1/spring-batch-bundle-version
http://git-wip-us.apache.org/repos/asf/camel/blob/ead9be3d/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index 27d60d6..8c4e9e4 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1290,6 +1290,13 @@
bundle
dependency='true'mvn:commons-io/commons-io/${commons-io-version}/bundle
bundlemvn:org.apache.camel/camel-solr/${project.version}/bundle
/feature
+ feature name='camel-spark-rest' version='${project.version}'
resolver='(obr)' start-level='50'
+detailsThe camel-spark-rest feature requires Java 8 and Jetty9/details
+feature version='${project.version}'camel-core/feature
+feature version='${project.version}'camel-jetty9/feature
+bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.sparkjava-core/${spark-rest-bundle-version}/bundle
+bundlemvn:org.apache.camel/camel-spark-rest/${project.version}/bundle
+ /feature
feature name='camel-splunk' version='${project.version}' resolver='(obr)'
start-level='50'
feature version='${project.version}'camel-core/feature
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.splunk/${splunk-version}/bundle
[6/6] camel git commit: Get stuff work with OSGi
Get stuff work with OSGi
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df4a9413
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df4a9413
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df4a9413
Branch: refs/heads/master
Commit: df4a9413ec5a18ac58a1d91ea3ec701d75e04091
Parents: ed62696
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 11:49:00 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Mar 1 11:49:00 2015 +0100
--
parent/pom.xml | 1 -
platforms/karaf/features/src/main/resources/features.xml | 7 ---
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/df4a9413/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index ffaa2e9..c3eb356 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -527,7 +527,6 @@
org.eclipse.jetty.*;version=[8.0,10),
com.thoughtworks.xstream.*;version=[1.3,2),
org.antlr.stringtemplate.*;version=[3.0,4),
- org.jivesoftware.smack.*;version=[3.0,4),
org.ccil.cowan.tagsoup.*;version=[1.2,2),
org.mortbay.cometd.*;version=[6.1,7),
org.slf4j.*;version=[1.6,2),
http://git-wip-us.apache.org/repos/asf/camel/blob/df4a9413/platforms/karaf/features/src/main/resources/features.xml
--
diff --git a/platforms/karaf/features/src/main/resources/features.xml
b/platforms/karaf/features/src/main/resources/features.xml
index f089606..7bf0838 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1548,9 +1548,9 @@
/feature
feature name='camel-xmpp' version='${project.version}' resolver='(obr)'
start-level='50'
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}/bundle
-bundle
dependency='true'mvn:org.igniterealtime.smack/smack-core/${smack-bundle-version}/bundle
-bundle
dependency='true'mvn:org.igniterealtime.smack/smack-tcp/${smack-bundle-version}/bundle
-bundle
dependency='true'mvn:org.igniterealtime.smack/smack-extensions/${smack-bundle-version}/bundle
+bundle
dependency='true'mvn:org.igniterealtime.smack/smack-core/${smack-version}/bundle
+bundle
dependency='true'mvn:org.igniterealtime.smack/smack-tcp/${smack-version}/bundle
+bundle
dependency='true'mvn:org.igniterealtime.smack/smack-extensions/${smack-version}/bundle
feature version='${project.version}'camel-core/feature
bundlemvn:org.apache.camel/camel-xmpp/${project.version}/bundle
/feature
@@ -1569,6 +1569,7 @@
bundle
dependency='true'mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}/bundle
bundle
dependency='true'mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}/bundle
bundle
dependency='true'mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scribe/${scribe-bundle-version}/bundle
+bundle
dependency='true'mvn:commons-codec/commons-codec/${commons-codec-version}/bundle
feature version='${project.version}'camel-core/feature
bundlemvn:org.apache.camel/camel-yammer/${project.version}/bundle
/feature
[2/6] camel git commit: CAMEL-8331: OSGi bundle upgrades
CAMEL-8331: OSGi bundle upgrades Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef827229 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef827229 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef827229 Branch: refs/heads/master Commit: ef8272295f66626d3bdaf5b3ef71b02f75613453 Parents: ead9be3 Author: Claus Ibsen davscl...@apache.org Authored: Sun Mar 1 09:45:36 2015 +0100 Committer: Claus Ibsen davscl...@apache.org Committed: Sun Mar 1 09:45:36 2015 +0100 -- parent/pom.xml | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/ef827229/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 0c5f2d9..6b45ad8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -139,7 +139,7 @@ eclipse-equinox-common-version3.3.0-v20070426/eclipse-equinox-common-version ehcache-version2.9.0/ehcache-version egit-github-core-version2.1.5/egit-github-core-version -elasticsearch-bundle-version1.4.1_1/elasticsearch-bundle-version +elasticsearch-bundle-version1.4.2_1/elasticsearch-bundle-version elasticsearch-version1.4.2/elasticsearch-version el-api-1.0-version1.0.1/el-api-1.0-version embedmongo-version1.46.4/embedmongo-version @@ -305,8 +305,8 @@ !-- virtual dependency only used by Eclipse m2e -- lifecycle-mapping-version1.0.0/lifecycle-mapping-version log4j-version1.2.17/log4j-version -lucene-bundle-version4.10.2_1/lucene-bundle-version -lucene-version4.10.2/lucene-version +lucene-bundle-version4.10.3_1/lucene-bundle-version +lucene-version4.10.3/lucene-version lucene-version-range[4.5,5)/lucene-version-range lightcouch-version0.1.3/lightcouch-version lightcouch-bundle-version0.1.3_1/lightcouch-bundle-version @@ -414,7 +414,7 @@ smack-version4.0.6/smack-version snakeyaml-version1.14/snakeyaml-version snappy-version1.1.0.1/snappy-version -snmp4j-version2.3.0_1/snmp4j-version +snmp4j-version2.3.3_1/snmp4j-version solr-bundle-version4.9.0_1/solr-bundle-version solr-version4.9.0/solr-version solr-version-range[4.9,5)/solr-version-range @@ -451,7 +451,7 @@ stompjms-version1.19/stompjms-version swagger-version1.3.12/swagger-version swagger-guava-version15.0/swagger-guava-version -swagger-bundle-version1.3.11_1/swagger-bundle-version +swagger-bundle-version1.3.12_1/swagger-bundle-version stax-api-version1.0.1/stax-api-version stax2-api-bundle-version3.1.4/stax2-api-bundle-version stringtemplate-bundle-version4.0.2_2/stringtemplate-bundle-version
svn commit: r941802 - in /websites/production/camel/content: cache/main.pageCache camel-2150-release.html
Author: buildbot Date: Sun Mar 1 08:18:13 2015 New Revision: 941802 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2150-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2150-release.html == --- websites/production/camel/content/camel-2150-release.html (original) +++ websites/production/camel/content/camel-2150-release.html Sun Mar 1 08:18:13 2015 @@ -84,7 +84,7 @@ tbody tr td valign=top width=100% -div class=wiki-content maincontenth1 id=Camel2.15.0Release-Camel2.15.0release(currentlyinprogress)Camel#160;2.15.0 release (currently in progress)/h1div style=padding-right:20px;float:left;margin-left:-20px;pimg class=confluence-embedded-image confluence-external-resource src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; data-image-src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;/p/divdiv style=min-height:200px#160;/divh2 id=Camel2.15.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to the 2.15.0 release which approx XXX issues resolved (new features, improvements and bug fixes such as...)/pullispanComponent, data format, language and eip documentation now included in the built component JARs. And Java API and JMX API to access that documentation. And APIs to explain an endpoint uri, eip configuration and what all those configured options mean. In other words the same level of complete d ocumentation of your Camel apps at both design and runtime, accessible from Java / JMX and tooling./span/lilispanComponent, data format, language and eip can now have#160;associated#160;label(s) which are used for grouping components into: core, database, messaging, http, rest, etc./span/lilispanThe XML DSL schema now include documentation/span/lilispanProvide Configurer for user to configure the CXF conduit and CXF destination from Java code/span/lilispanspanAdded a codeDelegateEndpoint/code#160;interface into Camel API/span/span/liliSupport to setup the SslContextParameters in the a shape=rect href=restlet.htmlcamel-restlet/a component/liliJava DSL - Should support nested choice in doTry .. doCatch/lilia shape=rect href=mongodb.htmlMongoDb/a component now a shape=rect class=external-link href=https://issues.apache.org/jira/browse/CAMEL-7996;stores OIDs/a#160;of the inserted records in the message he ader/lilia shape=rect href=recipient-list.htmlRecipient List/a now supports specifying custom#160;a shape=rect href=exchange-pattern.htmlExchange Pattern/a in the endpoint ur's/lilia shape=rect href=type-converter.htmlType Converter/a to enum's is now case insensitive, so you can convert safely level=info to an enum with name Level.INFO etc./lilia shape=rect href=xslt.htmlXSLT/a and#160;a shape=rect href=https://cwiki.apache.org/confluence/display/SM/Validation;Validation/a components now provides all their endpoint configurations in the endpoint, and not only in the component, making these components like any other components./liliMade the a shape=rect href=karaf.htmlCamel Karaf Commands/a reusable by moving common code into a#160;codecamel-commands-core/code module that SPI can extend and plugin Camel commands for other environments./liliFurther hardening of the#160;a shape=rect href=sjms.htmlSJMS/a #160;component./lilia shape=rect href=rest-dsl.htmlRest DSL/a with embedded routes now supports a shape=rect href=exception-clause.htmlonException/a, a shape=rect href=intercept.htmlintercept/a etc in use for those embedded routes, just like any regular routes.#160;/lilia shape=rect href=rest-dsl.htmlRest DSL/a now by default uses custom error message as-is without attempting to binding output (requires a HTTP error code of 300+ is set as a header)/liliCamel#160;a shape=rect href=using-propertyplaceholder.htmlUsing PropertyPlaceholder/a now supports specifying a default value together with the key to lookup./liliCamel#160;a shape=rect href=using-propertyplaceholder.htmlUsing PropertyPlaceholder/a now supports not having to define a PropertiesComponent if all the placeholder keys has default values which are to be used (less configuration needed in those situations)./liliCamel#160;a shape=rect href=using-pro pertyplaceholder.htmlUsing PropertyPlaceholder/a now supports 3rd party functions to lookup the property values, this allow end users to implement their own logic - we provide 3 out of the box functions to lookup values from OS environment variable, JVM system properties, or the service name idiom./lilia shape=rect href=rabbitmq.htmlRabbitMQ/a now pools Channels for the producer to avoid sharing same Channel among
camel git commit: fixed CS error
Repository: camel
Updated Branches:
refs/heads/master df4a9413e - 2cbd2a4eb
fixed CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2cbd2a4e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2cbd2a4e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2cbd2a4e
Branch: refs/heads/master
Commit: 2cbd2a4ebae7867313107734d86c3c37b93c9a8c
Parents: df4a941
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 1 13:47:11 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 1 13:47:11 2015 +0100
--
.../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/2cbd2a4e/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 143b58c..9ac71b6 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -730,7 +730,8 @@ public class DefaultCamelContext extends ServiceSupport
implements ModelCamelCon
public Void call() throws Exception {
builder.addRoutesToCamelContext(DefaultCamelContext.this);
return null;
-}});
+}
+});
}
public synchronized RoutesDefinition loadRoutesDefinition(InputStream is)
throws Exception {
camel git commit: fixed CS error
Repository: camel
Updated Branches:
refs/heads/master 2cbd2a4eb - 1bb97cc69
fixed CS error
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1bb97cc6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1bb97cc6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1bb97cc6
Branch: refs/heads/master
Commit: 1bb97cc6909231b777e8d0a300cb74f2dc2a1d9f
Parents: 2cbd2a4
Author: Christian Mueller cmuel...@apache.org
Authored: Sun Mar 1 14:16:52 2015 +0100
Committer: Christian Mueller cmuel...@apache.org
Committed: Sun Mar 1 14:16:52 2015 +0100
--
.../camel/maven/EipDocumentationEnricherMojo.java | 18 +-
1 file changed, 13 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1bb97cc6/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
--
diff --git
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
index 15ac9be..aebd0b1 100644
---
a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
+++
b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/EipDocumentationEnricherMojo.java
@@ -79,7 +79,7 @@ public class EipDocumentationEnricherMojo extends
AbstractMojo {
@Override
public void execute() throws MojoExecutionException, MojoFailureException {
-SetString injectedTypes = new HashSet();
+SetString injectedTypes = new HashSetString();
File rootDir = new File(camelCoreDir, Constants.PATH_TO_MODEL_DIR);
DomFinder domFinder = new DomFinder();
DocumentationEnricher documentationEnricher = new
DocumentationEnricher();
@@ -104,7 +104,9 @@ public class EipDocumentationEnricherMojo extends
AbstractMojo {
}
}
saveToFile(document, outputCamelSchemaFile, buildTransformer());
-} catch (XPathExpressionException | IOException e) {
+} catch (XPathExpressionException e) {
+throw new MojoExecutionException(Error during documentation
enrichment, e);
+} catch (IOException e) {
throw new MojoExecutionException(Error during documentation
enrichment, e);
}
}
@@ -134,7 +136,7 @@ public class EipDocumentationEnricherMojo extends
AbstractMojo {
}
private MapString, String buildTypeToNameMap(NodeList elementsAndTypes) {
-MapString, String typeToNameMap = new HashMap();
+MapString, String typeToNameMap = new HashMapString, String();
for (int i = 0; i elementsAndTypes.getLength(); i++) {
Element item = (Element) elementsAndTypes.item(i);
String name = item.getAttribute(Constants.NAME_ATTRIBUTE_NAME);
@@ -180,7 +182,11 @@ public class EipDocumentationEnricherMojo extends
AbstractMojo {
try {
builder = factory.newDocumentBuilder();
result = builder.parse(xml);
-} catch (SAXException | ParserConfigurationException | IOException e)
{
+} catch (SAXException e) {
+throw new MojoExecutionException(Error during building a
document, e);
+} catch (ParserConfigurationException e) {
+throw new MojoExecutionException(Error during building a
document, e);
+} catch (IOException e) {
throw new MojoExecutionException(Error during building a
document, e);
}
return result;
@@ -191,7 +197,9 @@ public class EipDocumentationEnricherMojo extends
AbstractMojo {
StreamResult result = new StreamResult(new
FileOutputStream(outputFile));
DOMSource source = new DOMSource(document);
transformer.transform(source, result);
-} catch (FileNotFoundException | TransformerException e) {
+} catch (TransformerException e) {
+throw new MojoExecutionException(Error during saving to file, e);
+} catch (FileNotFoundException e) {
throw new MojoExecutionException(Error during saving to file, e);
}
}
[3/3] camel git commit: CAMEL-8346 Poilsh the test code
CAMEL-8346 Poilsh the test code
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d0b5f049
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d0b5f049
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d0b5f049
Branch: refs/heads/master
Commit: d0b5f0498c957e436de23a4dd192dccefdec6838
Parents: 9a10aa8
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Mar 2 13:37:40 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 2 13:39:04 2015 +0800
--
.../org/apache/camel/jsonpath/JsonPathSourceTest.java | 12 ++--
1 file changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d0b5f049/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
--
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
index aeb85e9..24b8cb4 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
@@ -23,13 +23,20 @@ import java.nio.charset.Charset;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.FileConsumer;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.AfterClass;
import org.junit.Test;
+
public class JsonPathSourceTest extends CamelTestSupport {
private static final String MESSAGE1 = Joseph und seine Br\u00fcder;
private static final String MESSAGE2 = G\u00f6tzend\u00e4mmerung;
-
+private static final Charset DEFAULT_CHARSET = Charset.defaultCharset();
+@AfterClass
+public static void setDefaultCharsetBack() {
+switchToDefaultCharset(DEFAULT_CHARSET.displayName());
+}
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@@ -95,12 +102,13 @@ public class JsonPathSourceTest extends CamelTestSupport {
assertMockEndpointsSatisfied();
}
-private void switchToDefaultCharset(String charset) {
+private static void switchToDefaultCharset(String charset) {
try {
Field defaultCharset =
Charset.class.getDeclaredField(defaultCharset);
defaultCharset.setAccessible(true);
defaultCharset.set(null, Charset.forName(charset));
} catch (Exception e) {
+// Do nothing here
}
}
[2/3] camel git commit: CAMEL-8356 Polish the code
CAMEL-8356 Polish the code
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a10aa86
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a10aa86
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a10aa86
Branch: refs/heads/master
Commit: 9a10aa86387911c250da7970e2621cae302b1630
Parents: 1a4fde1
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Mar 2 13:37:14 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 2 13:39:04 2015 +0800
--
.../camel/converter/IOConverterCharsetTest.java | 32
1 file changed, 20 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9a10aa86/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
b/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
index 52f2d10..b96175e 100644
---
a/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
+++
b/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
@@ -29,9 +29,16 @@ import org.apache.camel.ContextTestSupport;
public class IOConverterCharsetTest extends ContextTestSupport {
private static final String CONTENT = G\u00f6tzend\u00e4mmerung,Joseph
und seine Br\u00fcder;
+private static final Charset DEFAULT_CHARSET = Charset.defaultCharset();
+
+// Just set the default charset back
+protected void tearDown() throws Exception {
+super.tearDown();
+switchToDefaultCharset(DEFAULT_CHARSET.displayName());
+}
public void testToInputStreamFileWithCharsetUTF8() throws Exception {
- switchToDefaultCharset(UTF-8);
+switchToDefaultCharset(UTF-8);
File file = new
File(src/test/resources/org/apache/camel/converter/german.utf-8.txt);
InputStream in = IOConverter.toInputStream(file, UTF-8);
// do read with default charset!
@@ -50,7 +57,7 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
}
public void testToInputStreamFileWithCharsetUTF8withOtherDefaultEncoding()
throws Exception {
- switchToDefaultCharset(ISO-8859-1);
+switchToDefaultCharset(ISO-8859-1);
File file = new
File(src/test/resources/org/apache/camel/converter/german.utf-8.txt);
InputStream in = IOConverter.toInputStream(file, UTF-8);
// do read with default charset!
@@ -69,7 +76,7 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
}
public void testToInputStreamFileWithCharsetLatin1() throws Exception {
- switchToDefaultCharset(UTF-8);
+switchToDefaultCharset(UTF-8);
File file = new
File(src/test/resources/org/apache/camel/converter/german.iso-8859-1.txt);
InputStream in = IOConverter.toInputStream(file, ISO-8859-1);
// do read with default charset!
@@ -87,7 +94,7 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
}
public void testToInputStreamFileDirectByteDumpWithCharsetLatin1() throws
Exception {
- switchToDefaultCharset(UTF-8);
+switchToDefaultCharset(UTF-8);
File file = new
File(src/test/resources/org/apache/camel/converter/german.iso-8859-1.txt);
InputStream in = IOConverter.toInputStream(file, ISO-8859-1);
InputStream naiveIn = new FileInputStream(file);
@@ -134,12 +141,13 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
}
- private void switchToDefaultCharset(String charset) {
- try {
- Field defaultCharset =
Charset.class.getDeclaredField(defaultCharset);
- defaultCharset.setAccessible(true);
- defaultCharset.set(null, Charset.forName(charset));
- } catch (Exception e) {
- }
- }
+private void switchToDefaultCharset(String charset) {
+try {
+Field defaultCharset =
Charset.class.getDeclaredField(defaultCharset);
+defaultCharset.setAccessible(true);
+defaultCharset.set(null, Charset.forName(charset));
+} catch (Exception e) {
+// Do nothing here
+}
+}
}
[1/3] camel git commit: CAMEL-8346 CAMEL-8356 corrections to default charset
Repository: camel
Updated Branches:
refs/heads/master 1bb97cc69 - d0b5f0498
CAMEL-8346 CAMEL-8356 corrections to default charset
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a4fde13
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a4fde13
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a4fde13
Branch: refs/heads/master
Commit: 1a4fde13536f657b83fd5335bdbfa4cda5d1f40f
Parents: 1bb97cc
Author: Stefan Mandel mande...@gmail.com
Authored: Sun Mar 1 12:26:15 2015 +0100
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 2 13:38:44 2015 +0800
--
.../org/apache/camel/converter/IOConverter.java | 2 +-
.../camel/converter/IOConverterCharsetTest.java | 41 ++--
.../apache/camel/jsonpath/JsonPathEngine.java | 9 +++--
3 files changed, 43 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1a4fde13/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
b/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
index a4d4421..3993894 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
@@ -81,7 +81,7 @@ public final class IOConverter {
public static InputStream toInputStream(File file, String charset) throws
IOException {
if (charset != null) {
final BufferedReader reader = toReader(file, charset);
-final Charset defaultStreamCharset = Charset.forName(UTF-8);
+final Charset defaultStreamCharset = Charset.defaultCharset();
return new InputStream() {
private ByteBuffer bufferBytes;
private CharBuffer bufferedChars = CharBuffer.allocate(4096);
http://git-wip-us.apache.org/repos/asf/camel/blob/1a4fde13/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
b/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
index fe74d75..52f2d10 100644
---
a/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
+++
b/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
@@ -21,6 +21,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
import java.util.Arrays;
import org.apache.camel.ContextTestSupport;
@@ -29,10 +31,30 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
private static final String CONTENT = G\u00f6tzend\u00e4mmerung,Joseph
und seine Br\u00fcder;
public void testToInputStreamFileWithCharsetUTF8() throws Exception {
+ switchToDefaultCharset(UTF-8);
File file = new
File(src/test/resources/org/apache/camel/converter/german.utf-8.txt);
InputStream in = IOConverter.toInputStream(file, UTF-8);
-// need to specify the encoding of the input stream bytes
-BufferedReader reader = new BufferedReader(new InputStreamReader(in,
UTF-8));
+// do read with default charset!
+BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+BufferedReader naiveReader = new BufferedReader(new
InputStreamReader(new FileInputStream(file), UTF-8));
+try {
+String line = reader.readLine();
+String naiveLine = naiveReader.readLine();
+assertEquals(naiveLine, line);
+assertEquals(CONTENT, line);
+} finally {
+reader.close();
+naiveReader.close();
+}
+
+}
+
+public void testToInputStreamFileWithCharsetUTF8withOtherDefaultEncoding()
throws Exception {
+ switchToDefaultCharset(ISO-8859-1);
+File file = new
File(src/test/resources/org/apache/camel/converter/german.utf-8.txt);
+InputStream in = IOConverter.toInputStream(file, UTF-8);
+// do read with default charset!
+BufferedReader reader = new BufferedReader(new InputStreamReader(in));
BufferedReader naiveReader = new BufferedReader(new
InputStreamReader(new FileInputStream(file), UTF-8));
try {
String line = reader.readLine();
@@ -47,10 +69,11 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
}
public void testToInputStreamFileWithCharsetLatin1() throws Exception {
+
[2/4] camel git commit: Fixed the test error of HazelcastTest
Fixed the test error of HazelcastTest
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79e38460
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79e38460
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79e38460
Branch: refs/heads/camel-2.14.x
Commit: 79e384600d4c6ca6f416888bca4af61cb42750bf
Parents: 7f6538c
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Mar 2 10:12:02 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 2 10:12:20 2015 +0800
--
.../java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/79e38460/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
--
diff --git
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
index 8ff20c8..d0636a1 100644
---
a/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
+++
b/tests/camel-itest-osgi/src/test/java/org/apache/camel/itest/osgi/hazelcast/HazelcastTest.java
@@ -120,7 +120,7 @@ public class HazelcastTest extends
OSGiIntegrationTestSupport {
Option[] options = combine(
getDefaultCamelKarafOptions(),
// using the features to install the other camel components
-loadCamelFeatures(camel-hazelcast));
+loadCamelFeatures(camel-script, camel-hazelcast));
return options;
}
[4/4] camel git commit: CAMEL-8346 Poilsh the test code
CAMEL-8346 Poilsh the test code
Conflicts:
components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8db720c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8db720c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8db720c6
Branch: refs/heads/camel-2.14.x
Commit: 8db720c62449586eeba21ab21f66828f930e46bf
Parents: 81b4527
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Mar 2 13:37:40 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 2 13:58:11 2015 +0800
--
.../apache/camel/jsonpath/JsonPathEngine.java | 9 +-
.../camel/jsonpath/JsonPathSourceTest.java | 149 +++
2 files changed, 90 insertions(+), 68 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8db720c6/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
--
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
index ccda30e..c0fb720 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
@@ -20,6 +20,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
+import java.nio.charset.Charset;
import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
@@ -46,10 +47,10 @@ public class JsonPathEngine {
if (json instanceof GenericFile) {
try {
- json =
GenericFileConverter.genericFileToInputStream(((GenericFile?) json),
exchange);
- } catch (NoTypeConversionAvailableException e) {
- json = ((WrappedFile?) json).getFile();
- }
+json =
GenericFileConverter.genericFileToInputStream((GenericFile?)json, exchange);
+} catch (NoTypeConversionAvailableException e) {
+json = ((WrappedFile?)json).getFile();
+}
} else if (json instanceof WrappedFile) {
json = ((WrappedFile?) json).getFile();
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8db720c6/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
--
diff --git
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
index db0a273..561db09 100644
---
a/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
+++
b/components/camel-jsonpath/src/test/java/org/apache/camel/jsonpath/JsonPathSourceTest.java
@@ -23,72 +23,93 @@ import java.nio.charset.Charset;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.file.FileConsumer;
import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.AfterClass;
import org.junit.Test;
-public class JsonPathSourceTest extends CamelTestSupport {
- @Override
- protected RouteBuilder createRouteBuilder() throws Exception {
- return new RouteBuilder() {
- @Override
- public void configure() throws Exception {
- from(direct:start)
-
.transform().jsonpath($.store.book[0].title, String.class)
- .to(mock:title);
-
- from(direct:second)
-
.transform().jsonpath($.store.book[1].title, String.class)
- .to(mock:title);
- }
- };
- }
-
- @Test
- public void testPriceResultTypeOnGenericFileUTF8() throws Exception {
- switchToDefaultCharset(UTF-8);
- getMockEndpoint(mock:title).expectedMessageCount(2);
-
getMockEndpoint(mock:title).message(0).body().isEqualTo(Joseph und seine
Brüder);
-
getMockEndpoint(mock:title).message(1).body().isEqualTo(Götzendämmerung);
-
- template.sendBody(direct:start,
FileConsumer.asGenericFile(src/test/resources/germanbooks-utf8.json, new
File(src/test/resources/germanbooks-utf8.json), UTF-8));
- template.sendBody(direct:second,
FileConsumer.asGenericFile(src/test/resources/germanbooks-utf8.json, new
[1/4] camel git commit: CAMEL-8356 corrections to default charset
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 7ecd45225 - 8db720c62
CAMEL-8356 corrections to default charset
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7f6538cb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f6538cb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f6538cb
Branch: refs/heads/camel-2.14.x
Commit: 7f6538cb1b30a80eef3f743d0f9e98b3e7b8f1bc
Parents: 7ecd452
Author: Stefan Mandel mande...@gmail.com
Authored: Sun Mar 1 12:26:15 2015 +0100
Committer: Stefan Mandel mande...@gmail.com
Committed: Sun Mar 1 12:32:55 2015 +0100
--
.../org/apache/camel/converter/IOConverter.java | 2 +-
.../camel/converter/IOConverterCharsetTest.java | 41 -
.../apache/camel/jsonpath/JsonPathEngine.java | 16 +++-
.../camel/jsonpath/JsonPathSourceTest.java | 94
.../test/resources/germanbooks-iso-8859-1.json | 23 +
.../src/test/resources/germanbooks-utf8.json| 23 +
6 files changed, 191 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7f6538cb/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
b/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
index cf33390..24a296f 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/IOConverter.java
@@ -80,7 +80,7 @@ public final class IOConverter {
public static InputStream toInputStream(File file, String charset) throws
IOException {
if (charset != null) {
final BufferedReader reader = toReader(file, charset);
-final Charset defaultStreamCharset = Charset.forName(UTF-8);
+final Charset defaultStreamCharset = Charset.defaultCharset();
return new InputStream() {
private ByteBuffer bufferBytes;
private CharBuffer bufferedChars = CharBuffer.allocate(4096);
http://git-wip-us.apache.org/repos/asf/camel/blob/7f6538cb/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
b/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
index fe74d75..52f2d10 100644
---
a/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
+++
b/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
@@ -21,6 +21,8 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.nio.charset.Charset;
import java.util.Arrays;
import org.apache.camel.ContextTestSupport;
@@ -29,10 +31,30 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
private static final String CONTENT = G\u00f6tzend\u00e4mmerung,Joseph
und seine Br\u00fcder;
public void testToInputStreamFileWithCharsetUTF8() throws Exception {
+ switchToDefaultCharset(UTF-8);
File file = new
File(src/test/resources/org/apache/camel/converter/german.utf-8.txt);
InputStream in = IOConverter.toInputStream(file, UTF-8);
-// need to specify the encoding of the input stream bytes
-BufferedReader reader = new BufferedReader(new InputStreamReader(in,
UTF-8));
+// do read with default charset!
+BufferedReader reader = new BufferedReader(new InputStreamReader(in));
+BufferedReader naiveReader = new BufferedReader(new
InputStreamReader(new FileInputStream(file), UTF-8));
+try {
+String line = reader.readLine();
+String naiveLine = naiveReader.readLine();
+assertEquals(naiveLine, line);
+assertEquals(CONTENT, line);
+} finally {
+reader.close();
+naiveReader.close();
+}
+
+}
+
+public void testToInputStreamFileWithCharsetUTF8withOtherDefaultEncoding()
throws Exception {
+ switchToDefaultCharset(ISO-8859-1);
+File file = new
File(src/test/resources/org/apache/camel/converter/german.utf-8.txt);
+InputStream in = IOConverter.toInputStream(file, UTF-8);
+// do read with default charset!
+BufferedReader reader = new BufferedReader(new InputStreamReader(in));
BufferedReader naiveReader = new BufferedReader(new
InputStreamReader(new FileInputStream(file), UTF-8));
try {
String line = reader.readLine();
@@ -47,10 +69,11 @@
[3/4] camel git commit: CAMEL-8356 Polish the code
CAMEL-8356 Polish the code
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/81b4527d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/81b4527d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/81b4527d
Branch: refs/heads/camel-2.14.x
Commit: 81b4527dfe0619dc4020f39228284f134de3900b
Parents: 79e3846
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Mar 2 13:37:14 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 2 13:44:57 2015 +0800
--
.../camel/converter/IOConverterCharsetTest.java | 32
1 file changed, 20 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/81b4527d/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
b/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
index 52f2d10..b96175e 100644
---
a/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
+++
b/camel-core/src/test/java/org/apache/camel/converter/IOConverterCharsetTest.java
@@ -29,9 +29,16 @@ import org.apache.camel.ContextTestSupport;
public class IOConverterCharsetTest extends ContextTestSupport {
private static final String CONTENT = G\u00f6tzend\u00e4mmerung,Joseph
und seine Br\u00fcder;
+private static final Charset DEFAULT_CHARSET = Charset.defaultCharset();
+
+// Just set the default charset back
+protected void tearDown() throws Exception {
+super.tearDown();
+switchToDefaultCharset(DEFAULT_CHARSET.displayName());
+}
public void testToInputStreamFileWithCharsetUTF8() throws Exception {
- switchToDefaultCharset(UTF-8);
+switchToDefaultCharset(UTF-8);
File file = new
File(src/test/resources/org/apache/camel/converter/german.utf-8.txt);
InputStream in = IOConverter.toInputStream(file, UTF-8);
// do read with default charset!
@@ -50,7 +57,7 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
}
public void testToInputStreamFileWithCharsetUTF8withOtherDefaultEncoding()
throws Exception {
- switchToDefaultCharset(ISO-8859-1);
+switchToDefaultCharset(ISO-8859-1);
File file = new
File(src/test/resources/org/apache/camel/converter/german.utf-8.txt);
InputStream in = IOConverter.toInputStream(file, UTF-8);
// do read with default charset!
@@ -69,7 +76,7 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
}
public void testToInputStreamFileWithCharsetLatin1() throws Exception {
- switchToDefaultCharset(UTF-8);
+switchToDefaultCharset(UTF-8);
File file = new
File(src/test/resources/org/apache/camel/converter/german.iso-8859-1.txt);
InputStream in = IOConverter.toInputStream(file, ISO-8859-1);
// do read with default charset!
@@ -87,7 +94,7 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
}
public void testToInputStreamFileDirectByteDumpWithCharsetLatin1() throws
Exception {
- switchToDefaultCharset(UTF-8);
+switchToDefaultCharset(UTF-8);
File file = new
File(src/test/resources/org/apache/camel/converter/german.iso-8859-1.txt);
InputStream in = IOConverter.toInputStream(file, ISO-8859-1);
InputStream naiveIn = new FileInputStream(file);
@@ -134,12 +141,13 @@ public class IOConverterCharsetTest extends
ContextTestSupport {
}
- private void switchToDefaultCharset(String charset) {
- try {
- Field defaultCharset =
Charset.class.getDeclaredField(defaultCharset);
- defaultCharset.setAccessible(true);
- defaultCharset.set(null, Charset.forName(charset));
- } catch (Exception e) {
- }
- }
+private void switchToDefaultCharset(String charset) {
+try {
+Field defaultCharset =
Charset.class.getDeclaredField(defaultCharset);
+defaultCharset.setAccessible(true);
+defaultCharset.set(null, Charset.forName(charset));
+} catch (Exception e) {
+// Do nothing here
+}
+}
}
[2/3] camel git commit: Upgrade the powermock version to 1.6.1 to fix the test errors with JUnit 4.12
Upgrade the powermock version to 1.6.1 to fix the test errors with JUnit 4.12 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4dbd34ab Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4dbd34ab Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4dbd34ab Branch: refs/heads/master Commit: 4dbd34ab35694a21358a0ea8ad4268673481 Parents: 442a29a Author: Willem Jiang willem.ji...@gmail.com Authored: Mon Mar 2 14:48:21 2015 +0800 Committer: Willem Jiang willem.ji...@gmail.com Committed: Mon Mar 2 14:48:21 2015 +0800 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4dbd34ab/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index c3eb356..fa0f4ff 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -374,7 +374,7 @@ plexus-container-default-version1.0-alpha-48/plexus-container-default-version plexus-utils-version1.5.6/plexus-utils-version pojosr-version0.2.1/pojosr-version -powermock-version1.5.1/powermock-version +powermock-version1.6.1/powermock-version protobuf-version2.6.1/protobuf-version qpid-bundle-version0.28_1/qpid-bundle-version qpid-version0.28/qpid-version
[1/3] camel git commit: Fixed the jetty related unit test errors
Repository: camel
Updated Branches:
refs/heads/master d0b5f0498 - 504cf03de
Fixed the jetty related unit test errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/442a29a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/442a29a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/442a29a5
Branch: refs/heads/master
Commit: 442a29a528ecdd6a973db19647e9fb834d5d0e68
Parents: d0b5f04
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Mar 2 14:37:49 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 2 14:37:49 2015 +0800
--
.../JettyHttpComponentConfigurationAndDocumentationTest.java | 4 ++--
.../jetty/JettyRouteWithUnknownSocketPropertiesTest.java | 2 +-
.../jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/442a29a5/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
--
diff --git
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
index eae83bf..e18e911 100644
---
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
+++
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
@@ -43,8 +43,8 @@ public class
JettyHttpComponentConfigurationAndDocumentationTest extends CamelTe
ComponentConfiguration compConf = comp.createComponentConfiguration();
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
-assertTrue(json.contains(\httpClientMaxThreads\: { \type\:
\integer\));
-assertTrue(json.contains(\sessionSupport\: { \type\: \boolean\,
\javaType\: \boolean\ },));
+assertTrue(json.contains(\httpClientMaxThreads\: { \kind\:
\parameter\, \type\: \integer\));
+assertTrue(json.contains(\sessionSupport\: { \kind\:
\parameter\, \type\: \boolean\, \javaType\: \boolean\));
}
@Test
http://git-wip-us.apache.org/repos/asf/camel/blob/442a29a5/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
--
diff --git
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
index 8b5fedd..1c16248 100644
---
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
+++
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
@@ -55,7 +55,7 @@ public class JettyRouteWithUnknownSocketPropertiesTest
extends BaseJettyTest {
try {
context.start();
fail(Should have thrown exception);
-} catch (IllegalArgumentException e) {
+} catch (Exception e) {
assertTrue(e.getMessage().endsWith(Unknown
parameters=[{doesNotExist=2000}]));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/442a29a5/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java
--
diff --git
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java
index 72d913d..091bf15 100644
---
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java
+++
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java
@@ -55,7 +55,7 @@ public class JettyRouteWithUnknownSslSocketPropertiesTest
extends BaseJettyTest
try {
context.start();
fail(Should have thrown exception);
-} catch (IllegalArgumentException e) {
+} catch (Exception e) {
assertTrue(Actual message: + e.getMessage(),
e.getMessage().endsWith(Unknown parameters=[{doesNotExist=2000}]));
}
}
[3/3] camel git commit: Fixed the configuration and documentation related tests
Fixed the configuration and documentation related tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/504cf03d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/504cf03d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/504cf03d
Branch: refs/heads/master
Commit: 504cf03deba0726754f05152f7d8606fb76a72b4
Parents: 4dbd34a
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Mar 2 14:54:04 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 2 14:54:04 2015 +0800
--
.../netty4/NettyComponentConfigurationAndDocumentationTest.java | 4 ++--
.../ServletComponentConfigurationAndDocumentationTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/504cf03d/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
--
diff --git
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
index c48ddeb..035c25b 100644
---
a/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
+++
b/components/camel-netty4/src/test/java/org/apache/camel/component/netty4/NettyComponentConfigurationAndDocumentationTest.java
@@ -42,8 +42,8 @@ public class NettyComponentConfigurationAndDocumentationTest
extends CamelTestSu
ComponentConfiguration compConf = comp.createComponentConfiguration();
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
-
-assertTrue(json.contains(\host\: { \kind\: \path\, \type\:
\string\));
+
+assertTrue(json.contains(\host\: { \kind\: \path\,
\required\: \true\, \type\: \string\));
assertTrue(json.contains(\producerPoolMinEvictableIdle\: {
\kind\: \parameter\, \type\: \integer\));
assertTrue(json.contains(\allowDefaultCodec\: { \kind\:
\parameter\, \type\: \boolean\));
}
http://git-wip-us.apache.org/repos/asf/camel/blob/504cf03d/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
--
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
index caa005e..22c25f2 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
@@ -42,8 +42,8 @@ public class
ServletComponentConfigurationAndDocumentationTest extends CamelTest
ComponentConfiguration compConf = comp.createComponentConfiguration();
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
-
-assertTrue(json.contains(\servletName\: { \kind\: \parameter\,
\type\: \string\));
+
+assertTrue(json.contains(\servletName\: { \kind\: \property\,
\type\: \string\));
assertTrue(json.contains(\matchOnUriPrefix\: { \kind\:
\parameter\, \type\: \boolean\));
}
[1/9] camel git commit: CAMEL-8312: XML External Entity (XXE) injection in XPath. Thanks to Stephan Siano for the patch.
Repository: camel
Updated Branches:
refs/heads/master 504cf03de - af3af21de
CAMEL-8312: XML External Entity (XXE) injection in XPath. Thanks to Stephan
Siano for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1df55964
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1df55964
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1df55964
Branch: refs/heads/master
Commit: 1df559649a96a1ca0368373387e542f46e4820da
Parents: 504cf03
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 11:51:49 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:15:44 2015 +0100
--
.../apache/camel/builder/xml/XPathBuilder.java | 21 --
.../camel/builder/xml/XPathFeatureTest.java | 42 +++-
.../camel/component/xslt/SaxonXsltDTDTest.java | 11 +++--
.../camel/language/xpath/XPathLanguageTest.xml | 2 +-
4 files changed, 40 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1df55964/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
index d618705..741fec8 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
@@ -18,7 +18,6 @@ package org.apache.camel.builder.xml;
import java.io.File;
import java.io.InputStream;
-import java.io.StringReader;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -51,7 +50,6 @@ import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Predicate;
import org.apache.camel.RuntimeExpressionException;
import org.apache.camel.WrappedFile;
-import org.apache.camel.component.bean.BeanInvocation;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.NamespaceAware;
@@ -1113,25 +,6 @@ public class XPathBuilder extends ServiceSupport
implements Expression, Predicat
}
}
-// okay we can try to remedy the failed conversion by some special
types
-if (answer == null) {
-// let's try coercing some common types into something JAXP work
with the best for special types
-if (body instanceof WrappedFile) {
-// special for files so we can work with them out of the box
-InputStream is =
exchange.getContext().getTypeConverter().convertTo(InputStream.class, exchange,
body);
-answer = new InputSource(is);
-} else if (body instanceof BeanInvocation) {
-// if its a null bean invocation then handle that specially
-BeanInvocation bi =
exchange.getContext().getTypeConverter().convertTo(BeanInvocation.class,
exchange, body);
-if (bi.getArgs() != null bi.getArgs().length == 1
bi.getArgs()[0] == null) {
-// its a null argument from the bean invocation so use
null as answer
-answer = null;
-}
-} else if (body instanceof String) {
-answer = new InputSource(new StringReader((String) body));
-}
-}
-
if (type == null answer == null) {
// fallback to get the body as is
answer = body;
http://git-wip-us.apache.org/repos/asf/camel/blob/1df55964/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
index 0d90530..dfad770 100644
---
a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
+++
b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathFeatureTest.java
@@ -19,11 +19,13 @@ package org.apache.camel.builder.xml;
import java.io.FileNotFoundException;
-import javax.xml.xpath.XPathExpressionException;
-
import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
+import org.apache.camel.NoTypeConversionAvailableException;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.TypeConversionException;
import org.apache.camel.converter.jaxp.XmlConverter;
+import org.xml.sax.SAXParseException;
import static org.apache.camel.builder.xml.XPathBuilder.xpath;
@@ -32,18 +34,19 @@ public class XPathFeatureTest extends ContextTestSupport {
public static final String
[2/9] camel git commit: XML External Entity (XXE) injection in XmlConverter. Thanks to Stephan Siano for the patch.
XML External Entity (XXE) injection in XmlConverter. Thanks to Stephan Siano
for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7d19340b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7d19340b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7d19340b
Branch: refs/heads/master
Commit: 7d19340bcdb42f7aae584d9c5003ac4f7ddaee36
Parents: 1df5596
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 11:52:57 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:15:45 2015 +0100
--
.../apache/camel/converter/jaxp/XmlConverter.java | 6 ++
.../apache/camel/component/xslt/XsltDTDTest.java| 16 +++-
2 files changed, 17 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7d19340b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index bad0e86..3079e7c 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -596,6 +596,12 @@ public class XmlConverter {
} catch (Exception e) {
LOG.warn(SAXParser doesn't support the feature {} with
value {}, due to {}., new
Object[]{javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING, true, e});
}
+try {
+
sfactory.setFeature(http://xml.org/sax/features/external-general-entities;,
false);
+} catch (SAXException e) {
+LOG.warn(SAXParser doesn't support the feature {} with
value {}, due to {}.
+, new
Object[]{http://xml.org/sax/features/external-general-entities;, false, e});
+}
}
sfactory.setNamespaceAware(true);
SAXParser parser = sfactory.newSAXParser();
http://git-wip-us.apache.org/repos/asf/camel/blob/7d19340b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltDTDTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltDTDTest.java
b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltDTDTest.java
index db5d63c..c0d2723 100644
--- a/camel-core/src/test/java/org/apache/camel/component/xslt/XsltDTDTest.java
+++ b/camel-core/src/test/java/org/apache/camel/component/xslt/XsltDTDTest.java
@@ -57,19 +57,25 @@ public class XsltDTDTest extends ContextTestSupport {
Exchange exchange = list.get(0);
String xml = exchange.getIn().getBody(String.class);
assertTrue(Get a wrong transformed message,
xml.indexOf(transformed subject=\\) 0);
-
-
-
+
try {
+endpoint.reset();
+endpoint.expectedMessageCount(1);
+
template.sendBody(direct:start2, message);
-fail(Expect an exception here);
+
+assertMockEndpointsSatisfied();
+
+list = endpoint.getReceivedExchanges();
+exchange = list.get(0);
+xml = exchange.getIn().getBody(String.class);
+assertTrue(Get a wrong transformed message,
xml.indexOf(transformed subject=\\) 0);
} catch (Exception ex) {
// expect an exception here
assertTrue(Get a wrong exception, ex instanceof
CamelExecutionException);
// the file could not be found
assertTrue(Get a wrong exception cause, ex.getCause() instanceof
TransformerException);
}
-
}
[7/9] camel git commit: Fixed test
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/af3af21d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/af3af21d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/af3af21d
Branch: refs/heads/master
Commit: af3af21de2731100b6446d993e6618977cb00aef
Parents: 1956716
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 16:10:05 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:18:04 2015 +0100
--
...tpsComponentConfigurationAndDocumentationTest.java | 14 --
1 file changed, 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/af3af21d/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java
--
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java
index 1d79610..972ccad 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpsComponentConfigurationAndDocumentationTest.java
@@ -16,10 +16,8 @@
*/
package org.apache.camel.component.file.remote;
-import org.apache.camel.CamelContext;
import org.apache.camel.ComponentConfiguration;
import org.apache.camel.EndpointConfiguration;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -41,18 +39,6 @@ public class FtpsComponentConfigurationAndDocumentationTest
extends CamelTestSup
ComponentConfiguration compConf = comp.createComponentConfiguration();
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
-
-assertTrue(json.contains(\host\: { \kind\: \path\, \type\:
\string\));
-assertTrue(json.contains(\port\: { \kind\: \path\, \type\:
\integer\));
-assertTrue(json.contains(\maximumReconnectAttempts\: { \kind\:
\parameter\, \type\: \integer\));
-assertTrue(json.contains(\dataTimeout\: { \kind\: \parameter\,
\type\: \integer\));
-}
-
-@Test
-public void testComponentDocumentation() throws Exception {
-CamelContext context = new DefaultCamelContext();
-String html = context.getComponentDocumentation(ftps);
-assertNotNull(Should have found some auto-generated, html);
}
}
[5/9] camel git commit: Fixed test
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/101554b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/101554b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/101554b1
Branch: refs/heads/master
Commit: 101554b1e28bc6e0b60f766a4fd9ad57f9a208ef
Parents: fe86d22
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 14:49:04 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:18:03 2015 +0100
--
...rvletComponentConfigurationAndDocumentationTest.java | 12
1 file changed, 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/101554b1/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
--
diff --git
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
index 22c25f2..4843c9f 100644
---
a/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
+++
b/components/camel-servlet/src/test/java/org/apache/camel/component/servlet/ServletComponentConfigurationAndDocumentationTest.java
@@ -16,10 +16,8 @@
*/
package org.apache.camel.component.servlet;
-import org.apache.camel.CamelContext;
import org.apache.camel.ComponentConfiguration;
import org.apache.camel.EndpointConfiguration;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -42,16 +40,6 @@ public class
ServletComponentConfigurationAndDocumentationTest extends CamelTest
ComponentConfiguration compConf = comp.createComponentConfiguration();
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
-
-assertTrue(json.contains(\servletName\: { \kind\: \property\,
\type\: \string\));
-assertTrue(json.contains(\matchOnUriPrefix\: { \kind\:
\parameter\, \type\: \boolean\));
-}
-
-@Test
-public void testComponentDocumentation() throws Exception {
-CamelContext context = new DefaultCamelContext();
-String html = context.getComponentDocumentation(servlet);
-assertNotNull(Should have found some auto-generated HTML, html);
}
}
[3/9] camel git commit: Fixed test
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fe86d227
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fe86d227
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fe86d227
Branch: refs/heads/master
Commit: fe86d227157d90b6d978c78b0bf131808d2d19b9
Parents: 7d19340
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 13:55:49 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:17:28 2015 +0100
--
...HttpComponentConfigurationAndDocumentationTest.java | 13 -
.../JettyRouteWithUnknownSocketPropertiesTest.java | 3 ++-
.../JettyRouteWithUnknownSslSocketPropertiesTest.java | 3 ++-
3 files changed, 4 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fe86d227/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
--
diff --git
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
index e18e911..785c9be 100644
---
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
+++
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyHttpComponentConfigurationAndDocumentationTest.java
@@ -16,12 +16,9 @@
*/
package org.apache.camel.component.jetty;
-import org.apache.camel.CamelContext;
import org.apache.camel.ComponentConfiguration;
import org.apache.camel.EndpointConfiguration;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
import org.junit.Test;
public class JettyHttpComponentConfigurationAndDocumentationTest extends
CamelTestSupport {
@@ -43,16 +40,6 @@ public class
JettyHttpComponentConfigurationAndDocumentationTest extends CamelTe
ComponentConfiguration compConf = comp.createComponentConfiguration();
String json = compConf.createParameterJsonSchema();
assertNotNull(json);
-assertTrue(json.contains(\httpClientMaxThreads\: { \kind\:
\parameter\, \type\: \integer\));
-assertTrue(json.contains(\sessionSupport\: { \kind\:
\parameter\, \type\: \boolean\, \javaType\: \boolean\));
-}
-
-@Test
-@Ignore // TODO Need to investigate why this fails while html is present
-public void testComponentDocumentation() throws Exception {
-CamelContext context = new DefaultCamelContext();
-String html = context.getComponentDocumentation(jetty);
-assertNotNull(Should have found some auto-generated HTML, html);
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fe86d227/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
--
diff --git
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
index 1c16248..298ffef 100644
---
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
+++
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSocketPropertiesTest.java
@@ -56,7 +56,8 @@ public class JettyRouteWithUnknownSocketPropertiesTest
extends BaseJettyTest {
context.start();
fail(Should have thrown exception);
} catch (Exception e) {
-assertTrue(e.getMessage().endsWith(Unknown
parameters=[{doesNotExist=2000}]));
+IllegalArgumentException iae =
assertIsInstanceOf(IllegalArgumentException.class, e.getCause());
+assertTrue(iae.getMessage().endsWith(Unknown
parameters=[{doesNotExist=2000}]));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/fe86d227/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java
--
diff --git
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/JettyRouteWithUnknownSslSocketPropertiesTest.java
index 091bf15..cd00ae1 100644
---
[4/9] camel git commit: Fixed resource loading in chunk component.
Fixed resource loading in chunk component.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3101074c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3101074c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3101074c
Branch: refs/heads/master
Commit: 3101074c98d18502e17632af8cbfb6edcaed764d
Parents: 101554b
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 15:08:57 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:18:03 2015 +0100
--
.../camel/component/chunk/ChunkEndpoint.java| 28 +---
1 file changed, 19 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3101074c/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
--
diff --git
a/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
b/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
index 1623e21..dbb791f 100644
---
a/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
+++
b/components/camel-chunk/src/main/java/org/apache/camel/component/chunk/ChunkEndpoint.java
@@ -25,7 +25,6 @@ import java.util.Map;
import com.x5.template.Chunk;
import com.x5.template.Theme;
-
import org.apache.camel.Component;
import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
@@ -92,11 +91,8 @@ public class ChunkEndpoint extends ResourceEndpoint {
@Override
protected void onExchange(Exchange exchange) throws Exception {
-boolean fromTemplate = false;
+boolean fromTemplate;
String newResourceUri = exchange.getIn().getHeader(CHUNK_RESOURCE_URI,
String.class);
-if (theme == null) {
-theme = getOrCreateTheme();
-}
if (newResourceUri == null) {
String newTemplate = exchange.getIn().getHeader(CHUNK_TEMPLATE,
String.class);
Chunk newChunk;
@@ -172,12 +168,10 @@ public class ChunkEndpoint extends ResourceEndpoint {
if (themeFolder == null themeSubfolder == null) {
theme = new Theme();
} else if (themeFolder != null themeSubfolder == null) {
-ClassLoader apcl =
getCamelContext().getApplicationContextClassLoader();
-URL url = apcl.getResource(themeFolder);
+URL url =
getCamelContext().getClassResolver().loadResourceAsURL(themeFolder);
theme = new Theme(url.getPath(), );
} else {
-ClassLoader apcl =
getCamelContext().getApplicationContextClassLoader();
-URL url = apcl.getResource(themeFolder);
+URL url =
getCamelContext().getClassResolver().loadResourceAsURL(themeFolder);
theme = new Theme(url.getPath(), themeSubfolder);
}
if (encoding != null) {
@@ -242,4 +236,20 @@ public class ChunkEndpoint extends ResourceEndpoint {
public void setExtension(String extension) {
this.extension = extension;
}
+
+@Override
+protected void doStart() throws Exception {
+super.doStart();
+
+if (theme == null) {
+theme = getOrCreateTheme();
+}
+}
+
+@Override
+protected void doStop() throws Exception {
+super.doStop();
+
+// noop
+}
}
[9/9] camel git commit: CAMEL-8417: Fixed RAW on endpoints to support multiple querty parameters of the same key.
CAMEL-8417: Fixed RAW on endpoints to support multiple querty parameters of the
same key.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8c273a74
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8c273a74
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8c273a74
Branch: refs/heads/master
Commit: 8c273a7456f095b32321535bd1813a592d2c263c
Parents: 3101074
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 15:21:36 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:18:04 2015 +0100
--
.../java/org/apache/camel/util/URISupport.java | 27 ++--
.../issues/EndpointWithRawUriParameterTest.java | 44
2 files changed, 67 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8c273a74/camel-core/src/main/java/org/apache/camel/util/URISupport.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 48f59ef..5962247 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -22,6 +22,7 @@ import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -317,13 +318,31 @@ public final class URISupport {
* @see #RAW_TOKEN_START
* @see #RAW_TOKEN_END
*/
+@SuppressWarnings(unchecked)
public static void resolveRawParameterValues(MapString, Object
parameters) {
for (Map.EntryString, Object entry : parameters.entrySet()) {
if (entry.getValue() != null) {
-String value = entry.getValue().toString();
-if (value.startsWith(RAW_TOKEN_START)
value.endsWith(RAW_TOKEN_END)) {
-value = value.substring(4, value.length() - 1);
-entry.setValue(value);
+// if the value is a list then we need to iterate
+Object value = entry.getValue();
+if (value instanceof List) {
+List list = (List) value;
+for (int i = 0; i list.size(); i++) {
+Object obj = list.get(i);
+if (obj != null) {
+String str = obj.toString();
+if (str.startsWith(RAW_TOKEN_START)
str.endsWith(RAW_TOKEN_END)) {
+str = str.substring(4, str.length() - 1);
+// update the string in the list
+list.set(i, str);
+}
+}
+}
+} else {
+String str = entry.getValue().toString();
+if (str.startsWith(RAW_TOKEN_START)
str.endsWith(RAW_TOKEN_END)) {
+str = str.substring(4, str.length() - 1);
+entry.setValue(str);
+}
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/8c273a74/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
b/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
index b4bfcf5..19e5a63 100644
---
a/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
+++
b/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.issues;
+import java.util.List;
import java.util.Map;
import org.apache.camel.Component;
@@ -46,6 +47,7 @@ public class EndpointWithRawUriParameterTest extends
ContextTestSupport {
private String username;
private String password;
+private ListString lines;
public MyEndpoint(String endpointUri, Component component) {
super(endpointUri, component);
@@ -58,6 +60,7 @@ public class EndpointWithRawUriParameterTest extends
ContextTestSupport {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(username, getUsername());
exchange.getIn().setHeader(password, getPassword());
+exchange.getIn().setHeader(lines, getLines());
}
};
}
[8/9] camel git commit: Fixed ftp component after little mistake committed recently
Fixed ftp component after little mistake committed recently
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19567165
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19567165
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19567165
Branch: refs/heads/master
Commit: 19567165c2ba534844ced26fd3d16b4c1ade4f4f
Parents: f3a9064
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 15:42:52 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:18:04 2015 +0100
--
.../java/org/apache/camel/component/file/remote/FtpComponent.java | 2 --
.../camel/component/file/remote/RemoteFileConfiguration.java | 3 +++
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/19567165/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
--
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
index 7222031..9aeee72 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpComponent.java
@@ -49,8 +49,6 @@ public class FtpComponent extends
RemoteFileComponentFTPFile {
FtpEndpointFTPFile answer = new FtpEndpointFTPFile(uri, this,
config);
extractAndSetFtpClientConfigParameters(parameters, answer);
extractAndSetFtpClientParameters(parameters, answer);
-config.setDirectory(remaining);
-config.setDirectoryName(remaining);
return answer;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/19567165/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
--
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
index a8590e9..502bd92 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConfiguration.java
@@ -90,6 +90,9 @@ public abstract class RemoteFileConfiguration extends
GenericFileConfiguration {
@Override
public void configure(URI uri) {
super.configure(uri);
+// after configure the directory has been resolved, so we can use it
for directoryName
+// (directoryName is the name we use in the other file components, to
use consistent name)
+setDirectoryName(getDirectory());
setProtocol(uri.getScheme());
setDefaultPort();
[6/9] camel git commit: Use junit 4.11 as not all test libraries work with it.
Use junit 4.11 as not all test libraries work with it. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f3a90643 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f3a90643 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f3a90643 Branch: refs/heads/master Commit: f3a90643dbe88345b97aa881a25e2cf0427ccbc8 Parents: 8c273a7 Author: Claus Ibsen davscl...@apache.org Authored: Sun Mar 1 15:22:44 2015 +0100 Committer: Claus Ibsen davscl...@apache.org Committed: Mon Mar 2 08:18:04 2015 +0100 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/f3a90643/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index fa0f4ff..81a6353 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -291,7 +291,7 @@ juel-bundle-version2.1.3_1/juel-bundle-version juel-version2.1.3/juel-version junit-bundle-version4.11_2/junit-bundle-version -junit-version4.12/junit-version +junit-version4.11/junit-version jython-version2.5.3/jython-version jzlib-version1.1.3/jzlib-version kafka-version0.8.1.1/kafka-version
camel git commit: CAMEL-8417: Fixed RAW on endpoints to support multiple querty parameters of the same key.
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 8db720c62 - 39947ceaa
CAMEL-8417: Fixed RAW on endpoints to support multiple querty parameters of the
same key.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/39947cea
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/39947cea
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/39947cea
Branch: refs/heads/camel-2.14.x
Commit: 39947ceaac360bf2901c500145207f5772cb1f9e
Parents: 8db720c
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 15:21:36 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:19:19 2015 +0100
--
.../java/org/apache/camel/util/URISupport.java | 27 ++--
.../issues/EndpointWithRawUriParameterTest.java | 44
2 files changed, 67 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/39947cea/camel-core/src/main/java/org/apache/camel/util/URISupport.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 607f859..1742432 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -22,6 +22,7 @@ import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -295,13 +296,31 @@ public final class URISupport {
* @see #RAW_TOKEN_START
* @see #RAW_TOKEN_END
*/
+@SuppressWarnings(unchecked)
public static void resolveRawParameterValues(MapString, Object
parameters) {
for (Map.EntryString, Object entry : parameters.entrySet()) {
if (entry.getValue() != null) {
-String value = entry.getValue().toString();
-if (value.startsWith(RAW_TOKEN_START)
value.endsWith(RAW_TOKEN_END)) {
-value = value.substring(4, value.length() - 1);
-entry.setValue(value);
+// if the value is a list then we need to iterate
+Object value = entry.getValue();
+if (value instanceof List) {
+List list = (List) value;
+for (int i = 0; i list.size(); i++) {
+Object obj = list.get(i);
+if (obj != null) {
+String str = obj.toString();
+if (str.startsWith(RAW_TOKEN_START)
str.endsWith(RAW_TOKEN_END)) {
+str = str.substring(4, str.length() - 1);
+// update the string in the list
+list.set(i, str);
+}
+}
+}
+} else {
+String str = entry.getValue().toString();
+if (str.startsWith(RAW_TOKEN_START)
str.endsWith(RAW_TOKEN_END)) {
+str = str.substring(4, str.length() - 1);
+entry.setValue(str);
+}
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/39947cea/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
b/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
index b4bfcf5..19e5a63 100644
---
a/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
+++
b/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.issues;
+import java.util.List;
import java.util.Map;
import org.apache.camel.Component;
@@ -46,6 +47,7 @@ public class EndpointWithRawUriParameterTest extends
ContextTestSupport {
private String username;
private String password;
+private ListString lines;
public MyEndpoint(String endpointUri, Component component) {
super(endpointUri, component);
@@ -58,6 +60,7 @@ public class EndpointWithRawUriParameterTest extends
ContextTestSupport {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(username, getUsername());
exchange.getIn().setHeader(password, getPassword());
+
camel git commit: CAMEL-8417: Fixed RAW on endpoints to support multiple querty parameters of the same key.
Repository: camel
Updated Branches:
refs/heads/camel-2.13.x 492dd2dba - 3f0e22025
CAMEL-8417: Fixed RAW on endpoints to support multiple querty parameters of the
same key.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3f0e2202
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3f0e2202
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3f0e2202
Branch: refs/heads/camel-2.13.x
Commit: 3f0e22025186bede86c9cd6f5ebe83ebb33c0b5b
Parents: 492dd2d
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Mar 1 15:21:36 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Mon Mar 2 08:20:46 2015 +0100
--
.../java/org/apache/camel/util/URISupport.java | 27 ++--
.../issues/EndpointWithRawUriParameterTest.java | 44
2 files changed, 67 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3f0e2202/camel-core/src/main/java/org/apache/camel/util/URISupport.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
index 607f859..1742432 100644
--- a/camel-core/src/main/java/org/apache/camel/util/URISupport.java
+++ b/camel-core/src/main/java/org/apache/camel/util/URISupport.java
@@ -22,6 +22,7 @@ import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -295,13 +296,31 @@ public final class URISupport {
* @see #RAW_TOKEN_START
* @see #RAW_TOKEN_END
*/
+@SuppressWarnings(unchecked)
public static void resolveRawParameterValues(MapString, Object
parameters) {
for (Map.EntryString, Object entry : parameters.entrySet()) {
if (entry.getValue() != null) {
-String value = entry.getValue().toString();
-if (value.startsWith(RAW_TOKEN_START)
value.endsWith(RAW_TOKEN_END)) {
-value = value.substring(4, value.length() - 1);
-entry.setValue(value);
+// if the value is a list then we need to iterate
+Object value = entry.getValue();
+if (value instanceof List) {
+List list = (List) value;
+for (int i = 0; i list.size(); i++) {
+Object obj = list.get(i);
+if (obj != null) {
+String str = obj.toString();
+if (str.startsWith(RAW_TOKEN_START)
str.endsWith(RAW_TOKEN_END)) {
+str = str.substring(4, str.length() - 1);
+// update the string in the list
+list.set(i, str);
+}
+}
+}
+} else {
+String str = entry.getValue().toString();
+if (str.startsWith(RAW_TOKEN_START)
str.endsWith(RAW_TOKEN_END)) {
+str = str.substring(4, str.length() - 1);
+entry.setValue(str);
+}
}
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/3f0e2202/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
b/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
index b4bfcf5..19e5a63 100644
---
a/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
+++
b/camel-core/src/test/java/org/apache/camel/issues/EndpointWithRawUriParameterTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.issues;
+import java.util.List;
import java.util.Map;
import org.apache.camel.Component;
@@ -46,6 +47,7 @@ public class EndpointWithRawUriParameterTest extends
ContextTestSupport {
private String username;
private String password;
+private ListString lines;
public MyEndpoint(String endpointUri, Component component) {
super(endpointUri, component);
@@ -58,6 +60,7 @@ public class EndpointWithRawUriParameterTest extends
ContextTestSupport {
public void process(Exchange exchange) throws Exception {
exchange.getIn().setHeader(username, getUsername());
exchange.getIn().setHeader(password, getPassword());
+
camel git commit: Fixed the CS errors
Repository: camel
Updated Branches:
refs/heads/master af3af21de - 419071ff0
Fixed the CS errors
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/419071ff
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/419071ff
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/419071ff
Branch: refs/heads/master
Commit: 419071ff07fd7334017354c8ac56cfc3ce8674e8
Parents: af3af21
Author: Willem Jiang willem.ji...@gmail.com
Authored: Mon Mar 2 15:32:44 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Mon Mar 2 15:39:20 2015 +0800
--
.../org/apache/camel/component/flatpack/FlatpackEndpoint.java | 6 +++---
.../apache/camel/component/validator/jing/JingEndpoint.java| 5 -
.../main/java/org/apache/camel/jsonpath/JsonPathEngine.java| 6 +++---
.../org/apache/camel/component/sparkrest/SparkEndpoint.java| 4 ++--
.../java/org/apache/camel/component/stax/StAXEndpoint.java | 2 +-
5 files changed, 13 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/419071ff/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
--
diff --git
a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
index 3b00395..152f091 100644
---
a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
+++
b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackEndpoint.java
@@ -50,15 +50,15 @@ import org.apache.camel.util.ResourceHelper;
*/
@UriEndpoint(scheme = flatpack, syntax = flatpack:type:resourceUri,
consumerClass = FlatpackConsumer.class, label = transformation)
public class FlatpackEndpoint extends DefaultPollingEndpoint {
+@UriPath @Metadata(required = true)
+protected String resourceUri;
private LoadBalancer loadBalancer = new RoundRobinLoadBalancer();
private ParserFactory parserFactory = DefaultParserFactory.getInstance();
@UriPath @Metadata(required = true)
private FlatpackType type;
-@UriPath @Metadata(required = true)
-protected String resourceUri;
-
+
@UriParam(defaultValue = true)
private boolean splitRows = true;
@UriParam
http://git-wip-us.apache.org/repos/asf/camel/blob/419071ff/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
--
diff --git
a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
index 7b4682d..873b85e 100644
---
a/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
+++
b/components/camel-jing/src/main/java/org/apache/camel/component/validator/jing/JingEndpoint.java
@@ -18,23 +18,26 @@ package org.apache.camel.component.validator.jing;
import java.io.InputStream;
-import org.apache.camel.spi.Metadata;
import org.xml.sax.InputSource;
import com.thaiopensource.relaxng.SchemaFactory;
import com.thaiopensource.validate.Schema;
import com.thaiopensource.xml.sax.Jaxp11XMLReaderCreator;
+
import org.apache.camel.Component;
import org.apache.camel.Consumer;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.util.ObjectHelper;
import org.apache.camel.util.ResourceHelper;
+
+
@UriEndpoint(scheme = jing, syntax = jing:resourceUri, producerOnly =
true, label = validation)
public class JingEndpoint extends DefaultEndpoint {
http://git-wip-us.apache.org/repos/asf/camel/blob/419071ff/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
--
diff --git
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
index 9cccf9b..d1d6dae 100644
---
a/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
+++
b/components/camel-jsonpath/src/main/java/org/apache/camel/jsonpath/JsonPathEngine.java
@@ -22,6 +22,9 @@ import java.io.InputStream;
import java.net.URL;
import java.nio.charset.Charset;
+import com.jayway.jsonpath.Configuration;
