camel git commit: Upgrade AWS SDK to version 1.10.0
Repository: camel Updated Branches: refs/heads/master acdcb7c6c - 799e5890d Upgrade AWS SDK to version 1.10.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/799e5890 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/799e5890 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/799e5890 Branch: refs/heads/master Commit: 799e5890d7973ea6af1f24410febd570b0856b5e Parents: acdcb7c Author: Andrea Cosentino anco...@gmail.com Authored: Sat Jun 13 15:17:53 2015 +0200 Committer: Andrea Cosentino anco...@gmail.com Committed: Sat Jun 13 15:19:41 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/799e5890/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 2bcecfa..22c177e 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -65,7 +65,7 @@ avro-ipc-bundle-version1.7.7_1/avro-ipc-bundle-version awaitility.version1.6.3/awaitility.version aws-java-sdk-bundle-version1.9.33_1/aws-java-sdk-bundle-version -aws-java-sdk-version1.9.40/aws-java-sdk-version +aws-java-sdk-version1.10.0/aws-java-sdk-version axiom-version1.2.14/axiom-version backport-util-concurrent-version3.1/backport-util-concurrent-version bcel-bundle-version5.2_4/bcel-bundle-version
svn commit: r954685 - in /websites/production/camel/content: articles.html cache/main.pageCache
Author: buildbot Date: Sat Jun 13 08:19:58 2015 New Revision: 954685 Log: Production update by buildbot for camel Modified: websites/production/camel/content/articles.html websites/production/camel/content/cache/main.pageCache Modified: websites/production/camel/content/articles.html == --- websites/production/camel/content/articles.html (original) +++ websites/production/camel/content/articles.html Sat Jun 13 08:19:58 2015 @@ -82,7 +82,7 @@ pSee also a shape=rect class=external-link href=http://camel.apache.org/user-stories.html;Camel User Stories/a./p /div /div -pIf you have never used or seen Camel before, then you should start with a shape=rect class=external-link href=http://www.kai-waehner.de/blog/2012/05/04/apache-camel-tutorial-introduction/; rel=nofollowApache Camel Tutorial #8211; Introduction to EIP, Routes, Components, Testing, and other Concepts/a - an article by Kai W#228;hner, where he puts EIP and Camel into the big picture and gives a run down of the important Camel concepts. a shape=rect class=external-link href=https://github.com/megachucky/camel-infoq; rel=nofollowDemo source code/a can be downloaded at github to get started with your first Camel project easily./ph3 id=Articles-ArchivedWebinarsandScreencastsArchived Webinars and Screencasts/h3ullia shape=rect class=external-link href=https://vimeo.com/105743314; rel=nofollowHvordan f#229; en kamel til #229; danse (September 2014)/a by#160;Per J#248;rgen Walstr#248;m amp; Audun Fauchald Strand - (JavaZone 2014) in Norwe gian/lilia shape=rect class=external-link href=http://www.youtube.com/watch?v=_pEwoztbfYIamp;feature=youtu.beamp;a; rel=nofollowIntegration using Apache Camel and Groovy (June 2014)/a by Claus Ibsen, presenting Camel, Groovy, and a shape=rect class=external-link href=http://hawt.io/; rel=nofollowhawtio/a at a shape=rect class=external-link href=http://gr8conf.eu/#/; rel=nofollowgr8conf/a 2014./lilia shape=rect class=external-link href=https://skillsmatter.com/skillscasts/5074-effective-system-integrations-with-apache-camel; rel=nofollowEffective System Integrations with Apache Camel (March 2014)/a by Jakub Korab/lilia shape=rect class=external-link href=http://www.youtube.com/watch?v=lOxUs_JleSsamp;feature=youtu.beamp;a; rel=nofollowGetting started with Apache Camel video from BarcelonaJUG (January 2014)/a by Claus Ibsen/lilia shape=rect class=external-link href=http://vimeo.com/68442425; rel=nofollow Camel in the cloud demo from CamelOne 2013/a - Video presentation from CamelOne 2013 demonstrating Camel in the cloud using a shape=rect class=external-link href=http://fuse.fusesource.org/fabric/; rel=nofollowFuse Fabric/a and a shape=rect class=external-link href=http://hawt.io/; rel=nofollowhawtio/a/lilia shape=rect class=external-link href=http://javagruppen.dk/index.php/moder/historiske-moder/285-javagruppemode-115-apache-camel-i-aarhus; rel=nofollowGetting started with Apache Camel/a - Video presentation from Javagruppen meeting emby Claus Ibsen/em (May 2013)/lilia shape=rect class=external-link href=http://blip.tv/dzone/apache-camel-essential-components-6511579; rel=nofollowApache Camel Essential Components/a emby Christian Posta/em (January 2013)/lilia shape=rect class=external-link href=http://www.youtube.com/watch?v=i_g91CzHgxg; rel=nofollowLeverage Enterprise Integration Patterns with Apache Camel and Twitter/a emby Bruno Borges/em (JavaOne 2012)/lilia shape=rect class=external-link href=http://www.infoq.com/presentations/Riding-Apache-Camel-Cloud; rel=nofollowRiding the Apache Camel into the cloud/a emJames Strachan/em (QCon 2012)/lilia shape=rect class=external-link href=http://skillsmatter.com/podcast/scala/akka-2-x; rel=nofollowMigrating akka-camel module to Akka 2.x/a emby Peter Gabryanczy/em (ScalaDays 2012)/lilia shape=rect class=external-link href=http://www.youtube.com/watch?v=YiG5_rGLapU; rel=nofollowConfident Data Transfers with Apache Camel Security/a emby Dominik Schadow/em (JavaOne 2012)/lilia shape=rect class=external-link href=http://fusesource.com/apache-camel-conference-2012/camelone_speakers_2012/; rel=nofollowCamelOne 2012 Videos/a - All the videos from the a shape=rect class=external-link href=http://fusesource.com/apache-camel-conference-2012; rel=nofollowCamelOne 201 2 conference/a (May 2012)/lilia shape=rect class=external-link href=http://java.dzone.com/articles/leverage-enterprise; rel=nofollowJavaOne 2012 - Leverage Enterprise Integration Patterns with Apache Camel and Twitter/a emby Bruno Borges/em (JavaOne 2012)/lilia shape=rect class=external-link href=http://www.java-tv.com/2012/02/28/using-apache-camel-and-java-ee-in-an-osgi-world/; rel=nofollowUsing Apache Camel and Java EE in an OSGi World/a emby Jeff Genender and Johan Edstrom/em (JavaOne 2011)/lilia
camel git commit: CAMEL-8810 Camel CXF may propagate wrong Content-Length headers
Repository: camel
Updated Branches:
refs/heads/cxf_wrong_content_length [created] 4dc58a500
CAMEL-8810 Camel CXF may propagate wrong Content-Length headers
Thanks to Stephan Siano
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4dc58a50
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4dc58a50
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4dc58a50
Branch: refs/heads/cxf_wrong_content_length
Commit: 4dc58a5007a3d2ae8dbc55b41ded92ecb15e05c2
Parents: 2e4baeb
Author: Franz Forsthofer franz.forstho...@sap.com
Authored: Sat Jun 13 11:43:15 2015 +0200
Committer: Franz Forsthofer franz.forstho...@sap.com
Committed: Sat Jun 13 11:43:15 2015 +0200
--
.../camel/component/cxf/DefaultCxfBinding.java | 6 +-
.../cxf/CxfPayloadRouterContentLengthTest.java | 176 +++
.../cxf/CxfPayloadRouterContentLengthBeans.xml | 53 ++
3 files changed, 234 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc58a50/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 07e879a..1424963 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -690,7 +690,11 @@ public class DefaultCxfBinding implements CxfBinding,
HeaderFilterStrategyAware
if (transportHeaders.size() 0) {
cxfContext.put(Message.PROTOCOL_HEADERS, transportHeaders);
-}
+} else {
+// no propagated transport headers does really mean no headers,
not the ones
+// from the previous request or response propagated with the
invocation context
+cxfContext.remove(Message.PROTOCOL_HEADERS);
+}
}
protected static Object getContentFromCxf(Message message, DataFormat
dataFormat) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc58a50/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
new file mode 100644
index 000..14b866a
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
@@ -0,0 +1,176 @@
+/**
+ * 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.cxf;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IOHelper;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import
camel git commit: CAMEL-8810 Camel CXF may propagate wrong Content-Length headers Thanks to Stephan Siano
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 2902cf5a8 - dc370b570
CAMEL-8810 Camel CXF may propagate wrong Content-Length headers Thanks
to Stephan Siano
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dc370b57
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dc370b57
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dc370b57
Branch: refs/heads/camel-2.14.x
Commit: dc370b570b779af562bd8f700c82d6edc32b4c8b
Parents: 2902cf5
Author: Franz Forsthofer franz.forstho...@sap.com
Authored: Sat Jun 13 12:56:58 2015 +0200
Committer: Franz Forsthofer franz.forstho...@sap.com
Committed: Sat Jun 13 12:56:58 2015 +0200
--
.../camel/component/cxf/DefaultCxfBinding.java | 6 +-
.../cxf/CxfPayloadRouterContentLengthTest.java | 179 +++
.../cxf/CxfPayloadRouterContentLengthBeans.xml | 53 ++
3 files changed, 237 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/dc370b57/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 7616568..71ed7d5 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -690,7 +690,11 @@ public class DefaultCxfBinding implements CxfBinding,
HeaderFilterStrategyAware
if (transportHeaders.size() 0) {
cxfContext.put(Message.PROTOCOL_HEADERS, transportHeaders);
-}
+} else {
+// no propagated transport headers does really mean no headers,
not the ones
+// from the previous request or response propagated with the
invocation context
+cxfContext.remove(Message.PROTOCOL_HEADERS);
+}
}
protected static Object getContentFromCxf(Message message, DataFormat
dataFormat) {
http://git-wip-us.apache.org/repos/asf/camel/blob/dc370b57/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
new file mode 100644
index 000..fc55c95
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
@@ -0,0 +1,179 @@
+/**
+ * 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.cxf;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IOHelper;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import
camel git commit: CAMEL-8810 Camel CXF may propagate wrong Content-Length headers
Repository: camel
Updated Branches:
refs/heads/master 2e4baeb4e - 4dc58a500
CAMEL-8810 Camel CXF may propagate wrong Content-Length headers
Thanks to Stephan Siano
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4dc58a50
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4dc58a50
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4dc58a50
Branch: refs/heads/master
Commit: 4dc58a5007a3d2ae8dbc55b41ded92ecb15e05c2
Parents: 2e4baeb
Author: Franz Forsthofer franz.forstho...@sap.com
Authored: Sat Jun 13 11:43:15 2015 +0200
Committer: Franz Forsthofer franz.forstho...@sap.com
Committed: Sat Jun 13 11:43:15 2015 +0200
--
.../camel/component/cxf/DefaultCxfBinding.java | 6 +-
.../cxf/CxfPayloadRouterContentLengthTest.java | 176 +++
.../cxf/CxfPayloadRouterContentLengthBeans.xml | 53 ++
3 files changed, 234 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc58a50/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 07e879a..1424963 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -690,7 +690,11 @@ public class DefaultCxfBinding implements CxfBinding,
HeaderFilterStrategyAware
if (transportHeaders.size() 0) {
cxfContext.put(Message.PROTOCOL_HEADERS, transportHeaders);
-}
+} else {
+// no propagated transport headers does really mean no headers,
not the ones
+// from the previous request or response propagated with the
invocation context
+cxfContext.remove(Message.PROTOCOL_HEADERS);
+}
}
protected static Object getContentFromCxf(Message message, DataFormat
dataFormat) {
http://git-wip-us.apache.org/repos/asf/camel/blob/4dc58a50/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
new file mode 100644
index 000..14b866a
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
@@ -0,0 +1,176 @@
+/**
+ * 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.cxf;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IOHelper;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import
camel git commit: rest/ws component should not be labelled as http
Repository: camel
Updated Branches:
refs/heads/master 4dc58a500 - acdcb7c6c
rest/ws component should not be labelled as http
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/acdcb7c6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/acdcb7c6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/acdcb7c6
Branch: refs/heads/master
Commit: acdcb7c6c387c254b7b77fa92cdc74baabc58c44
Parents: 4dc58a5
Author: Claus Ibsen davscl...@apache.org
Authored: Sat Jun 13 14:28:33 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sat Jun 13 14:28:33 2015 +0200
--
.../main/java/org/apache/camel/component/rest/RestEndpoint.java| 2 +-
.../main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java| 2 +-
.../camel/component/atmosphere/websocket/WebsocketEndpoint.java| 2 +-
.../java/org/apache/camel/component/cometd/CometdEndpoint.java | 2 +-
.../src/main/java/org/apache/camel/component/cxf/CxfEndpoint.java | 2 +-
.../java/org/apache/camel/component/cxf/jaxrs/CxfRsEndpoint.java | 2 +-
.../java/org/apache/camel/component/restlet/RestletEndpoint.java | 2 +-
.../apache/camel/component/spring/ws/SpringWebserviceEndpoint.java | 2 +-
.../org/apache/camel/component/websocket/WebsocketEndpoint.java| 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/acdcb7c6/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
index 220ea7c..3c6dbcb 100644
--- a/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/rest/RestEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.util.HostUtils;
import org.apache.camel.util.ObjectHelper;
-@UriEndpoint(scheme = rest, title = REST, syntax =
rest:method:path:uriTemplate, consumerOnly = true, label = core,http,rest)
+@UriEndpoint(scheme = rest, title = REST, syntax =
rest:method:path:uriTemplate, consumerOnly = true, label = core,rest)
public class RestEndpoint extends DefaultEndpoint {
@UriPath(enums = get,post,put,delete,patch,head,trace,connect,options)
@Metadata(required = true)
http://git-wip-us.apache.org/repos/asf/camel/blob/acdcb7c6/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
--
diff --git
a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index 9a714fa..ec37304 100644
---
a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++
b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -38,7 +38,7 @@ import org.apache.camel.spi.UriParam;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-@UriEndpoint(scheme = ahc-ws,ahc-wss, title = AHC Websocket,AHC Secure
Websocket, syntax = ahc-ws:httpUri, consumerClass = WsConsumer.class, label
= http,websocket)
+@UriEndpoint(scheme = ahc-ws,ahc-wss, title = AHC Websocket,AHC Secure
Websocket, syntax = ahc-ws:httpUri, consumerClass = WsConsumer.class, label
= websocket)
public class WsEndpoint extends AhcEndpoint {
private static final transient Logger LOG =
LoggerFactory.getLogger(WsEndpoint.class);
http://git-wip-us.apache.org/repos/asf/camel/blob/acdcb7c6/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
--
diff --git
a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
index a282a00..9b5abe8 100644
---
a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
+++
b/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.commons.httpclient.params.HttpClientParams;
/**
*
*/
-@UriEndpoint(scheme = atmosphere-websocket, title = Atmosphere Websocket,
syntax = atmosphere-websocket:servicePath, consumerClass =
WebsocketConsumer.class, label = http,websocket)
+@UriEndpoint(scheme = atmosphere-websocket, title =
camel git commit: CAMEL-8810 Camel CXF may propagate wrong Content-Length headers Thanks to Stephan Siano
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x 57da1472e - e82251b7d
CAMEL-8810 Camel CXF may propagate wrong Content-Length headers
Thanks to Stephan Siano
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e82251b7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e82251b7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e82251b7
Branch: refs/heads/camel-2.15.x
Commit: e82251b7da283861e4690f4e5dccfeeefdabe2b8
Parents: 57da147
Author: Franz Forsthofer franz.forstho...@sap.com
Authored: Sat Jun 13 12:29:19 2015 +0200
Committer: Franz Forsthofer franz.forstho...@sap.com
Committed: Sat Jun 13 12:29:19 2015 +0200
--
.../camel/component/cxf/DefaultCxfBinding.java | 6 +-
.../cxf/CxfPayloadRouterContentLengthTest.java | 179 +++
.../cxf/CxfPayloadRouterContentLengthBeans.xml | 53 ++
3 files changed, 237 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e82251b7/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
--
diff --git
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
index 7616568..71ed7d5 100644
---
a/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
+++
b/components/camel-cxf/src/main/java/org/apache/camel/component/cxf/DefaultCxfBinding.java
@@ -690,7 +690,11 @@ public class DefaultCxfBinding implements CxfBinding,
HeaderFilterStrategyAware
if (transportHeaders.size() 0) {
cxfContext.put(Message.PROTOCOL_HEADERS, transportHeaders);
-}
+} else {
+// no propagated transport headers does really mean no headers,
not the ones
+// from the previous request or response propagated with the
invocation context
+cxfContext.remove(Message.PROTOCOL_HEADERS);
+}
}
protected static Object getContentFromCxf(Message message, DataFormat
dataFormat) {
http://git-wip-us.apache.org/repos/asf/camel/blob/e82251b7/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
--
diff --git
a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
new file mode 100644
index 000..fc55c95
--- /dev/null
+++
b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfPayloadRouterContentLengthTest.java
@@ -0,0 +1,179 @@
+/**
+ * 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.cxf;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.spring.SpringCamelContext;
+import org.apache.camel.test.AvailablePortFinder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IOHelper;
+import org.apache.http.HttpEntity;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.ContentType;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.AbstractHandler;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import
camel git commit: Upgrade ApacheDS to version 2.0.0-M20
Repository: camel Updated Branches: refs/heads/master 799e5890d - e47aa24a7 Upgrade ApacheDS to version 2.0.0-M20 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e47aa24a Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e47aa24a Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e47aa24a Branch: refs/heads/master Commit: e47aa24a7e1a7910e2298292c9353dbec70fe794 Parents: 799e589 Author: Andrea Cosentino anco...@gmail.com Authored: Sat Jun 13 23:49:53 2015 +0200 Committer: Andrea Cosentino anco...@gmail.com Committed: Sat Jun 13 23:49:53 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e47aa24a/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 22c177e..29030e5 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -41,7 +41,7 @@ antlr-bundle-version3.4_1/antlr-bundle-version antlr-runtime-bundle-version3.4_2/antlr-runtime-bundle-version aopalliance-bundle-version1.0_6/aopalliance-bundle-version -apacheds-version2.0.0-M19/apacheds-version +apacheds-version2.0.0-M20/apacheds-version apache-gora-version0.4/apache-gora-version apache-mime4j-version0.7.2/apache-mime4j-version aries-blueprint-api-version1.0.0/aries-blueprint-api-version
