svn commit: r952814 - in /websites/production/camel/content: cache/main.pageCache release-guide.html
Author: buildbot Date: Wed May 27 02:18:38 2015 New Revision: 952814 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/release-guide.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/release-guide.html == --- websites/production/camel/content/release-guide.html (original) +++ websites/production/camel/content/release-guide.html Wed May 27 02:18:38 2015 @@ -138,7 +138,7 @@ /div/divpIt is also essential that you configure your umask to 2 on people.apache.org for non-interactive login. You can do that by including the snipped below in your code.profile/code./pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl script class=theme: Default; brush: text; gutter: false type=syntaxhighlighter![CDATA[umask 002 ]]/script -/div/divh3 id=ReleaseGuide-CreatingtheCamelReleaseCreating the Camel Release/h3pThe release plugin will prompt for a release version, tag and next release version. Use a three digit release version of the form: 2.x.x and for the tag use a string of the form: camel-2.x.x. The next version string should use the two digit from: 2.x-SNAPSHOT as this can be consistent for future SNAPSHOT releases./pollipGrab the latest source from Git/pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl +/div/divh3 id=ReleaseGuide-CreatingtheCamelReleasespan style=line-height: 1.5625;Creating the Camel Release/span/h3pThe release plugin will prompt for a release version, tag and next release version. Use a three digit release version of the form: 2.x.x and for the tag use a string of the form: camel-2.x.x. The next version string should use the two digit from: 2.x-SNAPSHOT as this can be consistent for future SNAPSHOT releases./pollipGrab the latest source from Git/pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl script class=theme: Default; brush: text; gutter: false type=syntaxhighlighter![CDATA[git clone https://git-wip-us.apache.org/repos/asf/camel.git cd camel ]]/script @@ -163,11 +163,10 @@ grep -e #39; !?#39; target/rat.txt gpg: Signature made Tue Jan 10 20:50:27 2012 CET using RSA key ID 2A239C2C gpg: Good signature from quot;Christian Mueller (CODE SIGNING KEY) lt;cmuel...@apache.orggt;quot; ]]/script -/div/divpWhen you like the results, clean up:/pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl -script class=theme: Default; brush: text; gutter: false type=syntaxhighlighter![CDATA[mvn release:clean -Prelease -]]/script -/div/div/lilipPrepare the release/pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl -script class=theme: Default; brush: text; gutter: false type=syntaxhighlighter![CDATA[mvn release:prepare -Prelease +/div/div/lilipPrepare the release/ppWhen you like the results, clean up:/pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl +script class=theme: Default; brush: text; gutter: false type=syntaxhighlighter![CDATA[mvn release:clean -Prelease]]/script +/div/divpNOTE: If your git doesn't remember the username and password, you need pass it to the mvn plugin, otherwise the release plugin will wait forever.#160;/pdiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl +script class=theme: Default; brush: text; gutter: false type=syntaxhighlighter![CDATA[mvn release:prepare -Dusername=USERNAME -Dpassword=PASSWORD -Prelease ]]/script /div/divpThis will create the tag in svn and leave various stuff around locally to direct the perform phase./pdiv class=aui-message hint shadowed information-macro span class=aui-icon icon-hintIcon/span @@ -229,7 +228,9 @@ svn ci -F commit.txt script class=theme: Default; brush: text; gutter: false type=syntaxhighlighter![CDATA[find ./ -name pom.xml |xargs perl -pi -e #39;s/2.11-SNAPSHOT/2.10.x-SNAPSHOT/g#39; svn ci -m quot;Update the pom version for next patch releasequot; ]]/script -/div/div/li/ololliSet up a new continuous integration build, if we release a new major/minor version: a shape=rect class=external-link href=https://builds.apache.org/view/A-D/view/Camel/;https://builds.apache.org/view/A-D/view/Camel//a/li/ol/div +/div/div/li/ololliSet up a new continuous integration build, if we release a new major/minor version: a shape=rect class=external-link href=https://builds.apache.org/view/A-D/view/Camel/;https://builds.apache.org/view/A-D/view/Camel//a/li/oldiv class=code panel pdl style=border-width: 1px;div class=codeContent panelContent pdl +script class=theme:
camel git commit: Fixed the CS errors in camel-2.14.x
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x cc5528c8a - 7a2a43596
Fixed the CS errors in camel-2.14.x
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7a2a4359
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7a2a4359
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7a2a4359
Branch: refs/heads/camel-2.14.x
Commit: 7a2a4359682bcecd08c667f3817c52843fe280c4
Parents: cc5528c
Author: Willem Jiang willem.ji...@gmail.com
Authored: Wed May 27 10:49:13 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Wed May 27 10:49:32 2015 +0800
--
.../remote/FtpBadLoginConnectionLeakTest.java | 12 ++-
...FtpBadLoginInProducerConnectionLeakTest.java | 14 +++--
.../FtpBadLoginMockNoopConnectionLeakTest.java | 21 ++--
.../camel/component/hdfs/HdfsConsumerTest.java | 7 +++
.../camel/component/hdfs2/HdfsConsumerTest.java | 7 +++
.../hdfs2/integration/HdfsAppendTest.java | 2 +-
.../HdfsProducerConsumerIntegrationTest.java| 15 --
7 files changed, 37 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7a2a4359/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
--
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
index 13c8a16..b62ecaf 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginConnectionLeakTest.java
@@ -37,8 +37,8 @@ public class FtpBadLoginConnectionLeakTest extends
FtpServerTestSupport {
private MapInteger, boolean[] socketAudits = new HashMapInteger,
boolean[]();
private String getFtpUrl() {
-return ftp://dummy@localhost:; + getPort() +
/badlogin?password=cantremeber +
-
throwExceptionOnConnectFailed=falseftpClient.socketFactory=#sf;
+return ftp://dummy@localhost:; + getPort() +
/badlogin?password=cantremeber
++
throwExceptionOnConnectFailed=falseftpClient.socketFactory=#sf;
}
@Override
@@ -101,7 +101,7 @@ public class FtpBadLoginConnectionLeakTest extends
FtpServerTestSupport {
@Override
public Socket createSocket() throws IOException {
AuditingSocket socket = new AuditingSocket();
-socketAudits.put(System.identityHashCode(socket), new boolean[] {
false, false });
+socketAudits.put(System.identityHashCode(socket), new boolean[]
{false, false});
return socket;
}
@@ -119,13 +119,15 @@ public class FtpBadLoginConnectionLeakTest extends
FtpServerTestSupport {
@Override
public void connect(SocketAddress endpoint, int timeout) throws
IOException {
super.connect(endpoint, timeout);
-socketAudits.get(System.identityHashCode(this))[0] = true;
+boolean[] value = socketAudits.get(System.identityHashCode(this));
+value[0] = true;
}
@Override
public synchronized void close() throws IOException {
super.close();
-socketAudits.get(System.identityHashCode(this))[1] = true;
+boolean[] value = socketAudits.get(System.identityHashCode(this));
+value[1] = true;
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/7a2a4359/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
--
diff --git
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
index 92d223f..837f37c 100644
---
a/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
+++
b/components/camel-ftp/src/test/java/org/apache/camel/component/file/remote/FtpBadLoginInProducerConnectionLeakTest.java
@@ -36,8 +36,8 @@ public class FtpBadLoginInProducerConnectionLeakTest extends
FtpServerTestSuppor
private MapInteger, boolean[] socketAudits = new HashMapInteger,
boolean[]();
private String getFtpUrl() {
-return ftp://dummy@localhost:; + getPort() +
/badlogin?password=cantremebermaximumReconnectAttempts=3 +
-
camel git commit: Fix the CS error of camel-avro
Repository: camel Updated Branches: refs/heads/camel-2.14.x 8941953ae - cc5528c8a Fix the CS error of camel-avro Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cc5528c8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cc5528c8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cc5528c8 Branch: refs/heads/camel-2.14.x Commit: cc5528c8acdfc3fdd9c45b0b5a34680b58e05986 Parents: 8941953 Author: Willem Jiang willem.ji...@gmail.com Authored: Wed May 27 02:41:16 2015 + Committer: Willem Jiang willem.ji...@gmail.com Committed: Wed May 27 02:41:16 2015 + -- .../camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/cc5528c8/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java -- diff --git a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java index 2744504..d62c967 100644 --- a/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java +++ b/components/camel-avro/src/test/java/org/apache/camel/dataformat/avro/AvroMarshalAndUnmarshalSpringTest.java @@ -17,8 +17,8 @@ package org.apache.camel.dataformat.avro; import org.apache.camel.CamelContext; -import org.apache.camel.spring.SpringCamelContext; import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.spring.SpringCamelContext; import org.springframework.context.support.AbstractXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext;
[1/2] camel git commit: Updated the test to verify the blueprint placeholder setting of HttpConduit
Repository: camel
Updated Branches:
refs/heads/master 943054ce9 - ef9968942
Updated the test to verify the blueprint placeholder setting of HttpConduit
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d35bb228
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d35bb228
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d35bb228
Branch: refs/heads/master
Commit: d35bb228c5c8d4fc3c49f0d40e64d4db46401269
Parents: 943054c
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue May 26 15:53:27 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue May 26 15:53:27 2015 +0800
--
.../org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/d35bb228/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml
--
diff --git
a/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml
b/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml
index 5e0db2a..e1b7c9b 100644
---
a/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml
+++
b/tests/camel-blueprint-cxf-test/src/test/resources/org/apache/camel/test/cxf/blueprint/CxfEndpointBeans.xml
@@ -44,6 +44,7 @@
cm:property name=transportId
value=http://cxf.apache.org/transports/http; /
cm:property name=serviceName
value={http://org.apache.camel.component.cxf}myService; /
cm:property name=endpointName
value={http://org.apache.camel.component.cxf}myEndpoint; /
+ cm:property name=receiveTimeout value=200 /
cm:property name=wsdlURL value=wsdl/test.wsdl /
/cm:default-properties
/cm:property-placeholder
@@ -92,7 +93,7 @@
!-- Setting the http conduit policy --
http-conf:conduit
name={http://cxf.component.camel.apache.org/}HelloServicePort.http-conduit;
-http-conf:client ReceiveTimeout=500
+http-conf:client ReceiveTimeout=${receiveTimeout}
MaxRetransmits=1
AllowChunking=false /
/http-conf:conduit
[2/2] camel git commit: Fixed the CS error of camel-spring-ws
Fixed the CS error of camel-spring-ws
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ef996894
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ef996894
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ef996894
Branch: refs/heads/master
Commit: ef99689428eb264de51c10179da5354ca6287dc0
Parents: d35bb22
Author: Willem Jiang willem.ji...@gmail.com
Authored: Tue May 26 15:54:34 2015 +0800
Committer: Willem Jiang willem.ji...@gmail.com
Committed: Tue May 26 15:54:34 2015 +0800
--
.../camel/component/spring/ws/SpringWebserviceEndpoint.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/ef996894/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
--
diff --git
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
index 741c1ca..fbec7a4 100644
---
a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
+++
b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/SpringWebserviceEndpoint.java
@@ -24,7 +24,9 @@ import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
-@UriEndpoint(scheme = spring-ws, title = Spring WebService, syntax =
spring-ws:type:lookupKey:webServiceEndpointUri, consumerClass =
SpringWebserviceConsumer.class, label = http,soap,webservice)
+@UriEndpoint(scheme = spring-ws, title = Spring WebService,
+syntax = spring-ws:type:lookupKey:webServiceEndpointUri,
+consumerClass = SpringWebserviceConsumer.class, label = http,soap,webservice)
public class SpringWebserviceEndpoint extends DefaultEndpoint {
@UriParam
svn commit: r952700 [2/2] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache http.html
Modified: websites/production/camel/content/http.html == --- websites/production/camel/content/http.html (original) +++ websites/production/camel/content/http.html Tue May 26 10:20:40 2015 @@ -134,7 +134,7 @@ from(quot;direct:startquot;) lt;to uri=quot;http://www.google.comquot;/gt; lt;to uri=quot;mock:resultsquot;/gt; ]]/script -/div/div/td/tr/tbody/table/divh3 id=HTTP-HttpEndpointOptionsHttpEndpoint Options/h3div class=confluenceTableSmalldiv class=table-wraptable class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThpName/p/thth colspan=1 rowspan=1 class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1 class=confluenceThpDescription/p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodethrowExceptionOnFailure/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodetrue/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpOption to disable throwing the codeHttpOperationFailedException/code in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodebridgeEndpoint/code/p/tdtd colspan=1 rowspan=1 class=confluenc eTdpcodefalse/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpIf the option is true , HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the * throwExceptionOnFailure* to be false to let the HttpProducer send all the fault response back. br clear=none class=atl-forced-newline strongCamel 2.3:/strong If the option is true, HttpProducer and CamelServlet will skip the gzip processing if the content-encoding is gzip./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodedisableStreamCache/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpDefaultHttpBinding will copy the request input stream into a stream cache and put it into message body if this option is false to support read it twice, otherwise DefaultHttpBinding will set the request input stream direct into the message bo dy./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodehttpBindingRef/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpstrongDeprecated and will be removed in Camel 3.0:/strong Reference to a codeorg.apache.camel.component.http.HttpBinding/code in the a shape=rect href=registry.htmlRegistry/a. Use the codehttpBinding/code option instead./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodehttpBinding/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpstrongCamel 2.3:/strong Reference to a codeorg.apache.camel.component.http.HttpBinding/code in the a shape=rect href=registry.htmlRegistry/a./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodehttpClientConfigurerRef/code/p/tdtd colspan= 1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpstrongDeprecated and will be removed in Camel 3.0:/strong Reference to a codeorg.apache.camel.component.http.HttpClientConfigurer/code in the a shape=rect href=registry.htmlRegistry/a. Use the codehttpClientConfigurer/code option instead./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodehttpClientConfigurer/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpstrongCamel 2.3:/strong Reference to a codeorg.apache.camel.component.http.HttpClientConfigurer/code in the a shape=rect href=registry.htmlRegistry/a./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodehttpClient.XXX/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 rowspan=1 cl ass=confluenceTdpSetting options on the a shape=rect class=external-link href=http://hc.apache.org/httpclient-3.x/apidocs/org/apache/commons/httpclient/params/HttpClientParams.html;HttpClientParams/a. For instance codehttpClient.soTimeout=5000/code will set the codeSO_TIMEOUT/code to 5 seconds./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodeclientConnectionManager/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpTo use a custom codeorg.apache.http.conn.ClientConnectionManager/code./p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpcodetransferException/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd colspan=1 rowspan=1 class=confluenceTdpstrongCamel 2.6:/strong If enabled and an a shape=rect href=exchange.htmlExchange/a failed processing on the consumer side, and if the caused codeException/code was send back serialized in the response as a codeapplication/x-java-serialized-object/code content type (for example using a shape=rect href=jetty.htmlJetty/a or a shape=rect
svn commit: r952700 [1/2] - in /websites/production/camel/content: book-component-appendix.html book-in-one-page.html cache/main.pageCache http.html
Author: buildbot
Date: Tue May 26 10:20:40 2015
New Revision: 952700
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/http.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 Tue May 26
10:20:40 2015
@@ -1334,11 +1334,11 @@ template.send(quot;direct:alias-verify
/div
/div
pThe strongcxf:/strong component provides integration with a
shape=rect href=http://cxf.apache.org;Apache CXF/a for connecting to
JAX-WS services hosted in CXF./ppstyle type=text/css/*![CDATA[*/
-div.rbtoc1432225126232 {padding: 0px;}
-div.rbtoc1432225126232 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1432225126232 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1432635537572 {padding: 0px;}
+div.rbtoc1432635537572 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1432635537572 li {margin-left: 0px;padding-left: 0px;}
-/*]]*//style/pdiv class=toc-macro rbtoc1432225126232
+/*]]*//style/pdiv class=toc-macro rbtoc1432635537572
ul class=toc-indentationlia shape=rect href=#CXF-CXFComponentCXF
Component/a
ul class=toc-indentationlia shape=rect href=#CXF-URIformatURI
format/a/lilia shape=rect href=#CXF-OptionsOptions/a
ul class=toc-indentationlia shape=rect
href=#CXF-ThedescriptionsofthedataformatsThe descriptions of the
dataformats/a
@@ -5005,7 +5005,7 @@ from(quot;direct:startquot;)
lt;to uri=quot;http://www.google.comquot;/gt;
lt;to uri=quot;mock:resultsquot;/gt;
]]/script
-/div/div/td/tr/tbody/table/divh3
id=BookComponentAppendix-HttpEndpointOptionsHttpEndpoint Options/h3div
class=confluenceTableSmalldiv class=table-wraptable
class=confluenceTabletbodytrth colspan=1 rowspan=1
class=confluenceThpName/p/thth colspan=1 rowspan=1
class=confluenceThpDefault Value/p/thth colspan=1 rowspan=1
class=confluenceThpDescription/p/th/trtrtd colspan=1
rowspan=1
class=confluenceTdpcodethrowExceptionOnFailure/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpcodetrue/code/p/tdtd
colspan=1 rowspan=1 class=confluenceTdpOption to disable throwing the
codeHttpOperationFailedException/code in case of failed responses from the
remote server. This allows you to get all responses regardless of the HTTP
status code./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodebridgeEndpoint/code/p/tdtd colspan=1
rowspan=1
class=confluenceTdpcodefalse/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpIf the option is true , HttpProducer will
ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request.
You may also set the * throwExceptionOnFailure* to be false to let the
HttpProducer send all the fault response back. br clear=none
class=atl-forced-newline strongCamel 2.3:/strong If the option is true,
HttpProducer and CamelServlet will skip the gzip processing if the
content-encoding is gzip./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodedisableStreamCache/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpcodefalse/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpDefaultHttpBinding will copy the request
input stream into a stream cache and put it into message body if this option is
false to support read it twice, otherwise DefaultHttpBinding will set the
request input stream direct in
to the message body./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodehttpBindingRef/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpstrongDeprecated and will be removed in
Camel 3.0:/strong Reference to a
codeorg.apache.camel.component.http.HttpBinding/code in the a shape=rect
href=registry.htmlRegistry/a. Use the codehttpBinding/code option
instead./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodehttpBinding/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1
rowspan=1 class=confluenceTdpstrongCamel 2.3:/strong Reference to a
codeorg.apache.camel.component.http.HttpBinding/code in the a shape=rect
href=registry.htmlRegistry/a./p/td/trtrtd colspan=1 rowspan=1
class=confluenceTdpcodehttpClientConfigurerRef/code/p
/tdtd colspan=1 rowspan=1
class=confluenceTdpcodenull/code/p/tdtd colspan=1 rowspan=1
class=confluenceTdpstrongDeprecated and will be removed in Camel
3.0:/strong Reference to a
codeorg.apache.camel.component.http.HttpClientConfigurer/code in the a
shape=rect href=registry.htmlRegistry/a. Use the
codehttpClientConfigurer/code option instead./p/td/trtrtd
colspan=1 rowspan=1
class=confluenceTdpcodehttpClientConfigurer/code/p/tdtd
colspan=1 rowspan=1
[3/3] camel git commit: Fix the logging event to use placeholders correctly.
Fix the logging event to use placeholders correctly.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8941953a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8941953a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8941953a
Branch: refs/heads/camel-2.14.x
Commit: 8941953ae0510e79382462c01b28d8bc2a24a67d
Parents: 5ae4a90
Author: Candle can...@candle.me.uk
Authored: Tue May 26 13:31:37 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 26 15:12:15 2015 +0200
--
.../main/java/org/apache/camel/component/aws/sqs/SqsProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/8941953a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
--
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index 874e021..69b1eb3 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -125,7 +125,7 @@ public class SqsProducer extends DefaultProducer {
result.put(entry.getKey(), mav);
} else {
// cannot translate the message header to message
attribute value
-LOG.warn(Cannot put the message header key={0}, value={1}
into Sqs MessageAttribute, entry.getKey(), entry.getValue());
+LOG.warn(Cannot put the message header key={}, value={}
into Sqs MessageAttribute, entry.getKey(), entry.getValue());
}
}
}
[2/3] camel git commit: Fix the logging event to use placeholders correctly.
Fix the logging event to use placeholders correctly.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c33808a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c33808a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c33808a
Branch: refs/heads/camel-2.15.x
Commit: 3c33808a022efa907da9ed7cc46674442aae40d8
Parents: 147a65d
Author: Candle can...@candle.me.uk
Authored: Tue May 26 13:31:37 2015 +0100
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 26 15:12:02 2015 +0200
--
.../main/java/org/apache/camel/component/aws/sqs/SqsProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/3c33808a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
--
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index 874e021..69b1eb3 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -125,7 +125,7 @@ public class SqsProducer extends DefaultProducer {
result.put(entry.getKey(), mav);
} else {
// cannot translate the message header to message
attribute value
-LOG.warn(Cannot put the message header key={0}, value={1}
into Sqs MessageAttribute, entry.getKey(), entry.getValue());
+LOG.warn(Cannot put the message header key={}, value={}
into Sqs MessageAttribute, entry.getKey(), entry.getValue());
}
}
}
[1/3] camel git commit: Fix the logging event to use placeholders correctly.
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 5ae4a907f - 8941953ae
refs/heads/camel-2.15.x 147a65dde - 3c33808a0
refs/heads/master 05f0d1b18 - f9f158cbd
Fix the logging event to use placeholders correctly.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f9f158cb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f9f158cb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f9f158cb
Branch: refs/heads/master
Commit: f9f158cbd4060cc1b61fdfd5d6084165084052c0
Parents: 05f0d1b
Author: Candle can...@candle.me.uk
Authored: Tue May 26 13:31:37 2015 +0100
Committer: Candle can...@candle.me.uk
Committed: Tue May 26 13:31:37 2015 +0100
--
.../main/java/org/apache/camel/component/aws/sqs/SqsProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/f9f158cb/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
--
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
index 874e021..69b1eb3 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsProducer.java
@@ -125,7 +125,7 @@ public class SqsProducer extends DefaultProducer {
result.put(entry.getKey(), mav);
} else {
// cannot translate the message header to message
attribute value
-LOG.warn(Cannot put the message header key={0}, value={1}
into Sqs MessageAttribute, entry.getKey(), entry.getValue());
+LOG.warn(Cannot put the message header key={}, value={}
into Sqs MessageAttribute, entry.getKey(), entry.getValue());
}
}
}
[3/3] camel git commit: Fixed CS
Fixed CS
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/05f0d1b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/05f0d1b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/05f0d1b1
Branch: refs/heads/master
Commit: 05f0d1b1851ee6d2f3834831f52e3477966f5f7a
Parents: eac1acb
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 26 14:16:53 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 26 14:16:53 2015 +0200
--
.../maven/packaging/PackageComponentMojo.java | 7 +++---
.../maven/packaging/PackageDataFormatMojo.java | 23 ++--
.../camel/maven/packaging/PackageHelper.java| 4 ++--
.../maven/packaging/PackageLanguageMojo.java| 23 ++--
.../maven/packaging/PrepareComponentMojo.java | 8 +++
5 files changed, 34 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/05f0d1b1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
--
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index b3d8207..774e49c 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
@@ -29,6 +29,7 @@ import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
+import org.omg.IOP.IORHelper;
import org.sonatype.plexus.build.incremental.BuildContext;
/**
@@ -141,9 +142,9 @@ public class PackageComponentMojo extends AbstractMojo {
camelMetaDir.mkdirs();
File outFile = new File(camelMetaDir, component.properties);
try {
-try(OutputStream os =
buildContext.newFileOutputStream(outFile)) {
-properties.store(os, Generated by
camel-package-maven-plugin);
-}
+OutputStream os = buildContext.newFileOutputStream(outFile);
+properties.store(os, Generated by
camel-package-maven-plugin);
+os.close();
log.info(Generated + outFile + containing + count +
Camel + (count 1 ? components: : component: ) + names);
http://git-wip-us.apache.org/repos/asf/camel/blob/05f0d1b1/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
--
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index b398787..d7e3371 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -16,10 +16,6 @@
*/
package org.apache.camel.maven.packaging;
-import static org.apache.camel.maven.packaging.PackageHelper.after;
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-import static org.apache.camel.maven.packaging.PackageHelper.parseAsMap;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -44,6 +40,10 @@ import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
import org.sonatype.plexus.build.incremental.BuildContext;
+import static org.apache.camel.maven.packaging.PackageHelper.after;
+import static org.apache.camel.maven.packaging.PackageHelper.loadText;
+import static org.apache.camel.maven.packaging.PackageHelper.parseAsMap;
+
/**
* Analyses the Camel plugins in a project and generates extra descriptor
information for easier auto-discovery in Camel.
*
@@ -102,7 +102,8 @@ public class PackageDataFormatMojo extends AbstractMojo {
prepareDataFormat(getLog(), project, projectHelper, dataFormatOutDir,
schemaOutDir, buildContext);
}
-public static void prepareDataFormat(Log log, MavenProject project,
MavenProjectHelper projectHelper, File dataFormatOutDir, File schemaOutDir,
BuildContext buildContext) throws MojoExecutionException {
+public static void prepareDataFormat(Log log, MavenProject
[1/3] camel git commit: Update POMs to not ignore m2e supported goals
Repository: camel
Updated Branches:
refs/heads/master ef9968942 - 05f0d1b18
Update POMs to not ignore m2e supported goals
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eac1acb0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eac1acb0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eac1acb0
Branch: refs/heads/master
Commit: eac1acb0390256eae13c2277f203d0c9fbc13b2e
Parents: fa88e17
Author: Victor Noël victor.n...@linagora.com
Authored: Fri May 22 14:22:40 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 26 11:35:02 2015 +0200
--
camel-core/pom.xml | 4 +---
components/pom.xml | 29 -
2 files changed, 1 insertion(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/eac1acb0/camel-core/pom.xml
--
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index a568c66..ee871a4 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -196,9 +196,7 @@
artifactIdcamel-package-maven-plugin/artifactId
versionRange${project.version}/versionRange
goals
-goalgenerate-components-list/goal
-goalgenerate-dataformats-list/goal
-goalgenerate-languages-list/goal
+goalgenerate-eips-list/goal
/goals
/pluginExecutionFilter
action
http://git-wip-us.apache.org/repos/asf/camel/blob/eac1acb0/components/pom.xml
--
diff --git a/components/pom.xml b/components/pom.xml
index 3d34edb..368c5b3 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -239,35 +239,6 @@
build
-pluginManagement
- plugins
-!-- Eclipse m2e Lifecycle Management --
-plugin
- groupIdorg.eclipse.m2e/groupId
- artifactIdlifecycle-mapping/artifactId
- version${lifecycle-mapping-version}/version
- configuration
- lifecycleMappingMetadata
- pluginExecutions
- pluginExecution
- pluginExecutionFilter
- groupIdorg.apache.camel/groupId
- artifactIdcamel-package-maven-plugin/artifactId
- versionRange${project.version}/versionRange
- goals
- goalprepare-components/goal
- /goals
- /pluginExecutionFilter
- action
- ignore /
- /action
- /pluginExecution
- /pluginExecutions
- /lifecycleMappingMetadata
- /configuration
-/plugin
- /plugins
-/pluginManagement
plugins
plugin
groupIdorg.apache.camel/groupId
[2/3] camel git commit: More m2e improvements for camel-package-maven-plugin
More m2e improvements for camel-package-maven-plugin
- Make generated folder visible in Eclipse
- Uses build context output stream for better integration
- Avoid generating json files when input is unchanged
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fa88e170
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fa88e170
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fa88e170
Branch: refs/heads/master
Commit: fa88e17088d521e50712ccf3a837ee3c61821d12
Parents: ef99689
Author: Victor Noël victor.n...@linagora.com
Authored: Fri May 22 15:36:51 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 26 11:35:02 2015 +0200
--
.../maven/packaging/PackageComponentMojo.java | 26 ++-
.../maven/packaging/PackageDataFormatMojo.java | 48
.../maven/packaging/PackageLanguageMojo.java| 40 ++--
3 files changed, 70 insertions(+), 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/fa88e170/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
--
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
index 92ed09d..b3d8207 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageComponentMojo.java
@@ -17,10 +17,9 @@
package org.apache.camel.maven.packaging;
import java.io.File;
-import java.io.FileWriter;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
+import java.io.OutputStream;
+import java.util.Collections;
import java.util.Properties;
import org.apache.maven.model.Resource;
@@ -84,13 +83,19 @@ public class PackageComponentMojo extends AbstractMojo {
}
public static void prepareComponent(Log log, MavenProject project,
MavenProjectHelper projectHelper, File componentOutDir, BuildContext
buildContext) throws MojoExecutionException {
-
+
+File camelMetaDir = new File(componentOutDir,
META-INF/services/org/apache/camel/);
+
+// first we need to setup the output directory because the next check
+// can stop the build before the end and eclipse always needs to know
about that directory
+if (projectHelper != null) {
+projectHelper.addResource(project, componentOutDir.getPath(),
Collections.singletonList(**/component.properties), Collections.emptyList());
+}
+
if (!PackageHelper.haveResourcesChanged(log, project, buildContext,
META-INF/services/org/apache/camel/component)) {
return;
}
-File camelMetaDir = new File(componentOutDir,
META-INF/services/org/apache/camel/);
-
StringBuilder buffer = new StringBuilder();
int count = 0;
for (Resource r : project.getBuild().getResources()) {
@@ -136,14 +141,13 @@ public class PackageComponentMojo extends AbstractMojo {
camelMetaDir.mkdirs();
File outFile = new File(camelMetaDir, component.properties);
try {
-properties.store(new FileWriter(outFile), Generated by
camel-package-maven-plugin);
-buildContext.refresh(outFile);
+try(OutputStream os =
buildContext.newFileOutputStream(outFile)) {
+properties.store(os, Generated by
camel-package-maven-plugin);
+}
+
log.info(Generated + outFile + containing + count +
Camel + (count 1 ? components: : component: ) + names);
if (projectHelper != null) {
-ListString includes = new ArrayListString();
-includes.add(**/component.properties);
-projectHelper.addResource(project,
componentOutDir.getPath(), includes, new ArrayListString());
projectHelper.attachArtifact(project, properties,
camelComponent, outFile);
}
} catch (IOException e) {
http://git-wip-us.apache.org/repos/asf/camel/blob/fa88e170/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
--
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master f9f158cbd - 9d17405ad
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d17405a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d17405a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d17405a
Branch: refs/heads/master
Commit: 9d17405ad58805ce73ba60cfd15119a221cd9b38
Parents: f9f158c
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 26 16:27:08 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 26 17:44:50 2015 +0200
--
.../apache/camel/component/http/AuthMethod.java | 2 +-
.../camel/component/http/HttpComponent.java | 12 +++
.../camel/component/http/HttpEndpoint.java | 91 +---
3 files changed, 90 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9d17405a/components/camel-http/src/main/java/org/apache/camel/component/http/AuthMethod.java
--
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/AuthMethod.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/AuthMethod.java
index 84b67e8..44c62bf 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/AuthMethod.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/AuthMethod.java
@@ -23,5 +23,5 @@ package org.apache.camel.component.http;
*/
public enum AuthMethod {
-Basic, Digest, NTLM;
+Basic, Digest, NTLM
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d17405a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
--
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index 9256c9b..5c6f80f 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -320,6 +320,9 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return httpClientConfigurer;
}
+/**
+ * To use the custom HttpClientConfigurer to perform configuration of the
HttpClient that will be used.
+ */
public void setHttpClientConfigurer(HttpClientConfigurer
httpClientConfigurer) {
this.httpClientConfigurer = httpClientConfigurer;
}
@@ -328,6 +331,9 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return httpConnectionManager;
}
+/**
+ * To use a custom HttpConnectionManager to manage connections
+ */
public void setHttpConnectionManager(HttpConnectionManager
httpConnectionManager) {
this.httpConnectionManager = httpConnectionManager;
}
@@ -336,6 +342,9 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return httpBinding;
}
+/**
+ * To use a custom HttpBinding to control the mapping between Camel
message and HttpClient.
+ */
public void setHttpBinding(HttpBinding httpBinding) {
this.httpBinding = httpBinding;
}
@@ -344,6 +353,9 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return httpConfiguration;
}
+/**
+ * To use the shared HttpConfiguration as base configuration.
+ */
public void setHttpConfiguration(HttpConfiguration httpConfiguration) {
this.httpConfiguration = httpConfiguration;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d17405a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
--
diff --git
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
index ac82939..b4caea7 100644
---
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
+++
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpEndpoint.java
@@ -63,29 +63,29 @@ public class HttpEndpoint extends DefaultEndpoint
implements HeaderFilterStrateg
private HeaderFilterStrategy headerFilterStrategy = new
HttpHeaderFilterStrategy();
@UriParam
private HttpBinding binding;
-@UriParam(defaultValue = true)
+@UriParam(label = producer, defaultValue = true)
private boolean throwExceptionOnFailure = true;
-@UriParam
+@UriParam(label = producer)
private boolean bridgeEndpoint;
-@UriParam
+
camel git commit: Component docs
Repository: camel
Updated Branches:
refs/heads/master 9d17405ad - 80ff59200
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/80ff5920
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/80ff5920
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/80ff5920
Branch: refs/heads/master
Commit: 80ff59200d1c2cce4c10df28247117afd9915852
Parents: 9d17405
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 26 18:18:06 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 26 18:26:06 2015 +0200
--
.../camel/component/http4/HttpComponent.java| 40 ++-
.../camel/component/http4/HttpConsumer.java | 2 +-
.../camel/component/http4/HttpEndpoint.java | 115 ++-
.../camel/component/http4/HttpMessage.java | 4 +-
...tpEndpointOptionsNotChangeComponentTest.java | 6 +-
.../http4/HttpReferenceParameterTest.java | 4 +-
6 files changed, 132 insertions(+), 39 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/80ff5920/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
--
diff --git
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index b5fc46e..9fc700d 100644
---
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -286,7 +286,7 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
} else {
setEndpointHeaderFilterStrategy(endpoint);
}
-endpoint.setBinding(getHttpBinding());
+endpoint.setHttpBinding(getHttpBinding());
if (httpBinding != null) {
endpoint.setHttpBinding(httpBinding);
}
@@ -357,6 +357,9 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return httpClientConfigurer;
}
+/**
+ * To use the custom HttpClientConfigurer to perform configuration of the
HttpClient that will be used.
+ */
public void setHttpClientConfigurer(HttpClientConfigurer
httpClientConfigurer) {
this.httpClientConfigurer = httpClientConfigurer;
}
@@ -365,6 +368,9 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return clientConnectionManager;
}
+/**
+ * To use a custom HttpClientConnectionManager to manage connections
+ */
public void setClientConnectionManager(HttpClientConnectionManager
clientConnectionManager) {
this.clientConnectionManager = clientConnectionManager;
}
@@ -373,6 +379,9 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return httpBinding;
}
+/**
+ * To use a custom HttpBinding to control the mapping between Camel
message and HttpClient.
+ */
public void setHttpBinding(HttpBinding httpBinding) {
this.httpBinding = httpBinding;
}
@@ -381,6 +390,9 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return httpContext;
}
+/**
+ * To use a custom org.apache.http.protocol.HttpContext when executing
requests.
+ */
public void setHttpContext(HttpContext httpContext) {
this.httpContext = httpContext;
}
@@ -389,6 +401,11 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return sslContextParameters;
}
+/**
+ * To configure security using SSLContextParameters.
+ * Important: Only one instance of
org.apache.camel.util.jsse.SSLContextParameters is supported per HttpComponent.
+ * If you need to use 2 or more different instances, you need to define a
new HttpComponent per instance you need.
+ */
public void setSslContextParameters(SSLContextParameters
sslContextParameters) {
this.sslContextParameters = sslContextParameters;
}
@@ -397,6 +414,10 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return x509HostnameVerifier;
}
+/**
+ * To use a custom X509HostnameVerifier such as
org.apache.http.conn.ssl.StrictHostnameVerifier
+ * or org.apache.http.conn.ssl.AllowAllHostnameVerifier.
+ */
public void setX509HostnameVerifier(X509HostnameVerifier
x509HostnameVerifier) {
this.x509HostnameVerifier = x509HostnameVerifier;
}
@@ -405,6 +426,9 @@ public class HttpComponent extends
HeaderFilterStrategyComponent {
return maxTotalConnections;
}
+/**
+ * The maximum number of connections.
+ */
public void
camel git commit: CAMEL-7897: Added unit test
Repository: camel
Updated Branches:
refs/heads/master 80ff59200 - 7f0f97a8e
CAMEL-7897: Added unit test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7f0f97a8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f0f97a8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f0f97a8
Branch: refs/heads/master
Commit: 7f0f97a8eed922e61674a86d5ca6d30f712fab8e
Parents: 80ff592
Author: Claus Ibsen davscl...@apache.org
Authored: Tue May 26 18:46:56 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Tue May 26 18:46:56 2015 +0200
--
.../component/bean/BeanByteArrayBodyTest.java | 47
.../camel/language/simple/SimpleTest.java | 8
2 files changed, 55 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/7f0f97a8/camel-core/src/test/java/org/apache/camel/component/bean/BeanByteArrayBodyTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/component/bean/BeanByteArrayBodyTest.java
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanByteArrayBodyTest.java
new file mode 100644
index 000..d206bc2
--- /dev/null
+++
b/camel-core/src/test/java/org/apache/camel/component/bean/BeanByteArrayBodyTest.java
@@ -0,0 +1,47 @@
+/**
+ * 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.bean;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+public class BeanByteArrayBodyTest extends ContextTestSupport {
+
+public void testByteArray() throws Exception {
+byte[] bytes = new byte[]{65, 66, 67};
+
+getMockEndpoint(mock:result).expectedMessageCount(1);
+getMockEndpoint(mock:result).expectedHeaderReceived(foo, 3);
+
+template.sendBody(direct:start, bytes);
+
+assertMockEndpointsSatisfied();
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() throws Exception {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from(direct:start)
+.log(Body is ${body} and of type
${in.body.getClass.getCanonicalName})
+.setHeader(foo, simple(${in.body.length}))
+.to(mock:result);
+}
+};
+}
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/7f0f97a8/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
--
diff --git
a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
index dfcaf4e..5545dc2 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleTest.java
@@ -1394,6 +1394,14 @@ public class SimpleTest extends LanguageTestSupport {
assertExpression(${body.length}, 3);
}
+public void testByteArrayLength() throws Exception {
+exchange.getIn().setBody(new byte[]{65, 66, 67});
+assertExpression(${body[0]}, 65);
+assertExpression(${body[1]}, 66);
+assertExpression(${body[2]}, 67);
+assertExpression(${body.length}, 3);
+}
+
public void testSimpleMapBoolean() throws Exception {
MapString, Object map = new HashMapString, Object();
exchange.getIn().setBody(map);
