[1/3] camel git commit: Upgrade Mustache bundle to version 0.9.1
Repository: camel Updated Branches: refs/heads/master 4bc86ae76 -> 98e4b5a8f Upgrade Mustache bundle to version 0.9.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/740c1db9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/740c1db9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/740c1db9 Branch: refs/heads/master Commit: 740c1db9f57993edb8699136623c1c28dd08f73b Parents: 4bc86ae Author: Andrea Cosentino Authored: Thu Mar 31 08:11:39 2016 +0200 Committer: Andrea Cosentino Committed: Thu Mar 31 08:18:44 2016 +0200 -- parent/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/740c1db9/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 2fa7dc2..13f550b 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -412,8 +412,7 @@ 2013.6.1 0.9.1 16.0 - -0.8.18_1 +0.9.1_2 2.2.7.Final 3.3.1 3.0.1
[2/3] camel git commit: Upgrade Lucene/Solr and related bundle to version 5.5.0
Upgrade Lucene/Solr and related bundle to version 5.5.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/404a5541
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/404a5541
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/404a5541
Branch: refs/heads/master
Commit: 404a554104d0d084a1409a326c0440d6811d2f8d
Parents: 740c1db
Author: Andrea Cosentino
Authored: Thu Mar 31 08:24:36 2016 +0200
Committer: Andrea Cosentino
Committed: Thu Mar 31 08:24:36 2016 +0200
--
parent/pom.xml | 8
.../java/org/apache/camel/itest/karaf/CamelLuceneTest.java | 3 +--
2 files changed, 5 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/404a5541/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 13f550b..e213d52 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -367,8 +367,8 @@
1.1.5
3.6.0_1
3.6.0
-5.4.1_1
-5.4.1
+5.5.0_1
+5.5.0
[5,6)
0.1.8
2.3.1
@@ -491,8 +491,8 @@
1.17
1.1.2.1
2.3.4_1
-5.3.1_1
-5.3.1
+5.5.0_1
+5.5.0
[5,6)
1.6.1
2.3
http://git-wip-us.apache.org/repos/asf/camel/blob/404a5541/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
--
diff --git
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
index c8f8040..7483eab 100644
---
a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
+++
b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelLuceneTest.java
@@ -22,7 +22,6 @@ import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
@RunWith(PaxExam.class)
-@Ignore("Need new version of lucene bundle")
public class CamelLuceneTest extends AbstractFeatureTest {
public static final String COMPONENT = extractName(CamelLuceneTest.class);
@@ -33,4 +32,4 @@ public class CamelLuceneTest extends AbstractFeatureTest {
testComponent(COMPONENT);
}
-}
\ No newline at end of file
+}
[3/3] camel git commit: Upgrade Xstream and related bundle to version 1.4.9
Upgrade Xstream and related bundle to version 1.4.9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/98e4b5a8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/98e4b5a8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/98e4b5a8 Branch: refs/heads/master Commit: 98e4b5a8f9d499fc47fb84f76eb4d6bd3e35 Parents: 404a554 Author: Andrea Cosentino Authored: Thu Mar 31 08:29:30 2016 +0200 Committer: Andrea Cosentino Committed: Thu Mar 31 08:29:30 2016 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/98e4b5a8/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index e213d52..c759441 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -591,8 +591,8 @@ 1.1.4c_7 1.1.4c 2013.2 -1.4.8_1 -1.4.8 +1.4.9_1 +1.4.9 1.2.5 2.2.0 0.8
[4/4] camel git commit: Upgrade AWS SDK and related bundle to version 1.10.62
Upgrade AWS SDK and related bundle to version 1.10.62 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eeb1e866 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eeb1e866 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eeb1e866 Branch: refs/heads/master Commit: eeb1e86610f0717ab38039365f6b141bca992c1f Parents: 1ba36a5 Author: Andrea Cosentino Authored: Thu Mar 31 07:47:38 2016 +0200 Committer: Andrea Cosentino Committed: Thu Mar 31 08:01:45 2016 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/eeb1e866/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 58c2a17..1946768 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -65,8 +65,8 @@ 1.8.0_1 1.8.0_1 1.7.0 -1.10.52_1 -1.10.52 +1.10.62_1 +1.10.62 1.2.14 3.1 5.2_4
[2/4] camel git commit: Upgrade Cglib and related bundle to version 3.2.1
Upgrade Cglib and related bundle to version 3.2.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5e239a1e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5e239a1e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5e239a1e Branch: refs/heads/master Commit: 5e239a1e6f6111f8e9e537155af68debee302d44 Parents: eeb1e86 Author: Andrea Cosentino Authored: Thu Mar 31 07:54:37 2016 +0200 Committer: Andrea Cosentino Committed: Thu Mar 31 08:01:45 2016 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/5e239a1e/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 1946768..7900878 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -91,8 +91,8 @@ 1.0-SP4 1.1 1.2 -3.2.0_1 -3.2.0 +3.2.1_1 +3.2.1 3.2.0 3.2.0_1 1.3.1
[1/4] camel git commit: Upgrade Facebook4j and related bundle to version 2.4.3
Repository: camel Updated Branches: refs/heads/master 1ba36a597 -> 4bc86ae76 Upgrade Facebook4j and related bundle to version 2.4.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4bc86ae7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4bc86ae7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4bc86ae7 Branch: refs/heads/master Commit: 4bc86ae7615500be6781fff0b2dc359e5fd80a36 Parents: 396720b Author: Andrea Cosentino Authored: Thu Mar 31 08:01:18 2016 +0200 Committer: Andrea Cosentino Committed: Thu Mar 31 08:01:45 2016 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/4bc86ae7/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 2d6e20c..2fa7dc2 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -162,8 +162,8 @@ 2.10.0 1.4.0 1.0.6_1 -2.4.2 -2.4.2_1 +2.4.3 +2.4.3_1 1.2.13_1 1.8.8 0.1.0
[3/4] camel git commit: Upgrade Elasticsearch and related bundle to version 2.2.1
Upgrade Elasticsearch and related bundle to version 2.2.1 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/396720b9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/396720b9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/396720b9 Branch: refs/heads/master Commit: 396720b92d6321a50bfeaec0a9041e167de14317 Parents: 5e239a1 Author: Andrea Cosentino Authored: Thu Mar 31 07:59:07 2016 +0200 Committer: Andrea Cosentino Committed: Thu Mar 31 08:01:45 2016 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/396720b9/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 7900878..2d6e20c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -152,9 +152,9 @@ 2.10.1 2.1.5 2.1.5_1 -2.2.0_1 +2.2.1_1 18.0 -2.2.0 +2.2.1 2.2.0.0 1.2 1.0.1
[2/4] camel git commit: CAMEL-9776 : camel-braintree: add uri param to configure advanced options
CAMEL-9776 : camel-braintree: add uri param to configure advanced options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9812112f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9812112f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9812112f
Branch: refs/heads/camel-2.17.x
Commit: 9812112f4607c2e598f29d7687da07d276c9884d
Parents: 49a4f19
Author: lburgazzoli
Authored: Wed Mar 30 17:28:10 2016 +0200
Committer: Claus Ibsen
Committed: Thu Mar 31 07:58:38 2016 +0200
--
components/camel-braintree/pom.xml | 42 +-
.../braintree/BraintreeConfiguration.java | 82 +++-
.../braintree/AbstractBraintreeTestSupport.java | 3 +
.../src/test/resources/log4j.properties | 8 +-
parent/pom.xml | 5 ++
.../features/src/main/resources/features.xml| 2 +-
6 files changed, 121 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9812112f/components/camel-braintree/pom.xml
--
diff --git a/components/camel-braintree/pom.xml
b/components/camel-braintree/pom.xml
index 9bcd01b..8f03e3a 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -54,24 +54,6 @@
braintree-java
${braintree-gateway-version}
-
- org.apache.commons
- commons-lang3
- ${commons-lang3-version}
-
-
-
- commons-collections
- commons-collections
- ${commons-collections-version}
- test
-
-
- com.google.guava
- guava
- ${google-guava-version}
- test
-
@@ -90,6 +72,12 @@
org.slf4j
+ jul-to-slf4j
+
+
+
+
+ org.slf4j
slf4j-log4j12
test
@@ -105,6 +93,24 @@
camel-test
test
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3-version}
+ test
+
+
+ commons-collections
+ commons-collections
+ ${commons-collections-version}
+ test
+
+
+ com.google.guava
+ guava
+ ${google-guava-version}
+ test
+
http://git-wip-us.apache.org/repos/asf/camel/blob/9812112f/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
--
diff --git
a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
index b7a5d87..1b4e39c 100644
---
a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
+++
b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.braintree;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import com.braintreegateway.BraintreeGateway;
import com.braintreegateway.Environment;
import org.apache.camel.component.braintree.internal.BraintreeApiName;
@@ -24,6 +28,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.bridge.SLF4JBridgeHandler;
/**
* Component configuration for Braintree component.
@@ -65,6 +70,17 @@ public class BraintreeConfiguration {
@Metadata(label = "proxy")
private Integer proxyPort;
+@UriParam(javaType = "java.lang.String")
+@Metadata(label = "advanced,logging")
+private Level httpLogLevel;
+
+@Metadata(label = "advanced,logging")
+private String httpLogName;
+
+@UriParam
+@Metadata(label = "advanced")
+private Integer httpReadTimeout;
+
public BraintreeApiName getApiName() {
return apiName;
}
@@ -153,6 +169,46 @@ public class BraintreeConfiguration {
this.proxyPort = proxyPort;
}
+public Level getHttpLogLevel() {
+return httpLogLevel;
+}
+
+/**
+ * Set logging level for http calls, @see java.util.logging.Level
+ */
+public void setHttpLogLevel(String httpLogLevel) {
+this.httpLogLevel = Level.parse(httpLogLevel);
+}
+
+/**
+ * Set logging level for http calls, @see java.util.logging.Level
+ */
+public void setHttpLogLevel(Level httpLogLevel) {
+this.httpLogLevel = httpLogLevel;
+}
+
+public String getHttpLogName() {
+return httpLogName;
+}
+
+/**
+ * Set log category to use to log http calls, default "Braintree"
+ */
+
[4/4] camel git commit: CAMEL-9779: Fixed camel-netty http components to work when no port number has been configured.
CAMEL-9779: Fixed camel-netty http components to work when no port number has
been configured.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ece92d49
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ece92d49
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ece92d49
Branch: refs/heads/camel-2.16.x
Commit: ece92d4953bd6af31bf697b0a7a04146a663d4fb
Parents: 5295407
Author: Claus Ibsen
Authored: Thu Mar 31 07:53:30 2016 +0200
Committer: Claus Ibsen
Committed: Thu Mar 31 07:59:00 2016 +0200
--
.../apache/camel/component/netty/http/NettyCamelWebsiteTest.java | 3 +--
.../apache/camel/component/netty4/http/NettyCamelWebsiteTest.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ece92d49/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
--
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
index b40e37c..2856354 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.netty.http;
import org.apache.camel.Exchange;
-import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
@@ -36,7 +35,7 @@ public class NettyCamelWebsiteTest extends CamelTestSupport {
}
@Override
-protected RoutesBuilder createRouteBuilder() throws Exception {
+protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/ece92d49/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
--
diff --git
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
index 62edbc0..2f6c8be 100644
---
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
+++
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.netty4.http;
import org.apache.camel.Exchange;
-import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
@@ -36,7 +35,7 @@ public class NettyCamelWebsiteTest extends CamelTestSupport {
}
@Override
-protected RoutesBuilder createRouteBuilder() throws Exception {
+protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
[3/4] camel git commit: CAMEL-9779: Fixed camel-netty http components to work when no port number has been configured.
CAMEL-9779: Fixed camel-netty http components to work when no port number has
been configured.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c9994c6c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c9994c6c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c9994c6c
Branch: refs/heads/camel-2.17.x
Commit: c9994c6c11beffb7110037e71040e3c0fd1e6bfa
Parents: 9812112
Author: Claus Ibsen
Authored: Thu Mar 31 07:53:30 2016 +0200
Committer: Claus Ibsen
Committed: Thu Mar 31 07:58:45 2016 +0200
--
.../apache/camel/component/netty/http/NettyCamelWebsiteTest.java | 3 +--
.../apache/camel/component/netty4/http/NettyCamelWebsiteTest.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c9994c6c/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
--
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
index b40e37c..2856354 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.netty.http;
import org.apache.camel.Exchange;
-import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
@@ -36,7 +35,7 @@ public class NettyCamelWebsiteTest extends CamelTestSupport {
}
@Override
-protected RoutesBuilder createRouteBuilder() throws Exception {
+protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/c9994c6c/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
--
diff --git
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
index 62edbc0..2f6c8be 100644
---
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
+++
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.netty4.http;
import org.apache.camel.Exchange;
-import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
@@ -36,7 +35,7 @@ public class NettyCamelWebsiteTest extends CamelTestSupport {
}
@Override
-protected RoutesBuilder createRouteBuilder() throws Exception {
+protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
[1/4] camel git commit: CAMEL-9779: Fixed camel-netty http components to work when no port number has been configured.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 5295407e9 -> ece92d495
refs/heads/camel-2.17.x 49a4f1981 -> c9994c6c1
refs/heads/master 49f108721 -> 1ba36a597
CAMEL-9779: Fixed camel-netty http components to work when no port number has
been configured.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1ba36a59
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1ba36a59
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1ba36a59
Branch: refs/heads/master
Commit: 1ba36a5977ed606f123624ca5a01413eb07b7b91
Parents: 49f1087
Author: Claus Ibsen
Authored: Thu Mar 31 07:53:30 2016 +0200
Committer: Claus Ibsen
Committed: Thu Mar 31 07:53:30 2016 +0200
--
.../apache/camel/component/netty/http/NettyCamelWebsiteTest.java | 3 +--
.../apache/camel/component/netty4/http/NettyCamelWebsiteTest.java | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1ba36a59/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
--
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
index b40e37c..2856354 100644
---
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.netty.http;
import org.apache.camel.Exchange;
-import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
@@ -36,7 +35,7 @@ public class NettyCamelWebsiteTest extends CamelTestSupport {
}
@Override
-protected RoutesBuilder createRouteBuilder() throws Exception {
+protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/1ba36a59/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
--
diff --git
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
index 62edbc0..2f6c8be 100644
---
a/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
+++
b/components/camel-netty4-http/src/test/java/org/apache/camel/component/netty4/http/NettyCamelWebsiteTest.java
@@ -17,7 +17,6 @@
package org.apache.camel.component.netty4.http;
import org.apache.camel.Exchange;
-import org.apache.camel.RoutesBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Ignore;
@@ -36,7 +35,7 @@ public class NettyCamelWebsiteTest extends CamelTestSupport {
}
@Override
-protected RoutesBuilder createRouteBuilder() throws Exception {
+protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
camel git commit: CAMEL-9759: camel-zipkin - Instrument Camel.
Repository: camel Updated Branches: refs/heads/master b50bf4c80 -> 49f108721 CAMEL-9759: camel-zipkin - Instrument Camel. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49f10872 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49f10872 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49f10872 Branch: refs/heads/master Commit: 49f108721ea6f5cea6f075dac7bd5126cc01d6e2 Parents: b50bf4c Author: Claus Ibsen Authored: Thu Mar 31 07:37:21 2016 +0200 Committer: Claus Ibsen Committed: Thu Mar 31 07:37:21 2016 +0200 -- components/pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/49f10872/components/pom.xml -- diff --git a/components/pom.xml b/components/pom.xml index 91103f4..edc6ebd 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -263,6 +263,7 @@ camel-yammer camel-zipfile camel-zipkin +camel-zipkin-starter camel-zookeeper
svn commit: r984283 - in /websites/production/camel/content: cache/main.pageCache hystrix.html
Author: buildbot Date: Wed Mar 30 21:18:36 2016 New Revision: 984283 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/hystrix.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/hystrix.html == --- websites/production/camel/content/hystrix.html (original) +++ websites/production/camel/content/hystrix.html Wed Mar 30 21:18:36 2016 @@ -95,7 +95,7 @@ URI format -URI OptionsAll URI options can be overriden through message headers. Most of the default values are coming from Hystrix itself.NameDefault ValueTypeDescriptioncommandKeyCamelHystrixCommandStringUsed to identify a HystrixCommand instance for statistics, circuit-breaker, properties, etc. By default this will be derived from the instance class name.threadPoolKeynullStringUsed to define which thread-pool this command should run in. By default this is derived from the HystrixCommandGroupKey.cacheKeyExpressionnullExpressionCamel expression to use for generating cache key.initializeRequestContextfalseBooleanWhen true, Camel will initialize a HystrixRequestContext during producer startup and use it for request scoped caching and request scoped logging.runEndpointIdnullString (mandatory)Camel Endpoint ID from the same Camel Context that should be executed from Hystrix.fallbackEndpointIdnullStringCamel Endpoint ID from the same Camel Context that should be executed from Hystrix as fallback when runEndpointId fails.corePoolSize10IntegerThis property sets the core thread-pool size. This is the maximum number of HystrixCommands that can execute concurrently.keepAliveTime1IntegerThis property sets the keep-alive time, in minutes.maxQueueSize-1IntegerThis property sets the maximum queue size of the BlockingQueue implementation.queueSizeRejectionThreshold5IntegerThis property sets the queue size rejection threshold — an artificial maximum queue size at which rejections will occur even if maxQueueSize has not been reached.threadPoolMetricsRollingStatisticalWindowInMilliseconds1IntegerThis property sets the duration of the statistical rolling window, in milliseconds. This is how long metrics are kept for the thread pool.threadPoolMetricsRollingStatisticalWi ndowBuckets10IntegerThis property sets the number of buckets the rolling statistical window is divided into.circuitBreakerEnabledtrueBooleanThis property determines whether a circuit breaker will be used to track health and to short-circuit requests if it trips.circuitBreakerErrorThresholdPercentage50IntegerThis property sets the error percentage at or above which the circuit should >trip open and start short-circuiting requests to fallback >logic.class="confluenceTd">circuitBreakerForceClosedrowspan="1" class="confluenceTd">falseclass="confluenceTd">Booleanclass="confluenceTd">This property, if true, forces the circuit breaker >into a closed state in which it will allow requests regardless of the error >percentage.class="confluenceTd">circuitBreakerForceOpenrowspan="1" class="confluenceTd">falseclass="confluenceTd">Booleanclass="confluenceTd">This property, if true, forces the circuit breaker >into an open (tripped) state in which it will reject all >requests.circuitBreakerRequestVolumeThreshold20IntegerThis property sets the minimum number of requests in a rolling window that will trip the circuit.circuitBreakerSleepWindowInMilliseconds5000IntegerThis property sets the amount of time, after tripping the circuit, to reject requests before allowing attempts again to determine if the circuit should again be closed.executionIsolationSemaphoreMaxConcurrentRequests10IntegerThis property sets the maximum number of requests allowed to a HystrixCommand.run() method when you are using ExecutionIsolationStrategy.SEMAPHORE.If this maximum concurrent limit is hit then subsequent requests will be rejected.executionIsolationStrategyTHREADStringThis property indicates which isolation strategy HystrixCommand.run() executes with, one of the following two choices:THREAD — it executes on a separate thread and concurrent requests are limited by the number of threads in the thread-poolSEMAPHORE — it executes on the calling thread and concurrent requests are limited by the semaphore countexecutionIsolationThreadInterruptOnTimeouttrueBooleanThis property indicates whether the HystrixCommand.run() execution should be interrupted when a timeout occurs.executionTimeoutInMilliseconds1000IntegerThis property sets the time in milliseconds after which the caller will observe a timeout and walk away from the command execution.ex ecutionTimeoutEnabledtrueBooleanThis property indicates whether t
camel git commit: Fix merge issue
Repository: camel
Updated Branches:
refs/heads/master 0343d3fe5 -> b50bf4c80
Fix merge issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b50bf4c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b50bf4c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b50bf4c8
Branch: refs/heads/master
Commit: b50bf4c80cff7aae6120b3d98a6acc4eb214123d
Parents: 0343d3f
Author: Antonin Stefanutti
Authored: Wed Mar 30 21:43:36 2016 +0200
Committer: Antonin Stefanutti
Committed: Wed Mar 30 21:43:36 2016 +0200
--
components/camel-gae/pom.xml | 211 --
1 file changed, 211 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b50bf4c8/components/camel-gae/pom.xml
--
diff --git a/components/camel-gae/pom.xml b/components/camel-gae/pom.xml
deleted file mode 100644
index 2590d28..000
--- a/components/camel-gae/pom.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- 4.0.0
-
-
-org.apache.camel
-components
-2.18-SNAPSHOT
-
-
- camel-gae
- jar
- Camel :: GAE
- Camel GAE support (deprecated)
-
-
-
- javax.servlet.*;version="${servlet-version-range}"
-
-
org.apache.camel.component.gae.*
-
- org.apache.camel.spi.ComponentResolver;component=gauth,
- org.apache.camel.spi.ComponentResolver;component=ghttp,
- org.apache.camel.spi.ComponentResolver;component=ghttps,
- org.apache.camel.spi.ComponentResolver;component=glogin,
- org.apache.camel.spi.ComponentResolver;component=gmail,
- org.apache.camel.spi.ComponentResolver;component=gtask
-
-
-
-
-
-
- org.apache.camel
- camel-servlet
-
-
- javax.servlet
- javax.servlet-api
- provided
-
-
-
- com.google.appengine
- appengine-api-1.0-sdk
- ${google-app-engine-version}
-
-
- com.google.appengine
- appengine-api-labs
- ${google-app-engine-version}
-
-
- com.google.gdata
- core
- 1.47.1
-
-
-
-
- org.openengsb.wrapped
- com.google.gdata
- ${google-gdata-version}
-
-
- com.google.gdata
- gdata-contacts-3.0
-
-
- com.google.gdata
- gdata-calendar-2.0
-
-
- com.google.gdata
- gdata-client-1.0
-
-
- com.google.gdata
- gdata-core-1.0
-
-
-
-
- org.openengsb.wrapped
- com.google.gdata-contacts
- ${google-gdata-version}
-
-
- com.google.gdata
- gdata-contacts-3.0
-
-
- com.google.gdata
- gdata-client-1.0
-
-
- com.google.gdata
- gdata-core-1.0
-
-
-
-
- org.openengsb.wrapped
- com.google.gdata-calendar
- ${google-gdata-version}
-
-
- com.google.gdata
- gdata-client-1.0
-
-
- com.google.gdata
- gdata-calendar-2.0
-
-
- com.google.gdata
- gdata-core-1.0
-
-
-
-
-
-
- com.google.appengine
- appengine-api-stubs
- ${google-app-engine-version}
- test
-
-
- com.google.appengine
- appengine-testing
- ${google-app-engine-version}
- test
-
-
- org.eclipse.jetty
- jetty-server
- ${jetty-version}
- test
-
-
- org.eclipse.jetty
- jetty-servlet
- ${jetty-version}
- test
-
-
- org.apache.camel
- camel-test
- test
-
-
- org.springframework
- spring-test
- test
-
-
- org.apache.camel
- camel-spring
- test
-
-
- org.springframework
- spring-web
- test
-
-
- httpunit
- httpunit
- test
-
-
- org.slf4j
- slf4j-log4j12
- test
-
-
- junit
- junit
- test
-
-
-
-
-
-
-maven-surefire-plugin
-
- 1
- false
-
-
-
-
-
camel git commit: CAMEL-9765: Direct-VM - Ensure that TCCL is restored in async scenarios.
Repository: camel
Updated Branches:
refs/heads/master 80957b2d3 -> 0343d3fe5
CAMEL-9765: Direct-VM - Ensure that TCCL is restored in async scenarios.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0343d3fe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0343d3fe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0343d3fe
Branch: refs/heads/master
Commit: 0343d3fe5c7c042ccdfde344fc1c01bedd66bfc9
Parents: 80957b2
Author: Raúl Kripalani
Authored: Wed Mar 30 20:21:53 2016 +0100
Committer: Raúl Kripalani
Committed: Wed Mar 30 20:21:53 2016 +0100
--
.../apache/camel/component/directvm/DirectVmProcessor.java| 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0343d3fe/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
index 299ddf0..2844f6a 100644
---
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
+++
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmProcessor.java
@@ -52,10 +52,17 @@ public final class DirectVmProcessor extends
DelegateAsyncProcessor {
Thread.currentThread().setContextClassLoader(appClassLoader);
changed = true;
}
+
+final boolean chgd = changed;
return processor.process(copy, new AsyncCallback() {
@Override
public void done(boolean done) {
try {
+// restore TCCL if it was changed during processing
+if (chgd) {
+LOG.trace("Restoring Thread ContextClassLoader to
{}", current);
+
Thread.currentThread().setContextClassLoader(current);
+}
// make sure to copy results back
ExchangeHelper.copyResults(exchange, copy);
} finally {
camel git commit: CAMEL-9765: Direct-VM - Header filter strategy & property propagation flag.
Repository: camel
Updated Branches:
refs/heads/master fd89a88cf -> 80957b2d3
CAMEL-9765: Direct-VM - Header filter strategy & property propagation flag.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80957b2d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80957b2d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80957b2d
Branch: refs/heads/master
Commit: 80957b2d3d9c1d2ebf4c51630f76cf4828f37170
Parents: fd89a88
Author: Raúl Kripalani
Authored: Fri Mar 25 21:07:40 2016 +
Committer: Raúl Kripalani
Committed: Wed Mar 30 20:01:36 2016 +0100
--
.../component/directvm/DirectVmComponent.java | 32
.../component/directvm/DirectVmConsumer.java| 1 -
.../component/directvm/DirectVmEndpoint.java| 33 -
.../component/directvm/DirectVmProducer.java| 54 +-
.../DirectVmHeaderFilterStrategyTest.java | 77
...ectVmNoPropertyPropagationComponentTest.java | 62
.../DirectVmNoPropertyPropagationTest.java | 61
7 files changed, 299 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/80957b2d/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
index 3e48c7c..d5c341f 100644
---
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
+++
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmComponent.java
@@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
+import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spi.Metadata;
/**
@@ -41,6 +42,9 @@ public class DirectVmComponent extends UriEndpointComponent {
private boolean block;
@Metadata(defaultValue = "3")
private long timeout = 3L;
+private HeaderFilterStrategy headerFilterStrategy;
+@Metadata(defaultValue = "true")
+private Boolean propagateProperties = Boolean.TRUE;
public DirectVmComponent() {
super(DirectVmEndpoint.class);
@@ -65,6 +69,7 @@ public class DirectVmComponent extends UriEndpointComponent {
answer.setBlock(block);
answer.setTimeout(timeout);
answer.configureProperties(parameters);
+setProperties(answer, parameters);
return answer;
}
@@ -132,4 +137,31 @@ public class DirectVmComponent extends
UriEndpointComponent {
public void setTimeout(long timeout) {
this.timeout = timeout;
}
+
+public HeaderFilterStrategy getHeaderFilterStrategy() {
+return headerFilterStrategy;
+}
+
+/**
+ * Sets a {@link HeaderFilterStrategy} that will only be applied on
producer endpoints (on both directions: request and response).
+ * Default value: none.
+ * @param headerFilterStrategy
+ */
+public void setHeaderFilterStrategy(HeaderFilterStrategy
headerFilterStrategy) {
+this.headerFilterStrategy = headerFilterStrategy;
+}
+
+public boolean isPropagateProperties() {
+return propagateProperties;
+}
+
+/**
+ * Whether to propagate or not properties from the producer side to the
consumer side, and viceversa.
+ * Default value: true.
+ * @param propagateProperties
+ */
+public void setPropagateProperties(boolean propagateProperties) {
+this.propagateProperties = propagateProperties;
+}
+
}
http://git-wip-us.apache.org/repos/asf/camel/blob/80957b2d/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
index 4b18fe3..827e975 100644
---
a/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
+++
b/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmConsumer.java
@@ -18,7 +18,6 @@ package org.apache.camel.component.directvm;
import org.apache.camel.Processor;
import org.apache.camel.Suspendable;
-import org.apache.camel.SuspendableService;
import org.apache.camel.impl.DefaultConsumer;
/**
http://git-wip-us.apache.org/repos/asf/camel/blob/80957b2d/camel-core/src/main/java/org/apache/camel/component/directvm/DirectVmEndpoint.java
--
camel git commit: CAMEL-9764: Switch the camel-zipkin module to the new JAR-based build.
Repository: camel Updated Branches: refs/heads/master 7ae918f23 -> fd89a88cf CAMEL-9764: Switch the camel-zipkin module to the new JAR-based build. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fd89a88c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fd89a88c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fd89a88c Branch: refs/heads/master Commit: fd89a88cfe80908860360614417ccddfc8518c48 Parents: 7ae918f Author: Raúl Kripalani Authored: Wed Mar 30 19:56:14 2016 +0100 Committer: Raúl Kripalani Committed: Wed Mar 30 19:56:14 2016 +0100 -- components/camel-zipkin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/fd89a88c/components/camel-zipkin/pom.xml -- diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml index be6ab4b..9473ef2 100644 --- a/components/camel-zipkin/pom.xml +++ b/components/camel-zipkin/pom.xml @@ -27,7 +27,7 @@ camel-zipkin - bundle + jar Camel :: Zookeeper Camel Zipkin Support
[3/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas.
CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7ae918f2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7ae918f2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7ae918f2 Branch: refs/heads/master Commit: 7ae918f23c269c8ad78fc8e536b53342af569dec Parents: 8f0bcd8 Author: Raúl Kripalani Authored: Wed Mar 30 19:39:45 2016 +0100 Committer: Raúl Kripalani Committed: Wed Mar 30 19:43:09 2016 +0100 -- camel-core/pom.xml | 3 +- components/camel-ahc-ws/pom.xml | 2 +- components/camel-ahc/pom.xml| 2 +- components/camel-amqp/pom.xml | 2 +- components/camel-apns/pom.xml | 2 +- components/camel-atmos/pom.xml | 2 +- components/camel-atmosphere-websocket/pom.xml | 2 +- components/camel-atom/pom.xml | 2 +- components/camel-avro/pom.xml | 2 +- components/camel-aws/pom.xml| 2 +- components/camel-bam/pom.xml| 2 +- components/camel-barcode/pom.xml| 2 +- components/camel-base64/pom.xml | 2 +- components/camel-bean-validator/pom.xml | 2 +- components/camel-beanio/pom.xml | 2 +- components/camel-beanstalk/pom.xml | 2 +- components/camel-bindy/pom.xml | 2 +- components/camel-blueprint/pom.xml | 56 - components/camel-boon/pom.xml | 2 +- components/camel-box/pom.xml| 2 +- components/camel-braintree/pom.xml | 2 +- components/camel-cache/pom.xml | 2 +- components/camel-cassandraql/pom.xml| 2 +- components/camel-castor/pom.xml | 2 +- components/camel-cdi/pom.xml| 2 +- components/camel-chunk/pom.xml | 2 +- components/camel-cm-sms/pom.xml | 2 +- components/camel-cmis/pom.xml | 2 +- components/camel-coap/pom.xml | 2 +- components/camel-cometd/pom.xml | 2 +- components/camel-context/pom.xml| 2 +- components/camel-core-osgi/pom.xml | 2 +- components/camel-core-xml/pom.xml | 6 + components/camel-couchdb/pom.xml| 2 +- components/camel-crypto/pom.xml | 2 +- components/camel-csv/pom.xml| 2 +- components/camel-cxf-transport/pom.xml | 2 +- components/camel-cxf/pom.xml| 3 +- components/camel-disruptor/pom.xml | 2 +- components/camel-dns/pom.xml| 2 +- components/camel-docker/pom.xml | 2 +- components/camel-dozer/pom.xml | 2 +- components/camel-dropbox/pom.xml| 2 +- components/camel-eclipse/pom.xml| 2 +- components/camel-ejb/pom.xml| 2 +- components/camel-elasticsearch/pom.xml | 2 +- components/camel-elsql/pom.xml | 2 +- components/camel-etcd/pom.xml | 2 +- components/camel-eventadmin/pom.xml | 2 +- components/camel-exec/pom.xml | 2 +- components/camel-facebook/pom.xml | 2 +- components/camel-flatpack/pom.xml | 2 +- components/camel-fop/pom.xml| 2 +- components/camel-freemarker/pom.xml | 2 +- components/camel-ftp/pom.xml| 2 +- components/camel-gae/pom.xml| 211 +++ components/camel-ganglia/pom.xml| 2 +- components/camel-geocoder/pom.xml | 2 +- components/camel-git/pom.xml| 2 +- components/camel-github/pom.xml | 2 +- components/camel-google-calendar/pom.xml| 2 +- components/camel-google-drive/pom.xml | 2 +- components/camel-google-mail/pom.xml| 2 +- components/camel-gora/pom.xml | 2 +- components/camel-grape/pom.xml | 1 + components/camel-groovy/pom.xml | 2 +- components/camel-gson/pom.xml | 2 +- components/camel-guava-eventbus/pom.xml | 2 +- components/camel-guice/pom.xml | 2 +- components/camel-hawtdb/pom.xml | 2 +- components/camel-hazelcast/pom.xml | 2 +- components/camel-hbase/pom.xml | 2 +- components/camel-hdfs/pom.xml | 2 +- components/camel-hdfs2/pom.xml | 2 +- components/camel-hessian/pom.xml| 2 +-
[1/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas.
Repository: camel
Updated Branches:
refs/heads/master 8f0bcd803 -> 7ae918f23
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/examples/camel-example-cxf-osgi/pom.xml
--
diff --git a/examples/camel-example-cxf-osgi/pom.xml
b/examples/camel-example-cxf-osgi/pom.xml
index 1c92b7d..e423f2c 100644
--- a/examples/camel-example-cxf-osgi/pom.xml
+++ b/examples/camel-example-cxf-osgi/pom.xml
@@ -28,7 +28,43 @@
camel-example-cxf-osgi
Camel :: Example :: CXF :: OSGI
An example which use a CXF consumer and the OSGI HTTP
Service
- bundle
+ jar
+
+
+
+org.apache.cxf,
+ org.apache.cxf.binding,
+ org.apache.cxf.binding.corba,
+ org.apache.cxf.binding.soap,
+ org.apache.cxf.binding.soap.spring,
+ org.apache.cxf.bus,
+ org.apache.cxf.bus.resource,
+ org.apache.cxf.bus.spring,
+ org.apache.cxf.buslifecycle,
+ org.apache.cxf.catalog,
+ org.apache.cxf.configuration,
+ org.apache.cxf.configuration.spring,
+ org.apache.cxf.endpoint,
+ org.apache.cxf.headers,
+ org.apache.cxf.management,
+ org.apache.cxf.management.jmx,
+ org.apache.cxf.phase,
+ org.apache.cxf.resource,
+ org.apache.cxf.service.factory,
+ org.apache.cxf.transport,
+ org.apache.cxf.transport.http,
+ org.apache.cxf.transport.http.policy,
+ org.apache.cxf.transport.http_jetty,
+ org.apache.cxf.transport.jms,
+ org.apache.cxf.workqueue,
+ org.apache.cxf.wsdl,
+ org.apache.cxf.wsdl11,
+ *
+
+
+org.apache.camel.example.reportincident*
+
+
@@ -106,50 +142,6 @@
-
-
-
- org.apache.felix
- maven-bundle-plugin
- true
-
-
target/META-INF
-
-
${project.groupId}.${project.artifactId}
-
org.apache.camel.example.reportincident*
-
- org.apache.cxf,
- org.apache.cxf.binding,
-
org.apache.cxf.binding.corba,
-
org.apache.cxf.binding.soap,
-
org.apache.cxf.binding.soap.spring,
- org.apache.cxf.bus,
-
org.apache.cxf.bus.resource,
-
org.apache.cxf.bus.spring,
-
org.apache.cxf.buslifecycle,
- org.apache.cxf.catalog,
-
org.apache.cxf.configuration,
-
org.apache.cxf.configuration.spring,
- org.apache.cxf.endpoint,
- org.apache.cxf.headers,
-
org.apache.cxf.management,
-
org.apache.cxf.management.jmx,
- org.apache.cxf.phase,
- org.apache.cxf.resource,
-
org.apache.cxf.service.factory,
-
org.apache.cxf.transport,
-
org.apache.cxf.transport.http,
-
org.apache.cxf.transport.http.policy,
-
org.apache.cxf.transport.http_jetty,
-
org.apache.cxf.transport.jms,
-
org.apache.cxf.workqueue,
- org.apache.cxf.wsdl,
- org.apache.cxf.wsdl11,
- *
-
[2/3] camel git commit: CAMEL-9764 Update maven-bundle-plugin to 3.0.1 to allow JDK8 lambdas.
http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jms/pom.xml -- diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index 07a91e0..63a344c 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -25,7 +25,7 @@ camel-jms -bundle +jar Camel :: JMS Camel JMS support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jmx/pom.xml -- diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml index 1a8f2fb..69dda09 100644 --- a/components/camel-jmx/pom.xml +++ b/components/camel-jmx/pom.xml @@ -25,7 +25,7 @@ camel-jmx -bundle +jar Camel :: JMX Camel JMX support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jolt/pom.xml -- diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml index e44f9f6..d74e09b 100644 --- a/components/camel-jolt/pom.xml +++ b/components/camel-jolt/pom.xml @@ -26,7 +26,7 @@ camel-jolt - bundle + jar Camel :: Jolt Camel Jolt Support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-josql/pom.xml -- diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml index 4463651..975a6d8 100644 --- a/components/camel-josql/pom.xml +++ b/components/camel-josql/pom.xml @@ -25,7 +25,7 @@ camel-josql - bundle + jar Camel :: JoSQL Camel JoSQL support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jpa/pom.xml -- diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index 8c020a2..4a8a180 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -25,7 +25,7 @@ camel-jpa - bundle + jar Camel :: JPA Camel JPA support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jsch/pom.xml -- diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml index d82effc..002475b 100644 --- a/components/camel-jsch/pom.xml +++ b/components/camel-jsch/pom.xml @@ -27,7 +27,7 @@ camel-jsch - bundle + jar Camel :: Jsch Camel SCP Support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jsonpath/pom.xml -- diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml index 7bee585..3d24dc6 100644 --- a/components/camel-jsonpath/pom.xml +++ b/components/camel-jsonpath/pom.xml @@ -26,7 +26,7 @@ camel-jsonpath - bundle + jar Camel :: JSon Path Camel JSON Path Language http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jt400/pom.xml -- diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml index d3281aa..b135b0a 100644 --- a/components/camel-jt400/pom.xml +++ b/components/camel-jt400/pom.xml @@ -25,7 +25,7 @@ camel-jt400 - bundle + jar Camel :: Java Toolbox for AS/400 Camel AS/400 support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-juel/pom.xml -- diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml index 7c7322b..ab3db28 100644 --- a/components/camel-juel/pom.xml +++ b/components/camel-juel/pom.xml @@ -25,7 +25,7 @@ camel-juel - bundle + jar Camel :: JUEL Camel JUEL support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-jxpath/pom.xml -- diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml index 88b9902..53da26f 100644 --- a/components/camel-jxpath/pom.xml +++ b/components/camel-jxpath/pom.xml @@ -25,7 +25,7 @@ camel-jxpath - bundle + jar Camel :: JXPath Camel JXPath support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-kafka/pom.xml -- diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml index e31c0a4..5cb899f 100644 --- a/components/camel-kafka/pom.xml +++ b/components/camel-kafka/pom.xml @@ -26,7 +26,7 @@ camel-kafka - bundle + jar Camel :: Kafka Camel Kafka support http://git-wip-us.apache.org/repos/asf/camel/blob/7ae918f2/components/camel-kestrel/pom.xml ---
[1/2] camel git commit: CAMEL-9764: Build - Adapt camel-blueprint, camel-cxf and camel-spring builds.
Repository: camel
Updated Branches:
refs/heads/jdk8-lambdas 55c405583 -> 385ecf58f
CAMEL-9764: Build - Adapt camel-blueprint, camel-cxf and camel-spring builds.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3a3ad7a9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a3ad7a9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a3ad7a9
Branch: refs/heads/jdk8-lambdas
Commit: 3a3ad7a9ef0d9f0b012120116c949e1067a58680
Parents: 55c4055
Author: Raúl Kripalani
Authored: Wed Mar 30 17:53:05 2016 +0100
Committer: Raúl Kripalani
Committed: Wed Mar 30 17:53:05 2016 +0100
--
components/camel-blueprint/pom.xml | 54 ++---
components/camel-cxf/pom.xml | 1 +
components/camel-spring/pom.xml| 52 ---
parent/pom.xml | 2 +-
4 files changed, 100 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/components/camel-blueprint/pom.xml
--
diff --git a/components/camel-blueprint/pom.xml
b/components/camel-blueprint/pom.xml
index fe9b62b..b5f7a83 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -33,6 +33,8 @@
!org.apache.camel.blueprint.*,
!org.apache.camel.util.blueprint.*,
+!org.apache.camel.core.osgi.*,
+!org.apache.camel.core.xml.*,
org.apache.camel.*;${camel.osgi.import.strict.version},
org.osgi.service.event*;resolution:=optional,
org.apache.aries*;version="[1.0,2)",
@@ -43,10 +45,10 @@
org.apache.camel.blueprint*;${camel.osgi.version},
org.apache.camel.util.blueprint*;${camel.osgi.version}
-
- org.apache.camel.core.osgi*,
- org.apache.camel.core.xml*
-
+
+ org.apache.camel.core.osgi*,
+ org.apache.camel.core.xml*
+
@@ -120,6 +122,39 @@
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+ 2.10
+
+
+ unpack
+ prepare-package
+
+unpack
+
+
+
+
+org.apache.camel
+camel-core-xml
+${project.version}
+org/apache/camel/**
+
${project.build.directory}/classes
+
+
+org.apache.camel
+camel-core-osgi
+${project.version}
+org/apache/camel/**
+
${project.build.directory}/classes
+
+
+
+
+
+
@@ -165,6 +200,17 @@
+
+
+ org.apache.felix
+ maven-bundle-plugin
+
+
+ bundle-manifest
+ prepare-package
+
+
+
http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/components/camel-cxf/pom.xml
--
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 08ff58e..55622d3 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -40,6 +40,7 @@
!org.apache.camel.component.cxf.jaxrs,
!org.apache.camel.component.cxf.spring,
!org.apache.camel.component.cxf.util,
+ !org.apache.camel.blueprint,
javax.activation*;version="[0.0,2)",
javax.annotation*;version="[0.0,2)",
javax.jws*;version="[0.0,3)",
http://git-wip-us.apache.org/repos/asf/camel/blob/3a3ad7a9/components/camel-spring/pom.xml
--
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 9e9ace5..5b79d0e 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -37,6 +37,8 @@
!org.apache.camel.component,
!org.apache.camel.component.event,
!org.apache.camel.language.spel,
+!org.apache.camel.core.osgi*,
+!org.apache.camel.core.xml*,
org.apache.camel.*;${camel.osgi.import.strict.version},
org.springframework.osgi.*;version="[1.2,2)",
[2/2] camel git commit: CAMEL-9764: Build - Simplify build for all JARs that don't need to be bundles.
CAMEL-9764: Build - Simplify build for all JARs that don't need to be bundles. In reality, we generate manifests for all JARs, setting OSGi exports on non-bundles to empty. The manifests are valid, even if not used. Unfortunately Maven cannot turn on/off profiles based on build properties, only based on system properties (and files, etc.). Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/385ecf58 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/385ecf58 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/385ecf58 Branch: refs/heads/jdk8-lambdas Commit: 385ecf58fb789d089c660da96a8d7bbc0f34d762 Parents: 3a3ad7a Author: Raúl Kripalani Authored: Wed Mar 30 19:05:20 2016 +0100 Committer: Raúl Kripalani Committed: Wed Mar 30 19:06:10 2016 +0100 -- components/camel-grape/pom.xml | 2 +- components/camel-spring-boot-starter/pom.xml| 2 +- components/camel-spring-boot/pom.xml| 2 +- examples/camel-example-cdi-metrics/pom.xml | 4 - examples/camel-example-cdi-test/pom.xml | 4 - examples/camel-example-cdi/pom.xml | 4 - examples/camel-example-console/pom.xml | 4 - examples/camel-example-ftp/pom.xml | 4 - examples/camel-example-guice-jms/pom.xml| 4 - examples/camel-example-jms-file/pom.xml | 4 - examples/camel-example-loadbalancing/pom.xml| 4 - examples/camel-example-splunk/pom.xml | 4 - .../camel-example-spring-boot-metrics/pom.xml | 1 - .../camel-example-spring-boot-starter/pom.xml | 1 - examples/camel-example-swagger-cdi/pom.xml | 4 - .../camel-example-twitter-websocket/pom.xml | 4 - .../camel-example-widget-gadget-cdi/pom.xml | 4 - .../camel-example-widget-gadget-java/pom.xml| 4 - .../camel-example-widget-gadget-xml/pom.xml | 4 - examples/pom.xml| 1 + parent/pom.xml | 134 --- platforms/commands/commands-spring-boot/pom.xml | 2 +- tests/pom.xml | 2 +- tooling/pom.xml | 2 +- 24 files changed, 66 insertions(+), 139 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/components/camel-grape/pom.xml -- diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml index 9886c71..affddcc 100644 --- a/components/camel-grape/pom.xml +++ b/components/camel-grape/pom.xml @@ -33,7 +33,7 @@ 2.4.3-01 2.9.2-01 2.7 -true + http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/components/camel-spring-boot-starter/pom.xml -- diff --git a/components/camel-spring-boot-starter/pom.xml b/components/camel-spring-boot-starter/pom.xml index 9640e3e..c99f8e3 100644 --- a/components/camel-spring-boot-starter/pom.xml +++ b/components/camel-spring-boot-starter/pom.xml @@ -30,7 +30,7 @@ Spring Boot Apache Camel Starter -true + http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/components/camel-spring-boot/pom.xml -- diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml index ac500f8..035bcff 100644 --- a/components/camel-spring-boot/pom.xml +++ b/components/camel-spring-boot/pom.xml @@ -30,7 +30,7 @@ Camel :: Spring Boot -true + http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/examples/camel-example-cdi-metrics/pom.xml -- diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml index a6c2998..f1fd5d0 100755 --- a/examples/camel-example-cdi-metrics/pom.xml +++ b/examples/camel-example-cdi-metrics/pom.xml @@ -31,10 +31,6 @@ Dropwizard Metrics CDI example jar - -true - - http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/examples/camel-example-cdi-test/pom.xml -- diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml index 53b183c..0d060fc 100644 --- a/examples/camel-example-cdi-test/pom.xml +++ b/examples/camel-example-cdi-test/pom.xml @@ -28,10 +28,6 @@ Camel :: Example :: CDI :: Testing An example illustrating Camel CDI testing features - -true - - http://git-wip-us.apache.org/repos/asf/camel/blob/385ecf58/examples/camel-example-cdi/pom.xml --
svn commit: r984268 - in /websites/production/camel/content: cache/main.pageCache camel-2180-release.html
Author: buildbot Date: Wed Mar 30 18:18:43 2016 New Revision: 984268 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2180-release.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-2180-release.html == --- websites/production/camel/content/camel-2180-release.html (original) +++ websites/production/camel/content/camel-2180-release.html Wed Mar 30 18:18:43 2016 @@ -85,7 +85,7 @@ -Camel 2.18.0 release (currently in progress)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";> New and NoteworthyWelcome to the x.y.z release which approx XXX issues resolved (new features, improvements and bug fixes such as...)Improved the Bean component to better match method parameter types when using Simple language as parameter values.Added BindyConverter that allows to implement custom data converters for BindyFixed these issuesFixed Bean component to avoid ambiguous error for classes that extends generic interface and calling which could lead to falsly duplicate methods (due Java type erasure inserts bridge methods) Fixed splitting using tarfile could cause OOME if splitting big files which was mistakenly loaded into memory. Now we work on the tar stream directly.New Enterprise Integration PatternsNew Componentscamel-cm-sms - For sending SMS messages using SM SMS Gatewaycamel-servicenow - For cloud management with ServiceNowcamel-hystrix - For implementin g circuit breaker, timeouts, bulkeahds, caching, etc.camel-zipkin - For tracking Camel message flows/timings using http://zipkin.io/"; rel="nofollow">zipkinNew DSLNew AnnotationsNew Data FormatsNew LanguagesNew ExamplesNew TutorialsAPI breakingKnown Issuescamel-guice cannot install in Karaf/ServiceMixImportant changes to consider when upgradingJava 1.8 is now required.Getting the DistributionsBinary DistributionsDescriptionDownload LinkPGP Signature file of downloadWindows Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip";>apache-camel-x.y.x.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip.asc";>apache-camel-x.y.x.zip.ascUnix/Linux/Cygwin Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz";>apache-camel-x.y.x.tar.gzhttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz.asc";>apache-camel-x.y.x.tar.gz.ascThe above URLs use redirectionThe above URLs use the Apache Mirror system to redirect you to a suitable mirror for your download. Some users have experienced issues with some versions of browsers (e.g. some Safari browsers). If the download doesn't seem to work for you from the above URL then try using http://www.mozilla.com/en-US/firefox/"; rel="nofollow">FireFoxSource DistributionsDescriptionDownload LinkPGP Signature file of downloadSource for Windowshttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x-src.zip";>apache-camel-x.y.x-src.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x-src.zip.asc";>apache-camel-x.y.x-src.zip.ascSource for Unix/Linux/Cygwinhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x-src.tar.gz";>apache-camel-x.y.x-src.tar.gzhttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x-src.tar.gz.asc";>apache-camel-x.y.x-src.tar.gz.ascGetting the Binaries using Maven 2To use this release in your maven project, the proper dependency configuration that you should use in your http://maven.apache.org/guides/introduction/introduction-to-the-pom.html";>Maven POM is: +Camel 2.18.0 release (currently in progress)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";> New and NoteworthyWelcome to the x.y.z release which approx XXX issues resolved (new features, improvements and bug fixes such as...)Improved the Bean component to better match method parameter types when using Simple language as parameter values.Added BindyConverter that allows to implement custom data converters for BindyFixed these issuesFixed Bean component to avoid ambiguous error for classes that extends generic interface and calling which could lead to falsly duplicate methods (due Java type erasure inserts bridge methods) Fixed splitting using tarfile could cause OOME if splitting big files which was mistakenly loaded into memory. Now we work on the tar stream directly.Fixed Netty HTTP and Netty4 HTTP issue when not sp
[3/7] camel git commit: CAMEL-9778: Remove deprecated GAE component and dependencies
http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpEndpointTest.java
--
diff --git
a/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpEndpointTest.java
b/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpEndpointTest.java
deleted file mode 100644
index 35d6b5f..000
---
a/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpEndpointTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.gae.http;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import static
org.apache.camel.component.gae.http.GHttpTestUtils.createEndpoint;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-public class GHttpEndpointTest {
-
-private static final String AMP = "&";
-
-@Before
-public void setUp() throws Exception {
-}
-
-@Test
-public void testGetEndpointUrl() throws Exception {
-GHttpEndpoint endpoint1 =
createEndpoint("ghttp://somewhere.com/path?a=b";);
-GHttpEndpoint endpoint2 =
createEndpoint("ghttps://somewhere.com/path?a=b";);
-GHttpEndpoint endpoint3 =
createEndpoint("xhttps://somewhere.com/path?a=b";);
-
-assertEquals("http://somewhere.com/path?a=b";,
endpoint1.getEndpointUrl().toString());
-assertEquals("https://somewhere.com/path?a=b";,
endpoint2.getEndpointUrl().toString());
-assertEquals("http://somewhere.com/path?a=b";,
endpoint3.getEndpointUrl().toString());
-}
-
-@Test
-public void testPropertiesDefault() throws Exception {
-GHttpEndpoint endpoint =
createEndpoint("ghttp://somewhere.com/path?a=b";);
-
assertTrue(endpoint.getOutboundBinding().getClass().equals(GHttpBinding.class));
-}
-
-@Test
-public void testPropertiesCustom() throws Exception {
-StringBuilder buffer = new StringBuilder("ghttp://somewhere.com/path";)
-.append("?").append("a=b")
-.append(AMP).append("bridgeEndpoint=false")
-.append(AMP).append("outboundBindingRef=#customBinding")
-.append(AMP).append("throwExceptionOnFailure=false");
-GHttpEndpoint endpoint = createEndpoint(buffer.toString());
-
assertFalse(endpoint.getOutboundBinding().getClass().equals(GHttpBinding.class));
-assertTrue(endpoint.getOutboundBinding() instanceof GHttpBinding);
-assertEquals("ghttp://somewhere.com/path?a=b";,
endpoint.getEndpointUri());
-}
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpInboundRouteBuilder.java
--
diff --git
a/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpInboundRouteBuilder.java
b/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpInboundRouteBuilder.java
deleted file mode 100644
index 803a9ee..000
---
a/components/camel-gae/src/test/java/org/apache/camel/component/gae/http/GHttpInboundRouteBuilder.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-packag
[7/7] camel git commit: CAMEL-9776 : camel-braintree: add uri param to configure advanced options
CAMEL-9776 : camel-braintree: add uri param to configure advanced options
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aa3d9e46
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aa3d9e46
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aa3d9e46
Branch: refs/heads/master
Commit: aa3d9e46d458586405c1896bfe570ced0858b923
Parents: 94e6eb3
Author: lburgazzoli
Authored: Wed Mar 30 17:28:10 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 19:45:46 2016 +0200
--
components/camel-braintree/pom.xml | 42 +-
.../braintree/BraintreeConfiguration.java | 82 +++-
.../braintree/AbstractBraintreeTestSupport.java | 3 +
.../src/test/resources/log4j.properties | 8 +-
parent/pom.xml | 5 ++
.../features/src/main/resources/features.xml| 2 +-
6 files changed, 121 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/aa3d9e46/components/camel-braintree/pom.xml
--
diff --git a/components/camel-braintree/pom.xml
b/components/camel-braintree/pom.xml
index cf72639..420d523 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -54,24 +54,6 @@
braintree-java
${braintree-gateway-version}
-
- org.apache.commons
- commons-lang3
- ${commons-lang3-version}
-
-
-
- commons-collections
- commons-collections
- ${commons-collections-version}
- test
-
-
- com.google.guava
- guava
- ${google-guava-version}
- test
-
@@ -90,6 +72,12 @@
org.slf4j
+ jul-to-slf4j
+
+
+
+
+ org.slf4j
slf4j-log4j12
test
@@ -105,6 +93,24 @@
camel-test
test
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3-version}
+ test
+
+
+ commons-collections
+ commons-collections
+ ${commons-collections-version}
+ test
+
+
+ com.google.guava
+ guava
+ ${google-guava-version}
+ test
+
http://git-wip-us.apache.org/repos/asf/camel/blob/aa3d9e46/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
--
diff --git
a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
index b7a5d87..1b4e39c 100644
---
a/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
+++
b/components/camel-braintree/src/main/java/org/apache/camel/component/braintree/BraintreeConfiguration.java
@@ -16,6 +16,10 @@
*/
package org.apache.camel.component.braintree;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import com.braintreegateway.BraintreeGateway;
import com.braintreegateway.Environment;
import org.apache.camel.component.braintree.internal.BraintreeApiName;
@@ -24,6 +28,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
import org.apache.camel.spi.UriPath;
import org.apache.camel.util.ObjectHelper;
+import org.slf4j.bridge.SLF4JBridgeHandler;
/**
* Component configuration for Braintree component.
@@ -65,6 +70,17 @@ public class BraintreeConfiguration {
@Metadata(label = "proxy")
private Integer proxyPort;
+@UriParam(javaType = "java.lang.String")
+@Metadata(label = "advanced,logging")
+private Level httpLogLevel;
+
+@Metadata(label = "advanced,logging")
+private String httpLogName;
+
+@UriParam
+@Metadata(label = "advanced")
+private Integer httpReadTimeout;
+
public BraintreeApiName getApiName() {
return apiName;
}
@@ -153,6 +169,46 @@ public class BraintreeConfiguration {
this.proxyPort = proxyPort;
}
+public Level getHttpLogLevel() {
+return httpLogLevel;
+}
+
+/**
+ * Set logging level for http calls, @see java.util.logging.Level
+ */
+public void setHttpLogLevel(String httpLogLevel) {
+this.httpLogLevel = Level.parse(httpLogLevel);
+}
+
+/**
+ * Set logging level for http calls, @see java.util.logging.Level
+ */
+public void setHttpLogLevel(Level httpLogLevel) {
+this.httpLogLevel = httpLogLevel;
+}
+
+public String getHttpLogName() {
+return httpLogName;
+}
+
+/**
+ * Set log category to use to log http calls, default "Braintree"
+ */
+public
[5/7] camel git commit: CAMEL-9778: Remove deprecated GAE component and dependencies
http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/OutboundBindingSupport.java
--
diff --git
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/OutboundBindingSupport.java
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/OutboundBindingSupport.java
deleted file mode 100644
index 6a0a17c..000
---
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/bind/OutboundBindingSupport.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.gae.bind;
-
-import org.apache.camel.Endpoint;
-import org.apache.camel.Producer;
-
-/**
- * Implemented by {@link Endpoint}s that provide an {@link OutboundBinding} to
- * {@link Producer}s.
- *
- * @see InboundBinding
- */
-public interface OutboundBindingSupport {
-
-OutboundBinding getOutboundBinding();
-
-void setOutboundBinding(OutboundBinding outboundBinding);
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
--
diff --git
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
deleted file mode 100644
index 3bc1f23..000
---
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/context/GaeDefaultCamelContext.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.gae.context;
-
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.SimpleRegistry;
-
-public class GaeDefaultCamelContext extends DefaultCamelContext {
-
-public GaeDefaultCamelContext() {
-// disable JMX and use the simple registry as JNDI is not allowed
-disableJMX();
-setRegistry(new SimpleRegistry());
-}
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpBinding.java
--
diff --git
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpBinding.java
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpBinding.java
deleted file mode 100644
index fd86339..000
---
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/http/GHttpBinding.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR C
[1/7] camel git commit: CAMEL-9778: Remove deprecated GAE component and dependencies
Repository: camel Updated Branches: refs/heads/master 94e6eb324 -> 8f0bcd803 http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/examples/camel-example-gauth/src/main/resources/META-INF/LICENSE.txt -- diff --git a/examples/camel-example-gauth/src/main/resources/META-INF/LICENSE.txt b/examples/camel-example-gauth/src/main/resources/META-INF/LICENSE.txt deleted file mode 100644 index 6b0b127..000 --- a/examples/camel-example-gauth/src/main/resources/META-INF/LICENSE.txt +++ /dev/null @@ -1,203 +0,0 @@ - - Apache License - Version 2.0, January 2004 -http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those pate
[4/7] camel git commit: CAMEL-9778: Remove deprecated GAE component and dependencies
http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
--
diff --git
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
deleted file mode 100644
index 83c1f38..000
---
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskEndpoint.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.gae.task;
-
-import java.lang.reflect.Proxy;
-import java.net.URI;
-import java.net.URISyntaxException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.google.appengine.api.taskqueue.Queue;
-import com.google.appengine.api.taskqueue.TaskOptions;
-import org.apache.camel.Exchange;
-import org.apache.camel.Producer;
-import org.apache.camel.component.gae.bind.HttpBindingInvocationHandler;
-import org.apache.camel.component.gae.bind.InboundBinding;
-import org.apache.camel.component.gae.bind.OutboundBinding;
-import org.apache.camel.component.gae.bind.OutboundBindingSupport;
-import org.apache.camel.component.servlet.ServletComponent;
-import org.apache.camel.component.servlet.ServletEndpoint;
-import org.apache.camel.http.common.HttpBinding;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.UriEndpoint;
-import org.apache.camel.spi.UriParam;
-import org.apache.camel.spi.UriPath;
-
-/**
- * The gtask component is used for sending messages to GAE task queue service.
- */
-@UriEndpoint(scheme = "gtask", extendsScheme = "servlet", title = "Google
Task",
-syntax = "gtask:queueName", producerOnly = true, label = "cloud,paas",
excludeProperties = "httpUri")
-public class GTaskEndpoint extends ServletEndpoint implements
OutboundBindingSupport {
-
-private OutboundBinding outboundBinding;
-private InboundBinding inboundBinding;
-private Queue queue;
-
-@UriPath @Metadata(required = "true")
-private String queueName;
-@UriParam(label = "producer", defaultValue = "worker")
-private String workerRoot;
-@UriParam(label = "consumer")
-private String inboundBindingRef;
-@UriParam(label = "producer")
-private String outboundBindingRef;
-
-public GTaskEndpoint(String endpointUri, ServletComponent component, URI
httpUri) throws URISyntaxException {
-super(endpointUri, component, httpUri);
-}
-
-public OutboundBinding
getOutboundBinding() {
-return outboundBinding;
-}
-
-public void setOutboundBinding(OutboundBinding outboundBinding) {
-this.outboundBinding = outboundBinding;
-}
-
-public InboundBinding getInboundBinding() {
-return inboundBinding;
-}
-
-public void setInboundBinding(
-InboundBinding inboundBinding) {
-this.inboundBinding = inboundBinding;
-}
-
-/**
- * Proxies the {@link HttpBinding} returned by {@link super#getBinding()}
- * with a dynamic proxy. The proxy's invocation handler further delegates
to
- * {@link InboundBinding#readRequest(org.apache.camel.Endpoint, Exchange,
Object)} .
- *
- * @return proxied {@link HttpBinding}.
- */
-@Override
-public HttpBinding getBinding() {
-return
(HttpBinding)Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]
{HttpBinding.class},
-new HttpBindingInvocationHandler(
-this, super.getBinding(), getInboundBinding()));
-}
-
-public String getWorkerRoot() {
-return workerRoot;
-}
-
-/**
- * The servlet mapping for callback handlers. By default, this component
requires a callback servlet mapping of /worker/*.
- * If another servlet mapping is used e.g. /myworker/* it must be set as
option on the producer side: to("gtask:myqueue?workerRoot=myworker").
- */
-public void setWorkerRoot(String workerRoot) {
-this.workerRoot = workerRoot;
-}
-
-public Queue getQueue() {
-
[2/7] camel git commit: CAMEL-9778: Remove deprecated GAE component and dependencies
http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml -- diff --git a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml b/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml deleted file mode 100644 index ba7b8d7..000 --- a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-inbound.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:camel="http://camel.apache.org/schema/spring"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> - - - - - - - - - http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml -- diff --git a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml b/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml deleted file mode 100644 index eaa1bea..000 --- a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/context-outbound.xml +++ /dev/null @@ -1,34 +0,0 @@ - - -http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:camel="http://camel.apache.org/schema/spring"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> - - - - - - - - - http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-combined.xml -- diff --git a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-combined.xml b/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-combined.xml deleted file mode 100644 index 1dbdafd..000 --- a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-combined.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -contextConfigLocation - classpath:org/apache/camel/component/gae/http/context-combined.xml - - - - - org.springframework.web.context.ContextLoaderListener - - - -CamelServlet - org.apache.camel.component.servlet.CamelHttpTransportServlet - - - -CamelServlet -/camel/* - - - http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-inbound.xml -- diff --git a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-inbound.xml b/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-inbound.xml deleted file mode 100644 index 287b656..000 --- a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/http/web-inbound.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - -contextConfigLocation - classpath:org/apache/camel/component/gae/http/context-inbound.xml - - - - - org.springframework.web.context.ContextLoaderListener - - - -CamelServlet - org.apache.camel.component.servlet.CamelHttpTransportServlet - - - -CamelServlet -/camel/* - - - http://git-wip-us.apache.org/repos/asf/camel/blob/8f0bcd80/components/camel-gae/src/test/resources/org/apache/camel/component/gae/login/context.xml -- diff --git a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/login/context.xml b/components/camel-gae/src/test/resources/org/apache/camel/component/gae/login/context.xml deleted file mode 100644 index 169fd55..000 --- a/components/camel-gae/src/test/resources/org/apache/camel/component/gae/login/context.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xmlns:camel="http://camel.apache.org/schema/spring"; - xsi:schemaLocation=" - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://camel.apache.org/schema/spring h
[6/7] camel git commit: CAMEL-9778: Remove deprecated GAE component and dependencies
CAMEL-9778: Remove deprecated GAE component and dependencies Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8f0bcd80 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8f0bcd80 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8f0bcd80 Branch: refs/heads/master Commit: 8f0bcd803e689cf797c75599513e817f964501b5 Parents: aa3d9e4 Author: jpoth Authored: Wed Mar 30 18:32:23 2016 +0200 Committer: Claus Ibsen Committed: Wed Mar 30 19:45:46 2016 +0200 -- README.md | 1 - apache-camel/pom.xml| 4 - .../src/main/descriptors/common-bin.xml | 1 - apache-camel/src/main/release/README.txt| 1 - components/camel-gae/pom.xml| 211 -- components/camel-gae/src/main/docs/gae.adoc | 207 -- .../gae/auth/GAuthAuthorizeBinding.java | 95 --- .../component/gae/auth/GAuthComponent.java | 114 .../camel/component/gae/auth/GAuthEndpoint.java | 278 --- .../component/gae/auth/GAuthException.java | 38 --- .../component/gae/auth/GAuthJksLoader.java | 109 .../component/gae/auth/GAuthKeyLoader.java | 37 --- .../component/gae/auth/GAuthPk8Loader.java | 82 -- .../camel/component/gae/auth/GAuthProducer.java | 63 - .../camel/component/gae/auth/GAuthService.java | 42 --- .../component/gae/auth/GAuthServiceImpl.java| 40 --- .../component/gae/auth/GAuthTokenSecret.java| 80 -- .../component/gae/auth/GAuthUpgradeBinding.java | 103 --- .../gae/bind/HttpBindingInvocationHandler.java | 59 .../component/gae/bind/InboundBinding.java | 56 .../gae/bind/InboundBindingSupport.java | 34 --- .../component/gae/bind/OutboundBinding.java | 56 .../gae/bind/OutboundBindingSupport.java| 34 --- .../gae/context/GaeDefaultCamelContext.java | 30 -- .../camel/component/gae/http/GHttpBinding.java | 190 - .../component/gae/http/GHttpComponent.java | 72 - .../camel/component/gae/http/GHttpEndpoint.java | 149 -- .../component/gae/http/GHttpException.java | 53 .../camel/component/gae/http/GHttpProducer.java | 61 .../component/gae/login/GLoginBinding.java | 102 --- .../component/gae/login/GLoginComponent.java| 79 -- .../camel/component/gae/login/GLoginData.java | 125 - .../component/gae/login/GLoginEndpoint.java | 216 -- .../component/gae/login/GLoginProducer.java | 57 .../component/gae/login/GLoginService.java | 41 --- .../component/gae/login/GLoginServiceImpl.java | 117 .../camel/component/gae/mail/GMailBinding.java | 133 - .../component/gae/mail/GMailComponent.java | 48 .../camel/component/gae/mail/GMailEndpoint.java | 132 - .../camel/component/gae/mail/GMailProducer.java | 55 .../camel/component/gae/task/GTaskBinding.java | 157 --- .../component/gae/task/GTaskComponent.java | 85 -- .../camel/component/gae/task/GTaskEndpoint.java | 155 --- .../component/gae/task/GTaskEndpointInfo.java | 61 .../camel/component/gae/task/GTaskProducer.java | 54 .../src/main/resources/META-INF/LICENSE.txt | 203 -- .../src/main/resources/META-INF/NOTICE.txt | 11 - .../services/org/apache/camel/component/gauth | 18 -- .../services/org/apache/camel/component/ghttp | 18 -- .../services/org/apache/camel/component/ghttps | 18 -- .../services/org/apache/camel/component/glogin | 18 -- .../services/org/apache/camel/component/gmail | 18 -- .../services/org/apache/camel/component/gtask | 18 -- .../apache/camel/component/gae/TestConfig.java | 36 --- .../gae/auth/GAuthAuthorizeBindingTest.java | 91 -- .../component/gae/auth/GAuthEndpointTest.java | 111 .../component/gae/auth/GAuthJksLoaderTest.java | 52 .../component/gae/auth/GAuthPk8LoaderTest.java | 48 .../component/gae/auth/GAuthRouteBuilder.java | 42 --- .../gae/auth/GAuthRouteBuilderTest.java | 106 --- .../component/gae/auth/GAuthServiceMock.java| 33 --- .../component/gae/auth/GAuthTestUtils.java | 47 .../gae/auth/GAuthTokenSecretTest.java | 60 .../gae/auth/GAuthUpgradeBindingTest.java | 93 --- .../component/gae/http/GHttpBindingTest.java| 193 - .../gae/http/GHttpCombinedRouteBuilder.java | 37 --- .../gae/http/GHttpCombinedRouteBuilderTest.java | 104 --- .../component/gae/http/GHttpEndpointTest.java | 65 - .../gae/http/GHttpInboundRouteBuilder.java | 33 --- .../gae/http/GHttpInboundRouteBuilderTest.java | 63 - .../gae/http/GHttpOutboundRouteBuilder.java | 32 --- .../gae/http/GHt
svn commit: r984263 [2/2] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache camel-2170-release.html gae.html
Modified: websites/production/camel/content/camel-2170-release.html == --- websites/production/camel/content/camel-2170-release.html (original) +++ websites/production/camel/content/camel-2170-release.html Wed Mar 30 16:22:36 2016 @@ -85,7 +85,7 @@ -Camel 2.17.0 Releasehttp://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";> New and NoteworthyWelcome to the 2.17.0 release which resolved approx. 450 issues (new features, improvements and bug fixes).The component documentation generated from the source code has been double checked to be up to date and include all the options the endpoints supports.Reworked the Apache Karaf feature to not install camel-spring by default. The problem is camel-spring is using spring-dm which is only supports S pring 3.x, and therefore Spring 3.x was installed and used. All the Camel features that uses Spring JARs are now using Spring 4.x.Camel commands for Spring BootMany improvements to Camel KuraAdded transacted option to SQL Component when used as a consumer in a transacted route.Added support for UPDATE operation to ElasticSearch.Allow to reuse existing configured Elasticsearch Client on the ElasticSearch component, instead of creating a client per endpoint. The include and exclude options on File2 and FTP endpoints is now case in-s ensitive out of the box.Resource based component such as XSLT, Velocity etc can load the resource file from the Registry by using ref: as prefix.Upgraded camel-amqp to the latest qpid-jms-client (also AMQP < 1.0 is not supported anymore).Many improvements to Camel AMQP component.The Metrics Component allows to capture Message History performance statistics with the MetricsMessageHistoryFactory Reduced the number of mbeans enlisted in the services tree, to only include mbeans that has value to be managed.The Elasticsear ch Component now supports MultiGet operationThe Throttler has been improved to be more performant and use a rolling window for time periods which gives a better flow.The setHeader and setExchangeProperty allows to use a dynamic header key using the Simple language if the name of the key is a Simple language expression.Add collate function to Simple language to make it easier to split a message body into sub lists of a specified size. The function is similar to the collate function from Groovy.The Camel Run Maven Goal is able to auto detect if its a OSGi Blueprint or CDI project so end users no longer have to explicit configure this on the plugin.Camel-Elasticsearch now supports Multiget, Multisearch and exists operationCamel-Git now supports Cherry-pick operationStopping the Main class from JMX will now trigger shutdown of the Main class/JVM also, as it does when hitting ctrl + c.Added option to skipFirst to the Tokenizer language to make it easy to skip the very first element, when for example splitting a CSV file using the Splitter EIP.The Rest DSL now supports default values for query parametersThe Rest DSL now only binds from POJO to JSon/XML if the content-type is for json or xml. This allows you to specify a custom content-type and omit the binding, such as when having binary payloads.Exchan ge and Message only output id in their toString method to avoid outputting any message details such as sensitive details from message bodies.Camel Error Handler no longer log message body/header details when logging the Message History. This avoids logging any sensitive details from message bodies.Camel Exception Clause and Error Handler now supports using a custom Processor to be invoked right after an exception was thrown using the new onExceptionOccurred option.RabbitMQ consumer more resilient to auto re-connect in case of connection failuresThe JSON camel-jackson can be used as a type converter to co nvert json to/from POJO and String/byte[] types, if enabled.The SQL Component now supports loading the SQL queries from external files on the classpath or file system, where you can format the queries using newlines and indenting.The Mail consumer allows to use an idempotent repository which allows to cluster consuming from the same mailbox, and let the repository coordinate whether a mail message is valid for the consumer to process.Added support for completion interval on the SJMS Batch component, which allows to trigger batch completion in a fixed scheduled interval.The HTTP and HTTP4 producers now support the disableStreamCache option to allow to use the raw response stream as the message body inste ad of wrapping using Stream cachingThe Camel CDI component has been improved to better fit into the CDI programming model, cover a larger set of containers, and provide these new features:The Camel events from the org.apache.camel.management.event package (like Camel
svn commit: r984263 [1/2] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache camel-2170-release.html gae.html
Author: buildbot
Date: Wed Mar 30 16:22:36 2016
New Revision: 984263
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2170-release.html
websites/production/camel/content/gae.html
Modified: websites/production/camel/content/book-component-appendix.html
==
--- websites/production/camel/content/book-component-appendix.html (original)
+++ websites/production/camel/content/book-component-appendix.html Wed Mar 30
16:22:36 2016
@@ -1016,11 +1016,11 @@ template.send("direct:alias-verify&
]]>
See Also
Configuring
CamelComponentEndpointGetting StartedCrypto Crypto is also available as a Data Format CXF ComponentWhen using CXF as a consumer, the
CXF Bean Component allows
you to factor out how message payloads are received from their processing as a
RESTful or SOAP web service. This has the potential of using a multitude of
transports to cons
ume web services. The bean component's configuration is also simpler and
provides the fastest method to implement web services using Camel and
CXF.When using CXF in streaming modes
(see DataFormat option), then also read about Stream caching.The
cxf: component provides integration with http://cxf.apache.org";>Apache CXF for connecting to JAX-WS services
hosted in CXF./**/
+/*]]>*/
CXF Component
URI formatOptions
The descriptions
of the dataformats
@@ -3172,36 +3172,8 @@ public class MyFileFilter imple
ftp://admin@localhost:21/nolist/?password=admin&stepwise=false&useList=false&ignoreFileNotFoundOrPermissionError=true&fileName=report.txt&delete=true";,
String.class);
]]>
Debug
loggingThis component has log level TRACE that can be
helpful if you have problems.See Also
-Configuring
CamelComponentEndpointGetting StartedFile2 Camel Components
for Google App Engine
-
-Tutorials
-A good starting point for using Camel on GAE is the Tutorial for Camel on
Google App EngineThe OAuth tutorial demonstrates how to implement http://oauth.net/";
rel="nofollow">OAuth in web applications.
-
-
-The Camel components for http://code.google.com/appengine/"; rel="nofollow">Google App Engine
(GAE) are part of the camel-gae project and provide connectivity
to GAE's http://code.google.com/appengine/docs/java/apis.html";
rel="nofollow">cloud computing services. They make the GAE cloud computing
environment accessible to applications via Camel interfaces. Following this
pattern for other cloud computing environments could make it easier to port
Camel applications from one cloud computing provider to another. The following
table lists the cloud computing services provided by Google and the supporting
Camel components. The documentation of each component can be found by following
the link in the Camel Component column.
-
-
-GAE serviceCamel componentComponent
descriptionhttp://code.google.com/appengine/docs/java/urlfetch/"; rel="nofollow">URL
fetch serviceghttpProvides connectivity to the
GAE URL fetch service but can also be used to receive messages from
servlets.http://code.google.com/appengine/docs/java/taskqueue/";
rel="nofollow">Task queueing servicegtaskSupports asynchronous message processing on GAE by
using the task queueing service as message queue.http://code.google.com/appengine/docs/java/mail/";
rel="nofollow">Mail servicegmailSupports sending of emails via
the GAE mail service. Receiving mails is not supported yet but will be added
later.http://code.google.com/appengine/docs/java/memcache/";
rel="nofollow">Memcache service Not supported
yet.http://code.google.com/appengine/docs/java/xmpp/"; rel="nofollow">XMPP
service Not supported yet.http://code.google.com/appengine/docs/java/images/"; rel="nofollow">Images
service Not supported yet.http://code.google.com/appengine/docs/java/datastore/";
rel="nofollow">Datastore service Not supported yet.http://code.google.com/apis/accounts/"; rel="nofollow">Accounts
servicegauth gloginThese components interact with the Google Accounts API
for authentication and authorization. Google Accounts is not specific to Google
App Engine but is often used by GAE appl
camel git commit: CAMEL-9757: Deprecate camel-gae
Repository: camel Updated Branches: refs/heads/camel-2.17.x d23a5ceee -> 49a4f1981 CAMEL-9757: Deprecate camel-gae Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49a4f198 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49a4f198 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49a4f198 Branch: refs/heads/camel-2.17.x Commit: 49a4f1981a809448f9da3f1587cb29a206e93184 Parents: d23a5ce Author: Claus Ibsen Authored: Fri Mar 25 08:10:40 2016 +0100 Committer: Claus Ibsen Committed: Wed Mar 30 17:41:41 2016 +0200 -- components/camel-gae/pom.xml | 2 +- examples/camel-example-gae/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/49a4f198/components/camel-gae/pom.xml -- diff --git a/components/camel-gae/pom.xml b/components/camel-gae/pom.xml index 421057d..af64468 100644 --- a/components/camel-gae/pom.xml +++ b/components/camel-gae/pom.xml @@ -27,7 +27,7 @@ camel-gae bundle Camel :: GAE - Camel GAE support + Camel GAE support (deprecated) http://git-wip-us.apache.org/repos/asf/camel/blob/49a4f198/examples/camel-example-gae/pom.xml -- diff --git a/examples/camel-example-gae/pom.xml b/examples/camel-example-gae/pom.xml index 77e618f..8466509 100644 --- a/examples/camel-example-gae/pom.xml +++ b/examples/camel-example-gae/pom.xml @@ -26,7 +26,7 @@ camel-example-gae -Camel :: Example :: GAE +Camel :: Example :: GAE (deprecated) Demonstrates how to get Camel running on Google App Engine war
camel git commit: CAMEL-9779: Fixed camel-netty http components to work when no port number has been configured.
Repository: camel
Updated Branches:
refs/heads/master 79ad2c802 -> 94e6eb324
CAMEL-9779: Fixed camel-netty http components to work when no port number has
been configured.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/94e6eb32
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/94e6eb32
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/94e6eb32
Branch: refs/heads/master
Commit: 94e6eb324238cbe483283537e71d8a2620d73a30
Parents: 79ad2c8
Author: Claus Ibsen
Authored: Wed Mar 30 17:33:53 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 17:35:24 2016 +0200
--
.../netty/http/NettyHttpComponent.java | 2 +-
.../netty/http/NettyHttpConfiguration.java | 4 +-
.../netty/http/NettyCamelWebsiteTest.java | 51
.../component/netty/NettyConfiguration.java | 4 +-
.../netty4/http/NettyHttpComponent.java | 2 +-
.../netty4/http/NettyHttpConfiguration.java | 4 +-
.../netty4/http/NettyCamelWebsiteTest.java | 51
.../component/netty4/NettyConfiguration.java| 4 +-
8 files changed, 114 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/94e6eb32/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index 029d290..07324e6 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -121,7 +121,7 @@ public class NettyHttpComponent extends NettyComponent
implements HeaderFilterSt
// set port on configuration which is either shared or using default
values
if (sharedPort != -1) {
config.setPort(sharedPort);
-} else if (config.getPort() == -1) {
+} else if (config.getPort() == -1 || config.getPort() == 0) {
if (remaining.startsWith("http:")) {
config.setPort(80);
} else if (remaining.startsWith("https:")) {
http://git-wip-us.apache.org/repos/asf/camel/blob/94e6eb32/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
index 05999d3..3cd223d 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
@@ -38,8 +38,8 @@ public class NettyHttpConfiguration extends
NettyConfiguration {
private String protocol;
@UriPath @Metadata(required = "true")
private String host;
-@UriPath
-private int port;
+@UriPath(name = "port")
+private int dummy;
@UriPath
private String path;
@UriParam(label = "consumer,advanced")
http://git-wip-us.apache.org/repos/asf/camel/blob/94e6eb32/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
--
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
new file mode 100644
index 000..b40e37c
--- /dev/null
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS
[2/2] camel git commit: CAMEL-9779: Fixed camel-netty http components to work when no port number has been configured.
CAMEL-9779: Fixed camel-netty http components to work when no port number has
been configured.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5295407e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5295407e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5295407e
Branch: refs/heads/camel-2.16.x
Commit: 5295407e99f283bfa0d5ea2da171a69b47286513
Parents: 771f06c
Author: Claus Ibsen
Authored: Wed Mar 30 17:33:53 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 17:34:27 2016 +0200
--
.../netty/http/NettyHttpComponent.java | 2 +-
.../netty/http/NettyHttpConfiguration.java | 4 +-
.../netty/http/NettyCamelWebsiteTest.java | 51
.../component/netty/NettyConfiguration.java | 4 +-
.../netty4/http/NettyHttpComponent.java | 2 +-
.../netty4/http/NettyHttpConfiguration.java | 4 +-
.../netty4/http/NettyCamelWebsiteTest.java | 51
.../component/netty4/NettyConfiguration.java| 4 +-
8 files changed, 114 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/5295407e/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index 8bc0aea..b29bc24 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -121,7 +121,7 @@ public class NettyHttpComponent extends NettyComponent
implements HeaderFilterSt
// set port on configuration which is either shared or using default
values
if (sharedPort != -1) {
config.setPort(sharedPort);
-} else if (config.getPort() == -1) {
+} else if (config.getPort() == -1 || config.getPort() == 0) {
if (remaining.startsWith("http:")) {
config.setPort(80);
} else if (remaining.startsWith("https:")) {
http://git-wip-us.apache.org/repos/asf/camel/blob/5295407e/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
index 05999d3..3cd223d 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
@@ -38,8 +38,8 @@ public class NettyHttpConfiguration extends
NettyConfiguration {
private String protocol;
@UriPath @Metadata(required = "true")
private String host;
-@UriPath
-private int port;
+@UriPath(name = "port")
+private int dummy;
@UriPath
private String path;
@UriParam(label = "consumer,advanced")
http://git-wip-us.apache.org/repos/asf/camel/blob/5295407e/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
--
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
new file mode 100644
index 000..b40e37c
--- /dev/null
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specif
[1/2] camel git commit: CAMEL-9779: Fixed camel-netty http components to work when no port number has been configured.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 771f06c59 -> 5295407e9
refs/heads/camel-2.17.x a33609091 -> d23a5ceee
CAMEL-9779: Fixed camel-netty http components to work when no port number has
been configured.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d23a5cee
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d23a5cee
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d23a5cee
Branch: refs/heads/camel-2.17.x
Commit: d23a5ceee69c05ee7c51b119721ee2a6e91b36ff
Parents: a336090
Author: Claus Ibsen
Authored: Wed Mar 30 17:33:53 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 17:34:14 2016 +0200
--
.../netty/http/NettyHttpComponent.java | 2 +-
.../netty/http/NettyHttpConfiguration.java | 4 +-
.../netty/http/NettyCamelWebsiteTest.java | 51
.../component/netty/NettyConfiguration.java | 4 +-
.../netty4/http/NettyHttpComponent.java | 2 +-
.../netty4/http/NettyHttpConfiguration.java | 4 +-
.../netty4/http/NettyCamelWebsiteTest.java | 51
.../component/netty4/NettyConfiguration.java| 4 +-
8 files changed, 114 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d23a5cee/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
index 029d290..07324e6 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpComponent.java
@@ -121,7 +121,7 @@ public class NettyHttpComponent extends NettyComponent
implements HeaderFilterSt
// set port on configuration which is either shared or using default
values
if (sharedPort != -1) {
config.setPort(sharedPort);
-} else if (config.getPort() == -1) {
+} else if (config.getPort() == -1 || config.getPort() == 0) {
if (remaining.startsWith("http:")) {
config.setPort(80);
} else if (remaining.startsWith("https:")) {
http://git-wip-us.apache.org/repos/asf/camel/blob/d23a5cee/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
--
diff --git
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
index 05999d3..3cd223d 100644
---
a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
+++
b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/NettyHttpConfiguration.java
@@ -38,8 +38,8 @@ public class NettyHttpConfiguration extends
NettyConfiguration {
private String protocol;
@UriPath @Metadata(required = "true")
private String host;
-@UriPath
-private int port;
+@UriPath(name = "port")
+private int dummy;
@UriPath
private String path;
@UriParam(label = "consumer,advanced")
http://git-wip-us.apache.org/repos/asf/camel/blob/d23a5cee/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
--
diff --git
a/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
new file mode 100644
index 000..b40e37c
--- /dev/null
+++
b/components/camel-netty-http/src/test/java/org/apache/camel/component/netty/http/NettyCamelWebsiteTest.java
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distribu
camel git commit: Added camel-geocoder docs to gitbook
Repository: camel Updated Branches: refs/heads/master b25ff047d -> 79ad2c802 Added camel-geocoder docs to gitbook Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79ad2c80 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79ad2c80 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79ad2c80 Branch: refs/heads/master Commit: 79ad2c802552740fc6db28ed80652b45cb92c5f1 Parents: b25ff04 Author: Andrea Cosentino Authored: Wed Mar 30 15:44:59 2016 +0200 Committer: Andrea Cosentino Committed: Wed Mar 30 15:45:56 2016 +0200 -- .../camel-geocoder/src/main/docs/geocoder.adoc | 163 +++ docs/user-manual/en/SUMMARY.md | 1 + 2 files changed, 164 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/79ad2c80/components/camel-geocoder/src/main/docs/geocoder.adoc -- diff --git a/components/camel-geocoder/src/main/docs/geocoder.adoc b/components/camel-geocoder/src/main/docs/geocoder.adoc new file mode 100644 index 000..550b456 --- /dev/null +++ b/components/camel-geocoder/src/main/docs/geocoder.adoc @@ -0,0 +1,163 @@ +[[Geocoder-GeocoderComponent]] +Geocoder Component +~~ + +*Available as of Camel 2.12* + +The *geocoder:* component is used for looking up geocodes (latitude and +longitude) for a given address, or reverse lookup. The component uses +the https://code.google.com/p/geocoder-java/[Java API for Google +Geocoder] library. + +Maven users will need to add the following dependency to their `pom.xml` +for this component: + +[source,xml] + + +org.apache.camel +camel-geocoder +x.x.x + + + + +[[Geocoder-URIformat]] +URI format +^^ + +[source,java] + +geocoder:address:name[?options] +geocoder:latlng:latitude,longitude[?options] + + +[[Geocoder-Options]] +Options +^^^ + + +// component options: START +The Geocoder component has no options. +// component options: END + + + +// endpoint options: START +The Geocoder component supports 17 endpoint options which are listed below: + +[width="100%",cols="2s,1,1m,1m,5",options="header"] +|=== +| Name | Group | Default | Java Type | Description +| address | producer | | String | The geo address which should be prefixed with address: +| latlng | producer | | String | The geo latitude and longitude which should be prefixed with latlng: +| clientId | producer | | String | To use google premium with this client id +| clientKey | producer | | String | To use google premium with this client key +| headersOnly | producer | false | boolean | Whether to only enrich the Exchange with headers and leave the body as-is. +| language | producer | en | String | The language to use. +| exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange +| httpClientConfigurer | advanced | | HttpClientConfigurer | Register a custom configuration strategy for new HttpClient instances created by producers or consumers such as to configure authentication mechanisms etc +| httpConnectionManager | advanced | | HttpConnectionManager | To use a custom HttpConnectionManager to manage connections +| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). +| proxyAuthDomain | proxy | | String | Domain for proxy NTML authentication +| proxyAuthHost | proxy | | String | Optional host for proxy NTML authentication +| proxyAuthMethod | proxy | | String | Authentication method for proxy either as Basic Digest or NTLM. +| proxyAuthPassword | proxy | | String | Password for proxy authentication +| proxyAuthUsername | proxy | | String | Username for proxy authentication +| proxyHost | proxy | | String | The proxy host name +| proxyPort | proxy | | Integer | The proxy port number +|=== +// endpoint options: END + + +[[Geocoder-Exchangedataformat]] +Exchange data format + + +Camel will deliver the body as a +`com.google.code.geocoder.model.GeocodeResponse` type. + + And if the address is `"current"` then the response is a String type +with a JSON representation of the current location. + +If the option `headersOnly` is set to `true` then the message body is +left as-is, and only headers will be added to the +link:exchange.html[Exchange]. + +[[Geocoder-MessageHeaders]] +Message Headers +^^^
[2/2] camel git commit: CAMEL-9777: camel-zipfile - Using zip iterator with dataformat may fail.
CAMEL-9777: camel-zipfile - Using zip iterator with dataformat may fail.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b25ff047
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b25ff047
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b25ff047
Branch: refs/heads/master
Commit: b25ff047d3594188717ff1794092d9b7d1aec7fc
Parents: 2a5a7cc
Author: Claus Ibsen
Authored: Wed Mar 30 15:34:04 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 15:35:28 2016 +0200
--
.../camel/dataformat/zipfile/ZipIterator.java | 7 +-
.../zipfile/ZipFileSplitOneFileTest.java| 97
2 files changed, 98 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b25ff047/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
--
diff --git
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
index ed8e68e..b1a0c30 100644
---
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
+++
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
@@ -105,12 +105,7 @@ public class ZipIterator implements Iterator,
Closeable {
answer.getHeaders().putAll(inputMessage.getHeaders());
answer.setHeader("zipFileName", current.getName());
answer.setHeader(Exchange.FILE_NAME, current.getName());
-if (current.getSize() > 0) {
-answer.setBody(new ZipInputStreamWrapper(zipInputStream));
-} else {
-// Workaround for the case when the entry is zero bytes big
-answer.setBody(new ByteArrayInputStream(new byte[0]));
-}
+answer.setBody(new ZipInputStreamWrapper(zipInputStream));
return answer;
} else {
LOGGER.trace("close zipInputStream");
http://git-wip-us.apache.org/repos/asf/camel/blob/b25ff047/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
--
diff --git
a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
new file mode 100644
index 000..f1f6cd3
--- /dev/null
+++
b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dataformat.zipfile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class ZipFileSplitOneFileTest extends CamelTestSupport {
+
+@Override
+public void setUp() throws Exception {
+deleteDirectory("target/zip-unmarshal");
+super.setUp();
+}
+
+@Test
+public void testZipFileUnmarshal() throws Exception {
+
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.FILE_NAME_ONLY,
"test.zip");
+getMockEndpoint("mock:end").expectedBodiesReceived("Hello World");
+
+createZipFile("Hello World");
+
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RoutesBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Overrid
camel git commit: CAMEL-9777: camel-zipfile - Using zip iterator with dataformat may fail.
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x fa8d7e314 -> a33609091
CAMEL-9777: camel-zipfile - Using zip iterator with dataformat may fail.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a3360909
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a3360909
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a3360909
Branch: refs/heads/camel-2.17.x
Commit: a33609091d7e7fce29f9f5766e14ec1830ddcd81
Parents: fa8d7e3
Author: Claus Ibsen
Authored: Wed Mar 30 15:34:04 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 15:34:26 2016 +0200
--
.../camel/dataformat/zipfile/ZipIterator.java | 7 +-
.../zipfile/ZipFileSplitOneFileTest.java| 97
2 files changed, 98 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/a3360909/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
--
diff --git
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
index ed8e68e..b1a0c30 100644
---
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
+++
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
@@ -105,12 +105,7 @@ public class ZipIterator implements Iterator,
Closeable {
answer.getHeaders().putAll(inputMessage.getHeaders());
answer.setHeader("zipFileName", current.getName());
answer.setHeader(Exchange.FILE_NAME, current.getName());
-if (current.getSize() > 0) {
-answer.setBody(new ZipInputStreamWrapper(zipInputStream));
-} else {
-// Workaround for the case when the entry is zero bytes big
-answer.setBody(new ByteArrayInputStream(new byte[0]));
-}
+answer.setBody(new ZipInputStreamWrapper(zipInputStream));
return answer;
} else {
LOGGER.trace("close zipInputStream");
http://git-wip-us.apache.org/repos/asf/camel/blob/a3360909/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
--
diff --git
a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
new file mode 100644
index 000..f1f6cd3
--- /dev/null
+++
b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dataformat.zipfile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class ZipFileSplitOneFileTest extends CamelTestSupport {
+
+@Override
+public void setUp() throws Exception {
+deleteDirectory("target/zip-unmarshal");
+super.setUp();
+}
+
+@Test
+public void testZipFileUnmarshal() throws Exception {
+
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.FILE_NAME_ONLY,
"test.zip");
+getMockEndpoint("mock:end").expectedBodiesReceived("Hello World");
+
+createZipFile("Hello World");
+
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RoutesBuilder creat
[1/2] camel git commit: CAMEL-9777: camel-zipfile - Using zip iterator with dataformat may fail.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x cbf6335d5 -> 771f06c59
refs/heads/master 2a5a7ccc4 -> b25ff047d
CAMEL-9777: camel-zipfile - Using zip iterator with dataformat may fail.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/771f06c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/771f06c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/771f06c5
Branch: refs/heads/camel-2.16.x
Commit: 771f06c595a11d6c99f9d54612472176624a7898
Parents: cbf6335
Author: Claus Ibsen
Authored: Wed Mar 30 15:34:04 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 15:35:21 2016 +0200
--
.../camel/dataformat/zipfile/ZipIterator.java | 7 +-
.../zipfile/ZipFileSplitOneFileTest.java| 97
2 files changed, 98 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/771f06c5/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
--
diff --git
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
index ed8e68e..b1a0c30 100644
---
a/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
+++
b/components/camel-zipfile/src/main/java/org/apache/camel/dataformat/zipfile/ZipIterator.java
@@ -105,12 +105,7 @@ public class ZipIterator implements Iterator,
Closeable {
answer.getHeaders().putAll(inputMessage.getHeaders());
answer.setHeader("zipFileName", current.getName());
answer.setHeader(Exchange.FILE_NAME, current.getName());
-if (current.getSize() > 0) {
-answer.setBody(new ZipInputStreamWrapper(zipInputStream));
-} else {
-// Workaround for the case when the entry is zero bytes big
-answer.setBody(new ByteArrayInputStream(new byte[0]));
-}
+answer.setBody(new ZipInputStreamWrapper(zipInputStream));
return answer;
} else {
LOGGER.trace("close zipInputStream");
http://git-wip-us.apache.org/repos/asf/camel/blob/771f06c5/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
--
diff --git
a/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
new file mode 100644
index 000..f1f6cd3
--- /dev/null
+++
b/components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileSplitOneFileTest.java
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.dataformat.zipfile;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.Iterator;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.RoutesBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class ZipFileSplitOneFileTest extends CamelTestSupport {
+
+@Override
+public void setUp() throws Exception {
+deleteDirectory("target/zip-unmarshal");
+super.setUp();
+}
+
+@Test
+public void testZipFileUnmarshal() throws Exception {
+
getMockEndpoint("mock:input").expectedHeaderReceived(Exchange.FILE_NAME_ONLY,
"test.zip");
+getMockEndpoint("mock:end").expectedBodiesReceived("Hello World");
+
+createZipFile("Hello World");
+
+assertMockEndpointsSatisfied();
+}
+
+@
camel git commit: Upgrade Joda time to version 2.9.3
Repository: camel Updated Branches: refs/heads/master f701c37fe -> 2a5a7ccc4 Upgrade Joda time to version 2.9.3 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2a5a7ccc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2a5a7ccc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2a5a7ccc Branch: refs/heads/master Commit: 2a5a7ccc4a405ea3ab3ae2665b95be69bff87e4d Parents: f701c37 Author: Andrea Cosentino Authored: Wed Mar 30 15:27:43 2016 +0200 Committer: Andrea Cosentino Committed: Wed Mar 30 15:28:04 2016 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/2a5a7ccc/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4b7aea0..df8a3fd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -318,7 +318,7 @@ 2.13 1.5 1.6.2 -2.9.2 +2.9.3 1.3.3 0.0.20 0.0.20_1
svn commit: r984248 - in /websites/production/camel/content: cache/main.pageCache camel-zipkin.html
Author: buildbot Date: Wed Mar 30 13:18:50 2016 New Revision: 984248 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-zipkin.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/camel-zipkin.html == --- websites/production/camel/content/camel-zipkin.html (original) +++ websites/production/camel/content/camel-zipkin.html Wed Mar 30 13:18:50 2016 @@ -93,7 +93,7 @@ camelContext.getManagementStrategy().add The configuration about will the trace all incoming and outgoing messages in Camel routes. However if you want to map Camel endpoints to human friendly logical names, you can add mappings such as: - +camel-zipin-starterIf you are using Spring Boot then you can add the camel-zipkin-starter dependency, and turn on zipkin by annotating the main class with @CamelZipkin. You can then configure camel-zipkin in the application.properties file where you can configure the hostname and port number for the Zipkin Server, and all the other options as listed in the options table above.You can find an example of this in the https://github.com/apache/camel/tree/master/examples/camel-example-zipkin"; rel="nofollow">camel-example-zipkin
[1/3] camel git commit: CAMEL-9775: Cleanup the spring-boot auto config doc
Repository: camel
Updated Branches:
refs/heads/camel-2.17.x 6f05f0ff2 -> fa8d7e314
refs/heads/master 20c5db549 -> f701c37fe
CAMEL-9775: Cleanup the spring-boot auto config doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3a42303d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a42303d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a42303d
Branch: refs/heads/master
Commit: 3a42303d612d314236d915cb97b5bea4f57f8090
Parents: 20c5db5
Author: Claus Ibsen
Authored: Wed Mar 30 14:56:29 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 14:56:29 2016 +0200
--
.../spring/boot/CamelAutoConfiguration.java | 26
.../boot/CamelConfigurationProperties.java | 19 --
2 files changed, 33 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3a42303d/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
--
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index e9e81d6..f950e52 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -21,6 +21,7 @@ import java.util.Collection;
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.component.properties.PropertiesParser;
@@ -45,16 +46,21 @@ public class CamelAutoConfiguration {
@Bean
@ConditionalOnMissingBean(CamelContext.class)
CamelContext camelContext(ApplicationContext applicationContext,
- CamelConfigurationProperties
configurationProperties) {
+ CamelConfigurationProperties config) {
+
CamelContext camelContext = new SpringCamelContext(applicationContext);
SpringCamelContext.setNoStart(true);
-if (!configurationProperties.isJmxEnabled()) {
+if (!config.isJmxEnabled()) {
camelContext.disableJMX();
}
-if (configurationProperties.getName() != null) {
-((SpringCamelContext)
camelContext).setName(configurationProperties.getName());
+if (config.getName() != null) {
+((SpringCamelContext) camelContext).setName(config.getName());
+}
+
+if (config.getLogDebugMaxChars() > 0) {
+
camelContext.getProperties().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "" +
config.getLogDebugMaxChars());
}
return camelContext;
@@ -67,9 +73,9 @@ public class CamelAutoConfiguration {
@Bean
@ConditionalOnMissingBean(RoutesCollector.class)
-RoutesCollector routesCollector(ApplicationContext applicationContext,
CamelConfigurationProperties configurationProperties) {
+RoutesCollector routesCollector(ApplicationContext applicationContext,
CamelConfigurationProperties config) {
Collection configurations =
applicationContext.getBeansOfType(CamelContextConfiguration.class).values();
-return new RoutesCollector(applicationContext, new
ArrayList(configurations), configurationProperties);
+return new RoutesCollector(applicationContext, new
ArrayList(configurations), config);
}
/**
@@ -79,8 +85,8 @@ public class CamelAutoConfiguration {
// Camel handles the lifecycle of this bean
@ConditionalOnMissingBean(ProducerTemplate.class)
ProducerTemplate producerTemplate(CamelContext camelContext,
- CamelConfigurationProperties
configurationProperties) {
-return
camelContext.createProducerTemplate(configurationProperties.getProducerTemplateCacheSize());
+ CamelConfigurationProperties config) {
+return
camelContext.createProducerTemplate(config.getProducerTemplateCacheSize());
}
/**
@@ -90,8 +96,8 @@ public class CamelAutoConfiguration {
// Camel handles the lifecycle of this bean
@ConditionalOnMissingBean(ConsumerTemplate.class)
ConsumerTemplate consumerTemplate(CamelContext camelContext,
- CamelConfigurationProperties
configurationProperties) {
-return
camelContext.createConsumerTemplate(configurationProperties.getConsumerTemplateCacheSize());
+ CamelConfigurationProperties config
[3/3] camel git commit: CAMEL-9775: Cleanup the spring-boot auto config doc
CAMEL-9775: Cleanup the spring-boot auto config doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa8d7e31
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa8d7e31
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa8d7e31
Branch: refs/heads/camel-2.17.x
Commit: fa8d7e314ad5ccff6a07683d9223f68d48b7e171
Parents: 6f05f0f
Author: Claus Ibsen
Authored: Wed Mar 30 14:56:29 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 14:58:44 2016 +0200
--
.../spring/boot/CamelAutoConfiguration.java | 26
.../boot/CamelConfigurationProperties.java | 19 --
2 files changed, 33 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fa8d7e31/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
--
diff --git
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
index e9e81d6..f950e52 100644
---
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
+++
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelAutoConfiguration.java
@@ -21,6 +21,7 @@ import java.util.Collection;
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
+import org.apache.camel.Exchange;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.component.properties.PropertiesParser;
@@ -45,16 +46,21 @@ public class CamelAutoConfiguration {
@Bean
@ConditionalOnMissingBean(CamelContext.class)
CamelContext camelContext(ApplicationContext applicationContext,
- CamelConfigurationProperties
configurationProperties) {
+ CamelConfigurationProperties config) {
+
CamelContext camelContext = new SpringCamelContext(applicationContext);
SpringCamelContext.setNoStart(true);
-if (!configurationProperties.isJmxEnabled()) {
+if (!config.isJmxEnabled()) {
camelContext.disableJMX();
}
-if (configurationProperties.getName() != null) {
-((SpringCamelContext)
camelContext).setName(configurationProperties.getName());
+if (config.getName() != null) {
+((SpringCamelContext) camelContext).setName(config.getName());
+}
+
+if (config.getLogDebugMaxChars() > 0) {
+
camelContext.getProperties().put(Exchange.LOG_DEBUG_BODY_MAX_CHARS, "" +
config.getLogDebugMaxChars());
}
return camelContext;
@@ -67,9 +73,9 @@ public class CamelAutoConfiguration {
@Bean
@ConditionalOnMissingBean(RoutesCollector.class)
-RoutesCollector routesCollector(ApplicationContext applicationContext,
CamelConfigurationProperties configurationProperties) {
+RoutesCollector routesCollector(ApplicationContext applicationContext,
CamelConfigurationProperties config) {
Collection configurations =
applicationContext.getBeansOfType(CamelContextConfiguration.class).values();
-return new RoutesCollector(applicationContext, new
ArrayList(configurations), configurationProperties);
+return new RoutesCollector(applicationContext, new
ArrayList(configurations), config);
}
/**
@@ -79,8 +85,8 @@ public class CamelAutoConfiguration {
// Camel handles the lifecycle of this bean
@ConditionalOnMissingBean(ProducerTemplate.class)
ProducerTemplate producerTemplate(CamelContext camelContext,
- CamelConfigurationProperties
configurationProperties) {
-return
camelContext.createProducerTemplate(configurationProperties.getProducerTemplateCacheSize());
+ CamelConfigurationProperties config) {
+return
camelContext.createProducerTemplate(config.getProducerTemplateCacheSize());
}
/**
@@ -90,8 +96,8 @@ public class CamelAutoConfiguration {
// Camel handles the lifecycle of this bean
@ConditionalOnMissingBean(ConsumerTemplate.class)
ConsumerTemplate consumerTemplate(CamelContext camelContext,
- CamelConfigurationProperties
configurationProperties) {
-return
camelContext.createConsumerTemplate(configurationProperties.getConsumerTemplateCacheSize());
+ CamelConfigurationProperties config) {
+return
camelContext.createConsumerTemplate(config.getConsumerTemplateCacheSize());
}
// SpringCame
[2/3] camel git commit: Polished
Polished
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f701c37f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f701c37f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f701c37f
Branch: refs/heads/master
Commit: f701c37fe220de0197af5f37b7f336455856ea21
Parents: 3a42303
Author: Claus Ibsen
Authored: Wed Mar 30 14:58:17 2016 +0200
Committer: Claus Ibsen
Committed: Wed Mar 30 14:58:17 2016 +0200
--
.../starter/ZipkinConfigurationProperties.java | 62 +++-
1 file changed, 34 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f701c37f/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java
--
diff --git
a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java
b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java
index ffd338b..18b95e8 100644
---
a/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java
+++
b/components/camel-zipkin-starter/src/main/java/org/apache/camel/zipkin/starter/ZipkinConfigurationProperties.java
@@ -24,21 +24,52 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "camel.zipkin")
public class ZipkinConfigurationProperties {
+/**
+ * Sets a hostname for the remote zipkin server to use.
+ */
private String hostName;
+
+/**
+ * Sets the port number for the remote zipkin server to use.
+ */
private int port;
+
+/**
+ * Configures a rate that decides how many events should be traced by
zipkin.
+ * The rate is expressed as a percentage (1.0f = 100%, 0.5f is 50%, 0.1f
is 10%).
+ */
private float rate = 1.0f;
+
+/**
+ * Whether to include the Camel message body in the zipkin traces.
+ *
+ * This is not recommended for production usage, or when having big
payloads.
+ * You can limit the size by configuring
camel.springboot.log-debug-max-chars option.
+ */
private boolean includeMessageBody;
+
+/**
+ * To use a global service name that matches all Camel events
+ */
private String serviceName;
+
+/**
+ * Sets exclude pattern(s) that will disable tracing with zipkin for Camel
messages that matches the pattern.
+ */
private Set excludePatterns;
+
+/**
+ * Sets service mapping(s) that matches Camel events to the given zipkin
service name.
+ * The key is the pattern, the value is the service name.
+ */
private Map serviceMappings;
+// Getters & setters
+
public String getHostName() {
return hostName;
}
-/**
- * Sets a hostname for the remote zipkin server to use.
- */
public void setHostName(String hostName) {
this.hostName = hostName;
}
@@ -47,9 +78,6 @@ public class ZipkinConfigurationProperties {
return port;
}
-/**
- * Sets the port number for the remote zipkin server to use.
- */
public void setPort(int port) {
this.port = port;
}
@@ -58,12 +86,6 @@ public class ZipkinConfigurationProperties {
return rate;
}
-/**
- * Configures a rate that decides how many events should be traced by
zipkin.
- * The rate is expressed as a percentage (1.0f = 100%, 0.5f is 50%, 0.1f
is 10%).
- *
- * @param rate minimum sample rate is 0.0001, or 0.01% of traces
- */
public void setRate(float rate) {
this.rate = rate;
}
@@ -72,12 +94,6 @@ public class ZipkinConfigurationProperties {
return includeMessageBody;
}
-/**
- * Whether to include the Camel message body in the zipkin traces.
- *
- * This is not recommended for production usage, or when having big
payloads. You can limit the size by
- * configuring the http://camel.apache.org/how-do-i-set-the-max-chars-when-debug-logging-messages-in-camel.html";>max
debug log size.
- */
public void setIncludeMessageBody(boolean includeMessageBody) {
this.includeMessageBody = includeMessageBody;
}
@@ -86,9 +102,6 @@ public class ZipkinConfigurationProperties {
return serviceName;
}
-/**
- * To use a global service name that matches all Camel events
- */
public void setServiceName(String serviceName) {
this.serviceName = serviceName;
}
@@ -97,9 +110,6 @@ public class ZipkinConfigurationProperties {
return excludePatterns;
}
-/**
- * Sets exclude pattern(s) that will disable tracing with zipkin for Camel
svn commit: r984241 - in /websites/production/camel/content: cache/main.pageCache spring-boot.html
Author: buildbot Date: Wed Mar 30 11:18:57 2016 New Revision: 984241 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/spring-boot.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/spring-boot.html == --- websites/production/camel/content/spring-boot.html (original) +++ websites/production/camel/content/spring-boot.html Wed Mar 30 11:18:57 2016 @@ -297,12 +297,7 @@ camel.springboot.xmlRoutes = false // scan in the com/foo/routes classpath camel.springboot.xmlRoutes = classpath:com/foo/routes/*.xml]]> The XML files should be Camel XML routes (not CamelContext) such as -http://www.springframework.org/schema/beans"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">; -Â - <routes xmlns="http://camel.apache.org/schema/spring">; +