date:20150614

camel git commit: Upgrade Jackson to version 2.5.4

2015-06-14 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 3bf0588cc - 722a588e7


Upgrade Jackson to version 2.5.4


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/722a588e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/722a588e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/722a588e

Branch: refs/heads/master
Commit: 722a588e75b4660b8ce6ca3c654d0c4efec56659
Parents: 3bf0588
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 11:17:31 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 11:17:31 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/722a588e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index fd053b6..7ee4d62 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -233,7 +233,7 @@
 ivy-version2.4.0/ivy-version
 jini-version2.1/jini-version
 jackson-version1.9.12/jackson-version
-jackson2-version2.5.3/jackson2-version
+jackson2-version2.5.4/jackson2-version
 jackrabbit-version2.10.0/jackrabbit-version
 jain-sip-ri-bundle-version1.2.154_2/jain-sip-ri-bundle-version
 jasper-bundle-version6.0.36_1/jasper-bundle-version

[5/5] camel git commit: Component docs

2015-06-14 Thread davsclaus

Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e20ae861
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e20ae861
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e20ae861

Branch: refs/heads/master
Commit: e20ae861b79af7c1a7245abbc67e591af846875f
Parents: a4e6997
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 13:05:27 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 13:08:08 2015 +0200

--
 .../component/websocket/WebsocketComponent.java | 32 +++-
 .../component/websocket/WebsocketEndpoint.java  | 80 
 2 files changed, 95 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/e20ae861/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index 33afc99..379c730 100644
--- 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ 
b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -650,8 +650,6 @@ public class WebsocketComponent extends 
UriEndpointComponent {
  * ttclasspath:WEB-INF/static/tt
  * p/
  * If not configured (eg ttnull/tt) then no static resource is in use.
- *
- * @param staticResources the base path
  */
 public void setStaticResources(String staticResources) {
 this.staticResources = staticResources;
@@ -661,6 +659,9 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 return host;
 }
 
+/**
+ * The hostname. The default value is tt0.0.0.0/tt
+ */
 public void setHost(String host) {
 this.host = host;
 }
@@ -669,6 +670,9 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 return port;
 }
 
+/**
+ * The port number. The default value is tt9292/tt
+ */
 public void setPort(Integer port) {
 this.port = port;
 }
@@ -685,18 +689,30 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 return sslKeystore;
 }
 
+/**
+ * The password for the keystore when using SSL.
+ */
 public void setSslKeyPassword(String sslKeyPassword) {
 this.sslKeyPassword = sslKeyPassword;
 }
 
+/**
+ * The password when using SSL.
+ */
 public void setSslPassword(String sslPassword) {
 this.sslPassword = sslPassword;
 }
 
+/**
+ * The path to the keystore.
+ */
 public void setSslKeystore(String sslKeystore) {
 this.sslKeystore = sslKeystore;
 }
 
+/**
+ * If this option is true, Jetty JMX support will be enabled for this 
endpoint. See Jetty JMX support for more details.
+ */
 public void setEnableJmx(boolean enableJmx) {
 this.enableJmx = enableJmx;
 }
@@ -709,6 +725,9 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 return minThreads;
 }
 
+/**
+ * To set a value for minimum number of threads in server thread pool.
+ */
 public void setMinThreads(Integer minThreads) {
 this.minThreads = minThreads;
 }
@@ -717,6 +736,9 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 return maxThreads;
 }
 
+/**
+ * To set a value for maximum number of threads in server thread pool.
+ */
 public void setMaxThreads(Integer maxThreads) {
 this.maxThreads = maxThreads;
 }
@@ -725,6 +747,9 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 return threadPool;
 }
 
+/**
+ * To use a custom thread pool for the server.
+ */
 public void setThreadPool(ThreadPool threadPool) {
 this.threadPool = threadPool;
 }
@@ -733,6 +758,9 @@ public class WebsocketComponent extends 
UriEndpointComponent {
 return sslContextParameters;
 }
 
+/**
+ * To configure security using SSLContextParameters
+ */
 public void setSslContextParameters(SSLContextParameters 
sslContextParameters) {
 this.sslContextParameters = sslContextParameters;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/e20ae861/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java
--
diff --git 
a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java

camel git commit: Upgrade Jboss Weld to version 2.2.13.Final

2015-06-14 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 359bf0e45 - 62428565a


Upgrade Jboss Weld to version 2.2.13.Final


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/62428565
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/62428565
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/62428565

Branch: refs/heads/master
Commit: 62428565a477a340b7687e7d1e14156a16fa7060
Parents: 359bf0e
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 14:01:05 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 14:01:05 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/62428565/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 7ee4d62..ce2a7e7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -494,7 +494,7 @@
 velocity-version1.7/velocity-version
 vertx-version2.1.5/vertx-version
 vysper-version0.7/vysper-version
-weld2-version2.2.11.Final/weld2-version
+weld2-version2.2.13.Final/weld2-version
 werken-xpath-bundle-version0.9.4_5/werken-xpath-bundle-version
 woodstox-version4.4.1/woodstox-version
 ws-commons-util-bundle-version1.0.2_2/ws-commons-util-bundle-version

svn commit: r954789 - in /websites/production/camel/content: aws-ec2.html cache/main.pageCache

2015-06-14 Thread buildbot

Author: buildbot
Date: Sun Jun 14 10:18:47 2015
New Revision: 954789

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/aws-ec2.html
websites/production/camel/content/cache/main.pageCache

Modified: websites/production/camel/content/aws-ec2.html
==
--- websites/production/camel/content/aws-ec2.html (original)
+++ websites/production/camel/content/aws-ec2.html Sun Jun 14 10:18:47 2015
@@ -95,7 +95,7 @@
 h3 id=AWS-EC2-URIFormatURI Format/h3div class=code panel pdl 
style=border-width: 1px;div class=codeContent panelContent pdl
 script class=theme: Default; brush: java; gutter: false 
type=syntaxhighlighter![CDATA[aws-ec2://label[?options]
 ]]/script
-/div/divpYou can append query options to the URI in the following 
format, ?options=valueamp;option2=valueamp;.../ph3 
id=AWS-EC2-URIOptionsURI Options/h3div 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=confluenceThpContext/p/thth colspan=1 rowspan=1 
class=confluenceThpDescription/p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdpamazonEc2Client/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpProducer/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpReference to a 
com.amazonaws.services.ec2.AmazonEC2Client in the a shape=rect 
href=registry.htmlRegistry/a./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpaccessKey/p/
 tdtd colspan=1 rowspan=1 
class=confluenceTdpcodenull/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpProducer/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpAmazon AWS Access Key/p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpsecretKey/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpProducer/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpAmazon AWS Secret Key/p/td/trtrtd 
colspan=1 rowspan=1 class=confluenceTdpamazonEc2Endpoint/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpProducer/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpThe region with which the 
AWS-EC2 client wants to work with./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpoperation/p/tdtd colspan=1 rowspan
 =1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpProducer/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpValid values are createAndRunInstances, 
startInstances, stopInstances, terminateInstances and 
describeInstances/p/td/tr/tbody/table/divdiv 
class=aui-message hint shadowed information-macro
+/div/divpYou can append query options to the URI in the following 
format, ?options=valueamp;option2=valueamp;.../ph3 
id=AWS-EC2-URIOptionsURI Options/h3div 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=confluenceThpContext/p/thth colspan=1 rowspan=1 
class=confluenceThpDescription/p/th/trtrtd colspan=1 
rowspan=1 class=confluenceTdpamazonEc2Client/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpProducer/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpReference to a 
com.amazonaws.services.ec2.AmazonEC2Client in the a shape=rect 
href=registry.htmlRegistry/a./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpaccessKey/p/
 tdtd colspan=1 rowspan=1 
class=confluenceTdpcodenull/code/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpProducer/p/tdtd colspan=1 rowspan=1 
class=confluenceTdpAmazon AWS Access Key/p/td/trtrtd colspan=1 
rowspan=1 class=confluenceTdpsecretKey/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpProducer/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpAmazon AWS Secret Key/p/td/trtrtd 
colspan=1 rowspan=1 class=confluenceTdpamazonEc2Endpoint/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpcodenull/code/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpProducer/p/tdtd 
colspan=1 rowspan=1 class=confluenceTdpThe region with which the 
AWS-EC2 client wants to work with./p/td/trtrtd colspan=1 rowspan=1 
class=confluenceTdpoperation/p/tdtd colspan=1 rowspan
 =1 class=confluenceTdpcodenull/code/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpProducer/p/tdtd colspan=1 
rowspan=1 class=confluenceTdpValid values are createAndRunInstances, 
startInstances, stopInstances, terminateInstances, describeInstances, 
describeInstancesStatus, rebootInstances, monitorInstances and 
unmonitorInstances/p/td/tr/tbody/table/divdiv 
class=aui-message hint shadowed information-macro
 p class=titleRequired EC2 component options/p
 span class=aui-icon icon-hintIcon/span

[2/2] camel git commit: Component docs

2015-06-14 Thread davsclaus

Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6fa5657f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6fa5657f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6fa5657f

Branch: refs/heads/master
Commit: 6fa5657fe272c8a705bb037515165bbc713058dd
Parents: c68107d
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 15:54:19 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 15:54:19 2015 +0200

--
 .../atmosphere/websocket/WebsocketEndpoint.java|  2 +-
 .../apache/camel/tools/apt/DocumentationHelper.java|  4 
 .../camel/tools/apt/EndpointAnnotationProcessor.java   | 13 -
 3 files changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6fa5657f/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 77a6306..24d8dcf 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, extendsScheme = websocket, 
title = Atmosphere Websocket,
+@UriEndpoint(scheme = atmosphere-websocket, extendsScheme = servlet, title 
= Atmosphere Websocket,
 syntax = atmosphere-websocket:servicePath, consumerClass = 
WebsocketConsumer.class, label = websocket)
 public class WebsocketEndpoint extends ServletEndpoint {
 

http://git-wip-us.apache.org/repos/asf/camel/blob/6fa5657f/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
index e8e8cf7..f354f38 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
@@ -96,8 +96,12 @@ public final class DocumentationHelper {
 
 if (file.equals(extendsScheme)) {
 return new 
File(../../camel-core/target/classes/org/apache/camel/component/file/file.json);
+} else if (ahc.equals(extendsScheme)) {
+return new 
File(../camel-ahc/target/classes/org/apache/camel/component/ahc/ahc.json);
 } else if (atom.equals(extendsScheme)) {
 return new 
File(../camel-atom/target/classes/org/apache/camel/component/atom/atom.json);
+} else if (jms.equals(extendsScheme)) {
+return new 
File(../camel-jms/target/classes/org/apache/camel/component/jms/jms.json);
 } else if (http.equals(extendsScheme)) {
 return new 
File(../camel-http/target/classes/org/apache/camel/component/http/http.json);
 } else if (https.equals(extendsScheme)) {

http://git-wip-us.apache.org/repos/asf/camel/blob/6fa5657f/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 1531971..968213a5 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -75,6 +75,7 @@ public class EndpointAnnotationProcessor extends 
AbstractAnnotationProcessor {
 final UriEndpoint uriEndpoint = 
classElement.getAnnotation(UriEndpoint.class);
 if (uriEndpoint != null) {
 String scheme = uriEndpoint.scheme();
+String extendsScheme = uriEndpoint.extendsScheme();
 String title = uriEndpoint.title();
 final String label = uriEndpoint.label();
 if (!isNullOrEmpty(scheme)) {
@@ -82,8 +83,10 @@ public class EndpointAnnotationProcessor extends 
AbstractAnnotationProcessor {
 // for example camel-mail has a bunch of component schema 
names that does that
 String[]

[1/2] camel git commit: Component docs

2015-06-14 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 6fa5657fe - 350113734


Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d486ee80
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d486ee80
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d486ee80

Branch: refs/heads/master
Commit: d486ee8051c2e450178b83126ed48a86f0ba5e6a
Parents: 6fa5657
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 15:58:42 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 15:58:42 2015 +0200

--
 .../camel/component/gae/auth/GAuthComponent.java   | 13 +
 1 file changed, 13 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/d486ee80/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java
--
diff --git 
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java
 
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java
index d140b3b..90b6280 100644
--- 
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java
+++ 
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/auth/GAuthComponent.java
@@ -51,6 +51,10 @@ public class GAuthComponent extends UriEndpointComponent {
 return consumerKey;
 }
 
+/**
+ * Domain identifying the web application. This is the domain used when 
registering the application with Google.
+ * Example: camelcloud.appspot.com. For a non-registered application use 
anonymous.
+ */
 public void setConsumerKey(String consumerKey) {
 this.consumerKey = consumerKey;
 }
@@ -59,6 +63,10 @@ public class GAuthComponent extends UriEndpointComponent {
 return consumerSecret;
 }
 
+/**
+ * Consumer secret of the web application. The consumer secret is 
generated when when registering the application with Google.
+ * It is needed if the HMAC-SHA1 signature method shall be used. For a 
non-registered application use anonymous.
+ */
 public void setConsumerSecret(String consumerSecret) {
 this.consumerSecret = consumerSecret;
 }
@@ -67,6 +75,11 @@ public class GAuthComponent extends UriEndpointComponent {
 return keyLoader;
 }
 
+/**
+ * To configure a key loader to use.
+ * Part of camel-gae are two key loaders: GAuthPk8Loader for loading a 
private key from a PKCS#8 file and GAuthJksLoader to load a private key from a 
Java key store.
+ * It is needed if the RSA-SHA1 signature method shall be used. These 
classes are defined in the org.apache.camel.component.gae.auth package.
+ */
 public void setKeyLoader(GAuthKeyLoader keyLoader) {
 this.keyLoader = keyLoader;
 }

svn commit: r954798 - in /websites/production/camel/content: cache/main.pageCache camel-2160-release.html

2015-06-14 Thread buildbot

Author: buildbot
Date: Sun Jun 14 12:19:41 2015
New Revision: 954798

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2160-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2160-release.html
==
--- websites/production/camel/content/camel-2160-release.html (original)
+++ websites/production/camel/content/camel-2160-release.html Sun Jun 14 
12:19:41 2015
@@ -84,7 +84,7 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth1 
id=Camel2.16.0Release-Camel2.16.0release(currentlyinprogress)Camel 
2.16.0#160;release (currently in progress)/h1div 
style=padding-right:20px;float:left;margin-left:-20px;pimg 
class=confluence-embedded-image confluence-external-resource 
src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png; 
data-image-src=http://camel.apache.org/download.data/camel-box-v1.0-150x200.png;/p/divdiv
 style=min-height:200px#160;/divh2 
id=Camel2.16.0Release-NewandNoteworthyNew and Noteworthy/h2pWelcome to 
the 2.16.0 release which approx XXX issues resolved (new features, improvements 
and bug fixes such as...)/ppNoteworthy improvements:/pulliThe route 
models (definition classes) preserve property placeholders, which allows round 
trip editing, and also prevents showing potential sensitive 
information/liliAdded onPrepareFailure option to#160;a shape=rect 
href=dead-letter-channel.htmlDead Letter Ch
 annel/a to allow a custom processor to prepare the Exchange before sending 
to the dead letter queue./lilia shape=rect 
href=mongodb.htmlMongoDB/a tailable consumers now allow setting the 
codereadPreference/code option./liliUsing setFaultBody / setFaultHeader 
behaves similar to setBody / setHeader to preserve existing headers/attachments 
by setting on existing IN or OUT message./liliJava DSL using choice with 
end vs endChoice now validates you use them as intended. Any misconfiguration 
now throws an exception explaining the problem./lilia shape=rect 
href=pojo-producing.htmlPOJO Producing/a and#160;a shape=rect 
href=pojo-consuming.htmlPOJO Consuming/a lifecycle is now in sync with a 
shape=rect href=camelcontext.htmlCamelContext/a#160;which ensures it 
works as similar to Camel#160;a shape=rect href=routes.htmlRoutes/a 
does. Also the created producer/consumer is stopped when#160;a shape=rect 
href=camelcontext.htmlCam
 elContext/a#160;is stopping to cleanup properly./lilia shape=rect 
href=jms.htmlJMS/a#160;component now allows configuring 
concurrentConsumers/maxConcurrentConsumers separately between from(jms) vs 
to(jms) using request/reply over JMS/lilispana shape=rect 
class=external-link 
href=https://issues.apache.org/jira/browse/CAMEL-8506;Added SEARCH/a 
operation to Elasticsearch component/span/lilispanThe#160;a 
shape=rect href=properties.htmlProperties/a component (property 
placeholder) now supports an encoding option to allow reading the .properties 
files using a specific charset such as UTF-8. By default ISO-8859-1 is used 
(latin1)/span/lilispanAdded#160;codereceviveBufferSize/code option 
to the a shape=rect href=ftp.htmlFTP/a#160;component to make download 
faster. The size is by default 32kb buffer./span/lilispanThe#160;a 
shape=rect href=aggregator2.htmlAggregator2/a EIP now allows an external 
source usin
 g a#160;codeAggregateController/code to control the aggregator, such as 
for forcing completing a group or all groups, or query runtime information from 
the aggregator. A default controller is provided out of the box if none has 
been configured./span/lilispanThe#160;a shape=rect 
href=aggregator2.htmlAggregator2/a now enlists in JMX using 
a#160;codeManagedAggregateProcessorMBean/code which has more information, 
and also allows using the aggregate controller to control 
it./span/lilispanThe#160;a shape=rect 
href=aggregator2.htmlAggregator2/a now includes more runtime statistics 
which can be accessed from Java and JMX about number of incoming and completed 
exchanges, and per different completion 
triggers./span/lilispanThe#160;a shape=rect 
href=aggregator2.htmlAggregator2/a now supports pre-completion mode if the 
aggregation strategy 
implements#160;codePreCompletionAwareAggregationStrategy/code. This 
supports the use-case w
 here an incoming Exchange are used to determine if the current aggregated 
group is completed or not. If completed the group is emitted as-is, and the new 
incoming Exchange is used to start a new group from 
scratch./span/lilispanAdded options to#160;a shape=rect 
href=mail.htmlMail/a consumer so it can skip or handle a mail message that 
cannot be read from the mail server in the batch; and then move on to read the

[1/2] camel git commit: Component docs

2015-06-14 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 62428565a - 12e0ce4c0


Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/827bcf5c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/827bcf5c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/827bcf5c

Branch: refs/heads/master
Commit: 827bcf5cfefb2fc116cde018777ac1dc0ff508a8
Parents: 6242856
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 13:12:29 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 15:22:19 2015 +0200

--
 .../main/java/org/apache/camel/tools/apt/DocumentationHelper.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/827bcf5c/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
index 87eaee3..916e0e3 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
@@ -96,6 +96,8 @@ public final class DocumentationHelper {
 
 if (file.equals(extendsScheme)) {
 return new 
File(../../camel-core/target/classes/org/apache/camel/component/file/file.json);
+} else if (atom.equals(extendsScheme)) {
+return new 
File(../camel-atom/target/classes/org/apache/camel/component/atom/atom.json);
 } else if (http.equals(extendsScheme)) {
 return new 
File(../camel-http/target/classes/org/apache/camel/component/http/http.json);
 } else if (https.equals(extendsScheme)) {

[3/5] camel git commit: Component docs

2015-06-14 Thread davsclaus

Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e1e1f9f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e1e1f9f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e1e1f9f

Branch: refs/heads/master
Commit: 1e1e1f9f69269ed4fdaa40a153871c8780bda219
Parents: be75520
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 10:06:38 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 13:08:07 2015 +0200

--
 .../camel/tools/apt/DocumentationHelper.java| 52 +++-
 .../tools/apt/EndpointAnnotationProcessor.java  |  2 +-
 .../camel/tools/apt/JsonSchemaHelper.java   | 89 
 3 files changed, 141 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1e1e1f9f/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
index 93a7ae5..37e190b 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
@@ -17,17 +17,67 @@
 package org.apache.camel.tools.apt;
 
 import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.LineNumberReader;
+import java.util.List;
+import java.util.Map;
+
+import static org.apache.camel.tools.apt.JsonSchemaHelper.parseJsonSchema;
 
 /**
  * Helper to find documentation for inherited options when a component extends 
another.
  */
 public final class DocumentationHelper {
 
-public static String findJavaDoc(String scheme, String fieldName) {
+public static String findJavaDoc(String scheme, String extendsScheme, 
String fieldName) {
+File file = jsonFile(scheme, extendsScheme);
+if (file != null) {
+FileInputStream fis = null;
+try {
+fis = new FileInputStream(file);
+String json = loadText(fis);
+ListMapString, String rows = parseJsonSchema(properties, 
json, true);
+
+for (MapString, String row : rows) {
+String name = row.get(name);
+String description = row.get(description);
+if (fieldName.equals(name)) {
+return description;
+}
+}
+} catch (Exception e) {
+// ignore
+} finally {
+IOHelper.close(fis);
+}
+}
+
+// not found
+return null;
+}
+
+private static File jsonFile(String scheme, String extendsScheme) {
+// TODO: scan components for each component and find component name 
from extendsScheme
+// and then find the package name where the json file is
+
+if (file.equals(extendsScheme)) {
+return new 
File(../../camel-core/target/classes/org/apache/camel/component/file/file.json);
+} else if (http.equals(extendsScheme)) {
+return new 
File(../camel-http/target/classes/org/apache/camel/component/http/http.json);
+} else if (https.equals(extendsScheme)) {
+return new 
File(../camel-http/target/classes/org/apache/camel/component/http/https.json);
+} else if (netty.equals(extendsScheme)) {
+return new 
File(../camel-netty/target/classes/org/apache/camel/component/netty/netty.json);
+} else if (netty4.equals(extendsScheme)) {
+return new 
File(../camel-netty4/target/classes/org/apache/camel/component/netty4/netty4.json);
+} else if (servlet.equals(extendsScheme)) {
+return new 
File(../camel-servlet/target/classes/org/apache/camel/component/servlet/servlet.json);
+}
+// not found
 return null;
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/1e1e1f9f/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
index 6cb7973..7f895ed 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/EndpointAnnotationProcessor.java
@@ -286,7 +286,7 @@ public class EndpointAnnotationProcessor

[3/3] camel git commit: Fixed CS

2015-06-14 Thread acosentino

Fixed CS


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/359bf0e4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/359bf0e4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/359bf0e4

Branch: refs/heads/master
Commit: 359bf0e45a7eef2efdc2d8ad6f275233bef23777
Parents: 2acb2a0
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 13:42:36 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 13:42:36 2015 +0200

--
 .../camel/component/hazelcast/queue/HazelcastQueueProducer.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/359bf0e4/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
index 4575439..c814e3c 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
@@ -115,6 +115,6 @@ public class HazelcastQueueProducer extends 
HazelcastDefaultProducer {
 }
 
 private void remainingCapacity(Exchange exchange) {
-   exchange.getOut().setBody(this.queue.remainingCapacity());
+exchange.getOut().setBody(this.queue.remainingCapacity());
 }
 }
\ No newline at end of file

[2/3] camel git commit: CAMEL-8868 Add remainingCapacity operation to HazelcastComponentHelper mapping

2015-06-14 Thread acosentino

CAMEL-8868 Add remainingCapacity operation to HazelcastComponentHelper mapping


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2acb2a05
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2acb2a05
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2acb2a05

Branch: refs/heads/master
Commit: 2acb2a05fd6ff2d0ee8aca1d09a18d3b67d0b684
Parents: a8f71ae
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 13:33:26 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 13:33:26 2015 +0200

--
 .../apache/camel/component/hazelcast/HazelcastComponentHelper.java  | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2acb2a05/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
index b1b876d..448bc56 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastComponentHelper.java
@@ -116,6 +116,7 @@ public final class HazelcastComponentHelper {
 addMapping(offer, HazelcastConstants.OFFER_OPERATION);
 addMapping(peek, HazelcastConstants.PEEK_OPERATION);
 addMapping(poll, HazelcastConstants.POLL_OPERATION);
+addMapping(remainingCapacity, 
HazelcastConstants.REMAINING_CAPACITY_OPERATION);
 
 // topic
 addMapping(publish, HazelcastConstants.PUBLISH_OPERATION);

[1/5] camel git commit: Component docs

2015-06-14 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 722a588e7 - e20ae861b


Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/be755208
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/be755208
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/be755208

Branch: refs/heads/master
Commit: be7552085c875dc8871ce5f39c61e615163ef185
Parents: 722a588
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 09:46:35 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 13:08:06 2015 +0200

--
 .../camel/component/ahc/ws/WsEndpoint.java  |  3 +-
 .../camel/component/amqp/AMQPEndpoint.java  |  3 +-
 .../atmosphere/websocket/WebsocketEndpoint.java |  3 +-
 .../component/file/remote/FtpEndpoint.java  |  3 +-
 .../component/file/remote/FtpsEndpoint.java |  3 +-
 .../component/file/remote/SftpEndpoint.java |  3 +-
 .../camel/component/gae/http/GHttpEndpoint.java |  3 +-
 .../camel/component/gae/task/GTaskEndpoint.java |  3 +-
 .../component/jetty8/JettyHttpEndpoint8.java|  3 +-
 .../component/jetty9/JettyHttpEndpoint9.java|  3 +-
 .../apache/camel/component/scp/ScpEndpoint.java |  3 +-
 .../component/netty/http/NettyHttpEndpoint.java |  3 +-
 .../netty4/http/NettyHttpEndpoint.java  |  3 +-
 .../apache/camel/component/rss/RssEndpoint.java |  3 +-
 .../component/servlet/ServletEndpoint.java  |  3 +-
 .../camel/tools/apt/DocumentationHelper.java| 63 
 .../tools/apt/EndpointAnnotationProcessor.java  | 16 +
 .../java/org/apache/camel/spi/UriEndpoint.java  | 11 
 18 files changed, 120 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/be755208/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 ec37304..e0d0b88 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,8 @@ 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 
= websocket)
+@UriEndpoint(scheme = ahc-ws,ahc-wss, extendsScheme = ahc,ahc, 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/be755208/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
--
diff --git 
a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
 
b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
index 109a393..ce630f6 100644
--- 
a/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
+++ 
b/components/camel-amqp/src/main/java/org/apache/camel/component/amqp/AMQPEndpoint.java
@@ -20,7 +20,8 @@ import org.apache.camel.component.jms.JmsConsumer;
 import org.apache.camel.component.jms.JmsEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 
-@UriEndpoint(scheme = amqp, title = AMQP, syntax = 
amqp:destinationType:destinationName, consumerClass = JmsConsumer.class, 
label = messaging)
+@UriEndpoint(scheme = amqp, extendsScheme = jms, title = AMQP,
+syntax = amqp:destinationType:destinationName, consumerClass = 
JmsConsumer.class, label = messaging)
 public class AMQPEndpoint extends JmsEndpoint {
 
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/be755208/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 9b5abe8..77a6306 100644
--- 
a/components/camel-atmosphere-websocket/src/main/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpoint.java
+++

[4/5] camel git commit: Component docs

2015-06-14 Thread davsclaus

Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a4e69971
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a4e69971
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a4e69971

Branch: refs/heads/master
Commit: a4e69971dfb8e32f421da5908bdc1cf3528a0043
Parents: 08c850e
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 11:28:11 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 13:08:08 2015 +0200

--
 .../file/remote/SftpConfiguration.java  | 47 ++-
 .../camel/component/http/HttpEndpoint.java  | 29 +---
 .../camel/component/scp/ScpConfiguration.java   | 22 -
 .../component/servlet/ServletComponent.java |  6 +++
 .../component/servlet/ServletEndpoint.java  |  2 +-
 .../camel/tools/apt/DocumentationHelper.java| 48 
 .../tools/apt/EndpointAnnotationProcessor.java  | 24 --
 7 files changed, 153 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a4e69971/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
index f7b21e8..ac24e7c 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpConfiguration.java
@@ -43,7 +43,7 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 @UriParam
 private String privateKeyPassphrase;
 private KeyPair keyPair;
-@UriParam(defaultValue = no)
+@UriParam(defaultValue = no, enums = no,yes)
 private String strictHostKeyChecking = no;
 @UriParam
 private int serverAliveInterval;
@@ -77,6 +77,9 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 return knownHostsFile;
 }
 
+/**
+ * Sets the known_hosts file, so that the SFTP endpoint can do host key 
verification.
+ */
 public void setKnownHostsFile(String knownHostsFile) {
 this.knownHostsFile = knownHostsFile;
 }
@@ -85,6 +88,9 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 return knownHostsUri;
 }
 
+/**
+ * Sets the known_hosts file (loaded from classpath by default), so that 
the SFTP endpoint can do host key verification.
+ */
 public void setKnownHostsUri(String knownHostsUri) {
 this.knownHostsUri = knownHostsUri;
 }
@@ -101,6 +107,9 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 return privateKeyFile;
 }
 
+/**
+ * Set the private key file to that the SFTP endpoint can do private key 
verification.
+ */
 public void setPrivateKeyFile(String privateKeyFile) {
 this.privateKeyFile = privateKeyFile;
 }
@@ -109,6 +118,9 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 return privateKeyUri;
 }
 
+/**
+ * Set the private key file (loaded from classpath by default) to that the 
SFTP endpoint can do private key verification.
+ */
 public void setPrivateKeyUri(String privateKeyUri) {
 this.privateKeyUri = privateKeyUri;
 }
@@ -117,6 +129,9 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 return privateKey;
 }
 
+/**
+ * Set the private key as byte[] to that the SFTP endpoint can do private 
key verification.
+ */
 public void setPrivateKey(byte[] privateKey) {
 this.privateKey = privateKey;
 }
@@ -125,6 +140,9 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 return privateKeyPassphrase;
 }
 
+/**
+ * Set the private key file passphrase to that the SFTP endpoint can do 
private key verification.
+ */
 public void setPrivateKeyPassphrase(String privateKeyFilePassphrase) {
 this.privateKeyPassphrase = privateKeyFilePassphrase;
 }
@@ -151,10 +169,16 @@ public class SftpConfiguration extends 
RemoteFileConfiguration {
 return strictHostKeyChecking;
 }
 
+/**
+ * Sets whether to use strict host key checking.
+ */
 public void setStrictHostKeyChecking(String strictHostKeyChecking) {
 this.strictHostKeyChecking = strictHostKeyChecking;
 }
 
+/**
+ * Allows you to set the serverAliveInterval of the sftp session
+ */
 public void setServerAliveInterval(int serverAliveInterval) {
 this.serverAliveInterval = serverAliveInterval;
 }

[1/3] camel git commit: CAMEL-8868 Camel-Hazelcast: Add remainingCapacity operation to queue

2015-06-14 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master e20ae861b - 359bf0e45


CAMEL-8868 Camel-Hazelcast: Add remainingCapacity operation to queue


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a8f71ae3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a8f71ae3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a8f71ae3

Branch: refs/heads/master
Commit: a8f71ae32366087d6e8e5cdc559eaa9d04cec786
Parents: e20ae86
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 13:30:13 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 13:30:42 2015 +0200

--
 .../camel/component/hazelcast/HazelcastConstants.java|  3 ++-
 .../hazelcast/queue/HazelcastQueueProducer.java  |  8 
 .../component/hazelcast/HazelcastQueueProducerTest.java  | 11 +++
 3 files changed, 21 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/a8f71ae3/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
index fcc7256..11c775e 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/HazelcastConstants.java
@@ -83,9 +83,10 @@ public final class HazelcastConstants {
 public static final int OFFER_OPERATION = 32;
 public static final int PEEK_OPERATION = 33;
 public static final int POLL_OPERATION = 34;
+public static final int REMAINING_CAPACITY_OPERATION = 35;
 
 // topic
-public static final int PUBLISH_OPERATION = 35;
+public static final int PUBLISH_OPERATION = 36;
 
 /*
  * header values

http://git-wip-us.apache.org/repos/asf/camel/blob/a8f71ae3/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
--
diff --git 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
index 46c7488..4575439 100644
--- 
a/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
+++ 
b/components/camel-hazelcast/src/main/java/org/apache/camel/component/hazelcast/queue/HazelcastQueueProducer.java
@@ -69,6 +69,10 @@ public class HazelcastQueueProducer extends 
HazelcastDefaultProducer {
 this.remove(exchange);
 break;
 
+case HazelcastConstants.REMAINING_CAPACITY_OPERATION:
+this.remainingCapacity(exchange);
+break;
+
 default:
 throw new IllegalArgumentException(String.format(The value '%s' 
is not allowed for parameter '%s' on the QUEUE cache., operation, 
HazelcastConstants.OPERATION));
 }
@@ -109,4 +113,8 @@ public class HazelcastQueueProducer extends 
HazelcastDefaultProducer {
 this.queue.remove();
 }
 }
+
+private void remainingCapacity(Exchange exchange) {
+   exchange.getOut().setBody(this.queue.remainingCapacity());
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/a8f71ae3/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
--
diff --git 
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
 
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
index 76e47ef..3807e98 100644
--- 
a/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
+++ 
b/components/camel-hazelcast/src/test/java/org/apache/camel/component/hazelcast/HazelcastQueueProducerTest.java
@@ -114,6 +114,14 @@ public class HazelcastQueueProducerTest extends 
HazelcastCamelTestSupport {
 verify(queue).peek();
 assertEquals(foo, answer);
 }
+
+@Test
+public void remainingCapacity() throws InterruptedException {
+when(queue.remainingCapacity()).thenReturn(10);
+int answer = template.requestBody(direct:remainingCapacity, null, 
Integer.class);
+verify(queue).remainingCapacity();
+assertEquals(10,

[2/2] camel git commit: Component docs

2015-06-14 Thread davsclaus

Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/12e0ce4c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/12e0ce4c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/12e0ce4c

Branch: refs/heads/master
Commit: 12e0ce4c0f79486faa3adc8e93af160a73375bf8
Parents: 827bcf5
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 13:56:57 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 15:22:20 2015 +0200

--
 .../java/org/apache/camel/tools/apt/DocumentationHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/12e0ce4c/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
--
diff --git 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
index 916e0e3..e8e8cf7 100644
--- 
a/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
+++ 
b/tooling/apt/src/main/java/org/apache/camel/tools/apt/DocumentationHelper.java
@@ -91,8 +91,8 @@ public final class DocumentationHelper {
 }
 
 private static File jsonFile(String scheme, String extendsScheme) {
-// TODO: scan components for each component and find component name 
from extendsScheme
-// and then find the package name where the json file is
+// we cannot use classloader to load external resources from other 
JARs during apt plugin,
+// so load these resources using the file system
 
 if (file.equals(extendsScheme)) {
 return new 
File(../../camel-core/target/classes/org/apache/camel/component/file/file.json);

camel git commit: Component docs

2015-06-14 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 350113734 - 63df40219


Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/63df4021
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/63df4021
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/63df4021

Branch: refs/heads/master
Commit: 63df40219884d134f83ea9c65901ce96726c4430
Parents: 3501137
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 16:11:04 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 16:11:04 2015 +0200

--
 .../camel/component/file/remote/SftpEndpoint.java   | 16 
 1 file changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/63df4021/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
--
diff --git 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
index b8f8db3..5547376 100644
--- 
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
+++ 
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpEndpoint.java
@@ -34,7 +34,7 @@ public class SftpEndpoint extends 
RemoteFileEndpointChannelSftp.LsEntry {
 @UriParam
 protected SftpConfiguration configuration;
 @UriParam
-Proxy proxy;
+protected Proxy proxy;
 
 public SftpEndpoint() {
 }
@@ -74,12 +74,20 @@ public class SftpEndpoint extends 
RemoteFileEndpointChannelSftp.LsEntry {
 return operations;
 }
 
-@Override
-public String getScheme() {
-return sftp;
+public Proxy getProxy() {
+return proxy;
 }
 
+/**
+ * To use a custom configured com.jcraft.jsch.Proxy.
+ * This proxy is used to consume/send messages from the target SFTP host.
+ */
 public void setProxy(Proxy proxy) {
 this.proxy = proxy;
 }
+
+@Override
+public String getScheme() {
+return sftp;
+}
 }

[2/2] camel git commit: Component docs

2015-06-14 Thread davsclaus

Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35011373
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35011373
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35011373

Branch: refs/heads/master
Commit: 350113734a8418853d527f78845ba9e67d970ac1
Parents: d486ee8
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 16:08:23 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 16:08:23 2015 +0200

--
 .../camel/component/scp/ScpConfiguration.java   | 56 +---
 .../camel/tools/apt/DocumentationHelper.java|  2 +
 2 files changed, 16 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/35011373/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
--
diff --git 
a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
 
b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
index d4292d0..1cfb5e9 100644
--- 
a/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
+++ 
b/components/camel-jsch/src/main/java/org/apache/camel/component/scp/ScpConfiguration.java
@@ -32,8 +32,6 @@ public class ScpConfiguration extends RemoteFileConfiguration 
{
 public static final String DEFAULT_MOD = 664;
 @UriParam(defaultValue = true)
 private boolean useUserKnownHostsFile = true;
-@UriParam(defaultValue = true)
-private boolean verboseLogging = true;
 @UriParam
 private String knownHostsFile;
 @UriParam
@@ -42,18 +40,12 @@ public class ScpConfiguration extends 
RemoteFileConfiguration {
 private String privateKeyFilePassphrase;
 @UriParam(enums = no,yes, defaultValue = no)
 private String strictHostKeyChecking;
-@UriParam
-private int serverAliveInterval;
-@UriParam(defaultValue = 1)
-private int serverAliveCountMax = 1;
 @UriParam(defaultValue = DEFAULT_MOD)
 private String chmod = DEFAULT_MOD;
 // comma separated list of ciphers. 
 // null means default jsch list will be used
 @UriParam
 private String ciphers;
-@UriParam
-private int compression;
 
 public ScpConfiguration() {
 setProtocol(scp);
@@ -72,6 +64,9 @@ public class ScpConfiguration extends RemoteFileConfiguration 
{
 return knownHostsFile;
 }
 
+/**
+ * Sets the known_hosts file, so that the jsch endpoint can do host key 
verification.
+ */
 public void setKnownHostsFile(String knownHostsFile) {
 this.knownHostsFile = knownHostsFile;
 }
@@ -91,6 +86,9 @@ public class ScpConfiguration extends RemoteFileConfiguration 
{
 return privateKeyFile;
 }
 
+/**
+ * Set the private key file to that the SFTP endpoint can do private key 
verification.
+ */
 public void setPrivateKeyFile(String privateKeyFile) {
 this.privateKeyFile = privateKeyFile;
 }
@@ -99,6 +97,9 @@ public class ScpConfiguration extends RemoteFileConfiguration 
{
 return privateKeyFilePassphrase;
 }
 
+/**
+ * Set the private key file passphrase to that the SFTP endpoint can do 
private key verification.
+ */
 public void setPrivateKeyFilePassphrase(String privateKeyFilePassphrase) {
 this.privateKeyFilePassphrase = privateKeyFilePassphrase;
 }
@@ -114,22 +115,6 @@ public class ScpConfiguration extends 
RemoteFileConfiguration {
 this.strictHostKeyChecking = strictHostKeyChecking;
 }
 
-public void setServerAliveInterval(int serverAliveInterval) {
-this.serverAliveInterval = serverAliveInterval;
-}
-
-public int getServerAliveInterval() {
-return serverAliveInterval;
-}
-
-public void setServerAliveCountMax(int serverAliveCountMax) {
-this.serverAliveCountMax = serverAliveCountMax;
-}
-
-public int getServerAliveCountMax() {
-return serverAliveCountMax;
-}
-
 /**
  * Allows you to set chmod on the stored file. For example chmod=664.
  */
@@ -152,6 +137,11 @@ public class ScpConfiguration extends 
RemoteFileConfiguration {
 return chmod;
 }
 
+/**
+ * Set a comma separated list of ciphers that will be used in order of 
preference.
+ * Possible cipher names are defined by JCraft JSCH. Some examples 
include: 
aes128-ctr,aes128-cbc,3des-ctr,3des-cbc,blowfish-cbc,aes192-cbc,aes256-cbc.
+ * If not specified the default list from JSCH will be used.
+ */
 public void setCiphers(String ciphers) {
 this.ciphers = ciphers;
 }
@@ -160,22 +150,4 @@ public class ScpConfiguration extends 
RemoteFileConfiguration {
 return ciphers;

[1/2] camel git commit: Component docs

2015-06-14 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 12e0ce4c0 - 6fa5657fe


Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c68107d3
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c68107d3
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c68107d3

Branch: refs/heads/master
Commit: c68107d3b1829fcf4d43ce93504cfd30fa320b8c
Parents: 12e0ce4
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 15:41:34 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 15:41:34 2015 +0200

--
 .../camel/component/gae/mail/GMailEndpoint.java | 14 +-
 .../component/gae/task/GTaskComponent.java  | 11 -
 .../camel/component/gae/task/GTaskEndpoint.java | 47 +++-
 .../camel/component/http/HttpEndpoint.java  | 24 +-
 4 files changed, 72 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c68107d3/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
--
diff --git 
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
 
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
index 93e25a8..1562601 100644
--- 
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
+++ 
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/mail/GMailEndpoint.java
@@ -40,7 +40,7 @@ public class GMailEndpoint extends DefaultEndpoint implements 
OutboundBindingSup
 
 private OutboundBindingGMailEndpoint, Message, Void outboundBinding;
 private MailService mailService;
-@UriPath @Metadata(required = true)
+@UriPath(description = The email of the sender) @Metadata(required = 
true)
 private String sender;
 @UriParam
 private String subject;
@@ -77,6 +77,9 @@ public class GMailEndpoint extends DefaultEndpoint implements 
OutboundBindingSup
 return subject;
 }
 
+/**
+ * Subject of the email.
+ */
 public void setSubject(String subject) {
 this.subject = subject;
 }
@@ -85,6 +88,9 @@ public class GMailEndpoint extends DefaultEndpoint implements 
OutboundBindingSup
 return to;
 }
 
+/**
+ * To-receiver of the email. This can be a single receiver or a 
comma-separated list of receivers.
+ */
 public void setTo(String to) {
 this.to = to;
 }
@@ -93,6 +99,9 @@ public class GMailEndpoint extends DefaultEndpoint implements 
OutboundBindingSup
 return cc;
 }
 
+/**
+ * Cc-receiver of the email. This can be a single receiver or a 
comma-separated list of receivers.
+ */
 public void setCc(String cc) {
 this.cc = cc;
 }
@@ -101,6 +110,9 @@ public class GMailEndpoint extends DefaultEndpoint 
implements OutboundBindingSup
 return bcc;
 }
 
+/**
+ * Bcc-receiver of the email. This can be a single receiver or a 
comma-separated list of receivers.
+ */
 public void setBcc(String bcc) {
 this.bcc = bcc;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/c68107d3/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java
--
diff --git 
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java
 
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java
index 8049806..d248d5d 100644
--- 
a/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java
+++ 
b/components/camel-gae/src/main/java/org/apache/camel/component/gae/task/GTaskComponent.java
@@ -44,6 +44,7 @@ import org.apache.commons.httpclient.params.HttpClientParams;
  * for installing a web hook.
  */
 public class GTaskComponent extends ServletComponent {
+
 public GTaskComponent() {
 super(GTaskEndpoint.class);
 }
@@ -51,23 +52,29 @@ public class GTaskComponent extends ServletComponent {
 @Override
 @SuppressWarnings(unchecked)
 protected Endpoint createEndpoint(String uri, String remaining, 
MapString, Object parameters) throws Exception {
-String workerRoot = getAndRemoveParameter(
-parameters, workerRoot, String.class, worker);
+String workerRoot = getAndRemoveParameter(parameters, workerRoot, 
String.class, worker);
+String inboundBindingRef = (String) 
parameters.get(inboundBindingRef);
+String outboundBindingRef = (String) 
parameters.get(outboundBindingRef);
+
 OutboundBindingGTaskEndpoint, TaskOptions, Void outboundBinding = 
resolveAndRemoveReferenceParameter(

[2/3] camel git commit: Upgrade rx

2015-06-14 Thread davsclaus

Upgrade rx


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5522312c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5522312c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5522312c

Branch: refs/heads/master
Commit: 5522312cb38dac2e877fbdee6085755bfa85d85b
Parents: 48c6c4c
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 08:48:56 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 08:59:20 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5522312c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 29030e5..a05a0eb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -410,7 +410,7 @@
 rhino-version1.7R2/rhino-version
 rome-bundle-version1.0_3/rome-bundle-version
 rome-version1.0/rome-version
-rxjava-version1.0.10/rxjava-version
+rxjava-version1.0.12/rxjava-version
 saaj-impl-version1.3.2_2/saaj-impl-version
 saxon-bundle-version9.5.1-5_1/saxon-bundle-version
 saxon-version9.5.1-5/saxon-version

[1/3] camel git commit: CAMEL-8865 Removal of version from url in web based examples

2015-06-14 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/camel-2.15.x e82251b7d - f2fedc76a
  refs/heads/master e47aa24a7 - 5522312cb


CAMEL-8865 Removal of version from url in web based examples


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/48c6c4c8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/48c6c4c8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/48c6c4c8

Branch: refs/heads/master
Commit: 48c6c4c8958a36c26e8417c92834d18776d0e180
Parents: e47aa24
Author: Andrew Block andy.bl...@gmail.com
Authored: Sat Jun 13 23:39:14 2015 -0500
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 08:59:19 2015 +0200

--
 examples/camel-example-servlet-rest-tomcat/pom.xml  |  3 +++
 .../src/main/webapp/home.html   |  3 +--
 .../camel-example-servlet-tomcat-no-spring/README.txt   |  8 
 examples/camel-example-servlet-tomcat-no-spring/pom.xml |  7 ++-
 .../apache/camel/example/servletlistener/HelloBean.java |  4 ++--
 examples/camel-example-servlet-tomcat/README.txt|  8 
 examples/camel-example-servlet-tomcat/pom.xml   | 12 ++--
 .../src/main/resources/camel-config.xml |  2 +-
 examples/camel-example-spark-rest-tomcat/README.txt |  4 ++--
 examples/camel-example-spark-rest-tomcat/pom.xml|  9 +
 examples/camel-example-spring-boot/README.txt   |  2 +-
 examples/camel-example-spring-boot/pom.xml  |  4 
 12 files changed, 47 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/48c6c4c8/examples/camel-example-servlet-rest-tomcat/pom.xml
--
diff --git a/examples/camel-example-servlet-rest-tomcat/pom.xml 
b/examples/camel-example-servlet-rest-tomcat/pom.xml
index a30aa05..09c8f11 100755
--- a/examples/camel-example-servlet-rest-tomcat/pom.xml
+++ b/examples/camel-example-servlet-rest-tomcat/pom.xml
@@ -198,6 +198,9 @@
 version${jetty9-version}/version
 configuration
 
webAppSourceDirectorytarget/classes/webAppSourceDirectory
+   webApp
+   
contextPath/${project.artifactId}/contextPath
+   /webApp
 /configuration
 /plugin
 /plugins

http://git-wip-us.apache.org/repos/asf/camel/blob/48c6c4c8/examples/camel-example-servlet-rest-tomcat/src/main/webapp/home.html
--
diff --git 
a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/home.html 
b/examples/camel-example-servlet-rest-tomcat/src/main/webapp/home.html
index d87a0b8..03cb404 100644
--- a/examples/camel-example-servlet-rest-tomcat/src/main/webapp/home.html
+++ b/examples/camel-example-servlet-rest-tomcat/src/main/webapp/home.html
@@ -79,8 +79,7 @@
 /ul
 
 p/
-To use the swagger ui, follow this link. Replace the URL value with 
this one to access the REST local resources (http://localhost:8080/api-docs or 
(http://localhost:8080/camel-example-servlet-rest-tomcat/api-docs
-when deployed in Apache Tomcat)
+To use the swagger ui, follow this link. Replace the URL value with 
this one to access the REST local resources 
http://localhost:8080/camel-example-servlet-rest-tomcat/api-docs
 ul
 lia href=index.htmlswagger/a - swagger ui page/li
 /ul

http://git-wip-us.apache.org/repos/asf/camel/blob/48c6c4c8/examples/camel-example-servlet-tomcat-no-spring/README.txt
--
diff --git a/examples/camel-example-servlet-tomcat-no-spring/README.txt 
b/examples/camel-example-servlet-tomcat-no-spring/README.txt
index db3afa5..243ab94 100644
--- a/examples/camel-example-servlet-tomcat-no-spring/README.txt
+++ b/examples/camel-example-servlet-tomcat-no-spring/README.txt
@@ -11,11 +11,11 @@ To run the example deploy it in Apache Tomcat by copying 
the .war to the
 deploy folder of Apache Tomcat.
 
 And then hit this url from a webbrowser which has further
-instructions (use correct version number)
-  http://localhost:8080/camel-example-servlet-tomcat-no-spring-{version}
+instructions
+  http://localhost:8080/camel-example-servlet-tomcat-no-spring
 
-The servlet is located at (use correct version number)
-  http://localhost:8080/camel-example-servlet-tomcat-no-spring-{version}/camel
+The servlet is located at
+  http://localhost:8080/camel-example-servlet-tomcat-no-spring/camel
 
 This example is documented at
   http://camel.apache.org/servlet-tomcat-example-no-spring.html

[3/3] camel git commit: Upgrade rx

2015-06-14 Thread davsclaus

Upgrade rx


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f2fedc76
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f2fedc76
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f2fedc76

Branch: refs/heads/camel-2.15.x
Commit: f2fedc76a50b632cacb1c00fb0872a29653a4629
Parents: e82251b
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 08:48:56 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 08:59:46 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f2fedc76/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 2a81d9f..856f64c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -399,7 +399,7 @@
 rhino-version1.7R2/rhino-version
 rome-bundle-version1.0_3/rome-bundle-version
 rome-version1.0/rome-version
-rxjava-version1.0.10/rxjava-version
+rxjava-version1.0.12/rxjava-version
 saaj-impl-version1.3.2_2/saaj-impl-version
 saxon-bundle-version9.5.1-5_1/saxon-bundle-version
 saxon-version9.5.1-5/saxon-version

svn commit: r954779 [3/4] - in /websites/production/camel/content: book-component-appendix.html book-cookbook.html book-in-one-page.html cache/main.pageCache mock.html

2015-06-14 Thread buildbot

Modified: websites/production/camel/content/book-in-one-page.html
==
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Sun Jun 14 07:21:15 
2015
@@ -2166,54 +2166,18 @@ return new ProcessBuilder(jpaTemplate, t
 pSo you could query data from various Camel a shape=rect 
href=components.htmlComponents/a such as a shape=rect 
href=file2.htmlFile/a, a shape=rect href=http.htmlHTTP/a or a 
shape=rect href=jpa.htmlJPA/a, perform multiple patterns such as a 
shape=rect href=splitter.htmlSplitter/a or a shape=rect 
href=message-translator.htmlMessage Translator/a then send the messages to 
some other a shape=rect href=component.htmlComponent/a./p
 
 pTo show how this all fits together, try the a shape=rect 
href=etl-example.htmlETL Example/a /p
-h2 id=BookInOnePage-MockComponentMock Component/h2
-
-a shape=rect href=testing.htmlTesting/a of distributed and 
asynchronous processing is notoriously difficult. The a shape=rect 
href=mock.htmlMock/a, a shape=rect href=test.htmlTest/a and a 
shape=rect href=dataset.htmlDataSet/a endpoints work great with the a 
shape=rect href=testing.htmlCamel Testing Framework/a to simplify your 
unit and integration testing using a shape=rect 
href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a 
and Camel's large range of a shape=rect 
href=components.htmlComponents/a together with the powerful a 
shape=rect href=bean-integration.htmlBean Integration/a.
-
-pThe Mock component provides a powerful declarative testing mechanism, which 
is similar to a shape=rect class=external-link href=http://jmock.org; 
rel=nofollowjMock/a in that it allows declarative expectations to be 
created on any Mock endpoint before a test begins. Then the test is run, which 
typically fires messages to one or more endpoints, and finally the expectations 
can be asserted in a test case to ensure the system  worked as expected. /p
-
-pThis allows you to test various things like:/p
-ulliThe correct number of messages are received on each 
endpoint,/liliThe correct payloads are received, in the right 
order,/liliMessages arrive on an endpoint in order, using some a 
shape=rect href=expression.htmlExpression/a to create an order testing 
function,/liliMessages arrive match some kind of a shape=rect 
href=predicate.htmlPredicate/a such as that specific headers have certain 
values, or that parts of the messages match some predicate, such as by 
evaluating an a shape=rect href=xpath.htmlXPath/a or a shape=rect 
href=xquery.htmlXQuery/a a shape=rect 
href=expression.htmlExpression/a./li/ul
-
-
-pstrongNote/strong that there is also the a shape=rect 
href=test.htmlTest endpoint/a which is a Mock endpoint, but which uses a 
second endpoint to provide the list of expected message bodies and 
automatically sets up the Mock endpoint assertions. In other words, it's a Mock 
endpoint that automatically sets up its assertions from some sample messages in 
a a shape=rect href=file2.htmlFile/a or a shape=rect 
href=jpa.htmldatabase/a, for example./p
-
-div class=aui-message problem shadowed information-macro
+h2 id=BookInOnePage-MockComponentMock Component/h2pa shape=rect 
href=testing.htmlTesting/a of distributed and asynchronous processing is 
notoriously difficult. The a shape=rect href=mock.htmlMock/a, a 
shape=rect href=test.htmlTest/a and a shape=rect 
href=dataset.htmlDataSet/a endpoints work great with the a shape=rect 
href=testing.htmlCamel Testing Framework/a to simplify your unit and 
integration testing using a shape=rect 
href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a 
and Camel's large range of a shape=rect 
href=components.htmlComponents/a together with the powerful a 
shape=rect href=bean-integration.htmlBean Integration/a./ppThe Mock 
component provides a powerful declarative testing mechanism, which is similar 
to a shape=rect class=external-link href=http://www.jmock.org; 
rel=nofollowjMock/aa shape=rect class=external-link 
href=http://jmock.org; rel=nofollow
 /a in that it allows declarative expectations to be created on any Mock 
endpoint before a test begins. Then the test is run, which typically fires 
messages to one or more endpoints, and finally the expectations can be asserted 
in a test case to ensure the system worked as expected./ppThis allows you 
to test various things like:/pulliThe correct number of messages are 
received on each endpoint,/liliThe correct payloads are received, in the 
right order,/liliMessages arrive on an endpoint in order, using some a 
shape=rect href=expression.htmlExpression/a to create an order testing 
function,/liliMessages arrive match some kind of a shape=rect 
href=predicate.htmlPredicate/a such as that specific headers have certain 
values, or that parts of the messages match some predicate, such as by 
evaluating an a shape=rect href=xpath.htmlXPath/a

svn commit: r954779 [1/4] - in /websites/production/camel/content: book-component-appendix.html book-cookbook.html book-in-one-page.html cache/main.pageCache mock.html

2015-06-14 Thread buildbot

Author: buildbot
Date: Sun Jun 14 07:21:15 2015
New Revision: 954779

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/book-component-appendix.html
websites/production/camel/content/book-cookbook.html
websites/production/camel/content/book-in-one-page.html
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/mock.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 Sun Jun 14 
07:21:15 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.rbtoc1433834366467 {padding: 0px;}
-div.rbtoc1433834366467 ul {list-style: disc;margin-left: 0px;}
-div.rbtoc1433834366467 li {margin-left: 0px;padding-left: 0px;}
+div.rbtoc1434266378420 {padding: 0px;}
+div.rbtoc1434266378420 ul {list-style: disc;margin-left: 0px;}
+div.rbtoc1434266378420 li {margin-left: 0px;padding-left: 0px;}
 
-/*]]*//style/pdiv class=toc-macro rbtoc1433834366467
+/*]]*//style/pdiv class=toc-macro rbtoc1434266378420
 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
@@ -7616,54 +7616,18 @@ assertEquals(quot;Bye Worldquot;, resp
 lt;/beangt;
 ]]/script
 /div/divp/ph3 id=BookComponentAppendix-SeeAlso.40See Also/h3
-ullia shape=rect href=configuring-camel.htmlConfiguring 
Camel/a/lilia shape=rect 
href=component.htmlComponent/a/lilia shape=rect 
href=endpoint.htmlEndpoint/a/lilia shape=rect 
href=getting-started.htmlGetting Started/a/li/ulul 
class=alternatelia shape=rect href=mina2.htmlMINA2/a/lilia 
shape=rect href=netty.htmlNetty/a/li/ul h2 
id=BookComponentAppendix-MockComponentMock Component/h2
-
-a shape=rect href=testing.htmlTesting/a of distributed and 
asynchronous processing is notoriously difficult. The a shape=rect 
href=mock.htmlMock/a, a shape=rect href=test.htmlTest/a and a 
shape=rect href=dataset.htmlDataSet/a endpoints work great with the a 
shape=rect href=testing.htmlCamel Testing Framework/a to simplify your 
unit and integration testing using a shape=rect 
href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a 
and Camel's large range of a shape=rect 
href=components.htmlComponents/a together with the powerful a 
shape=rect href=bean-integration.htmlBean Integration/a.
-
-pThe Mock component provides a powerful declarative testing mechanism, which 
is similar to a shape=rect class=external-link href=http://jmock.org; 
rel=nofollowjMock/a in that it allows declarative expectations to be 
created on any Mock endpoint before a test begins. Then the test is run, which 
typically fires messages to one or more endpoints, and finally the expectations 
can be asserted in a test case to ensure the system  worked as expected. /p
-
-pThis allows you to test various things like:/p
-ulliThe correct number of messages are received on each 
endpoint,/liliThe correct payloads are received, in the right 
order,/liliMessages arrive on an endpoint in order, using some a 
shape=rect href=expression.htmlExpression/a to create an order testing 
function,/liliMessages arrive match some kind of a shape=rect 
href=predicate.htmlPredicate/a such as that specific headers have certain 
values, or that parts of the messages match some predicate, such as by 
evaluating an a shape=rect href=xpath.htmlXPath/a or a shape=rect 
href=xquery.htmlXQuery/a a shape=rect 
href=expression.htmlExpression/a./li/ul
-
-
-pstrongNote/strong that there is also the a shape=rect 
href=test.htmlTest endpoint/a which is a Mock endpoint, but which uses a 
second endpoint to provide the list of expected message bodies and 
automatically sets up the Mock endpoint assertions. In other words, it's a Mock 
endpoint that automatically sets up its assertions from some sample messages in 
a a shape=rect href=file2.htmlFile/a or a shape=rect 
href=jpa.htmldatabase/a, for example./p
-
-div class=aui-message problem shadowed information-macro
+ullia shape=rect href=configuring-camel.htmlConfiguring 
Camel/a/lilia shape=rect 
href=component.htmlComponent/a/lilia shape=rect 
href=endpoint.htmlEndpoint/a/lilia shape=rect 
href=getting-started.htmlGetting Started/a/li/ulul 
class=alternatelia shape=rect href=mina2.htmlMINA2/a/lilia 
shape=rect href=netty.htmlNetty/a/li/ul h2 
id=BookComponentAppendix-MockComponentMock

svn commit: r954779 [2/4] - in /websites/production/camel/content: book-component-appendix.html book-cookbook.html book-in-one-page.html cache/main.pageCache mock.html

2015-06-14 Thread buildbot

Modified: websites/production/camel/content/book-cookbook.html
==
--- websites/production/camel/content/book-cookbook.html (original)
+++ websites/production/camel/content/book-cookbook.html Sun Jun 14 07:21:15 
2015
@@ -1099,54 +1099,18 @@ return new ProcessBuilder(jpaTemplate, t
 pSo you could query data from various Camel a shape=rect 
href=components.htmlComponents/a such as a shape=rect 
href=file2.htmlFile/a, a shape=rect href=http.htmlHTTP/a or a 
shape=rect href=jpa.htmlJPA/a, perform multiple patterns such as a 
shape=rect href=splitter.htmlSplitter/a or a shape=rect 
href=message-translator.htmlMessage Translator/a then send the messages to 
some other a shape=rect href=component.htmlComponent/a./p
 
 pTo show how this all fits together, try the a shape=rect 
href=etl-example.htmlETL Example/a /p
-h2 id=Bookcookbook-MockComponentMock Component/h2
-
-a shape=rect href=testing.htmlTesting/a of distributed and 
asynchronous processing is notoriously difficult. The a shape=rect 
href=mock.htmlMock/a, a shape=rect href=test.htmlTest/a and a 
shape=rect href=dataset.htmlDataSet/a endpoints work great with the a 
shape=rect href=testing.htmlCamel Testing Framework/a to simplify your 
unit and integration testing using a shape=rect 
href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a 
and Camel's large range of a shape=rect 
href=components.htmlComponents/a together with the powerful a 
shape=rect href=bean-integration.htmlBean Integration/a.
-
-pThe Mock component provides a powerful declarative testing mechanism, which 
is similar to a shape=rect class=external-link href=http://jmock.org; 
rel=nofollowjMock/a in that it allows declarative expectations to be 
created on any Mock endpoint before a test begins. Then the test is run, which 
typically fires messages to one or more endpoints, and finally the expectations 
can be asserted in a test case to ensure the system  worked as expected. /p
-
-pThis allows you to test various things like:/p
-ulliThe correct number of messages are received on each 
endpoint,/liliThe correct payloads are received, in the right 
order,/liliMessages arrive on an endpoint in order, using some a 
shape=rect href=expression.htmlExpression/a to create an order testing 
function,/liliMessages arrive match some kind of a shape=rect 
href=predicate.htmlPredicate/a such as that specific headers have certain 
values, or that parts of the messages match some predicate, such as by 
evaluating an a shape=rect href=xpath.htmlXPath/a or a shape=rect 
href=xquery.htmlXQuery/a a shape=rect 
href=expression.htmlExpression/a./li/ul
-
-
-pstrongNote/strong that there is also the a shape=rect 
href=test.htmlTest endpoint/a which is a Mock endpoint, but which uses a 
second endpoint to provide the list of expected message bodies and 
automatically sets up the Mock endpoint assertions. In other words, it's a Mock 
endpoint that automatically sets up its assertions from some sample messages in 
a a shape=rect href=file2.htmlFile/a or a shape=rect 
href=jpa.htmldatabase/a, for example./p
-
-div class=aui-message problem shadowed information-macro
+h2 id=Bookcookbook-MockComponentMock Component/h2pa shape=rect 
href=testing.htmlTesting/a of distributed and asynchronous processing is 
notoriously difficult. The a shape=rect href=mock.htmlMock/a, a 
shape=rect href=test.htmlTest/a and a shape=rect 
href=dataset.htmlDataSet/a endpoints work great with the a shape=rect 
href=testing.htmlCamel Testing Framework/a to simplify your unit and 
integration testing using a shape=rect 
href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a 
and Camel's large range of a shape=rect 
href=components.htmlComponents/a together with the powerful a 
shape=rect href=bean-integration.htmlBean Integration/a./ppThe Mock 
component provides a powerful declarative testing mechanism, which is similar 
to a shape=rect class=external-link href=http://www.jmock.org; 
rel=nofollowjMock/aa shape=rect class=external-link 
href=http://jmock.org; rel=nofollow
 /a in that it allows declarative expectations to be created on any Mock 
endpoint before a test begins. Then the test is run, which typically fires 
messages to one or more endpoints, and finally the expectations can be asserted 
in a test case to ensure the system worked as expected./ppThis allows you 
to test various things like:/pulliThe correct number of messages are 
received on each endpoint,/liliThe correct payloads are received, in the 
right order,/liliMessages arrive on an endpoint in order, using some a 
shape=rect href=expression.htmlExpression/a to create an order testing 
function,/liliMessages arrive match some kind of a shape=rect 
href=predicate.htmlPredicate/a such as that specific headers have certain 
values, or that parts of the messages match some predicate, such as by 
evaluating an a shape=rect href=xpath.htmlXPath/a or a

svn commit: r954779 [4/4] - in /websites/production/camel/content: book-component-appendix.html book-cookbook.html book-in-one-page.html cache/main.pageCache mock.html

2015-06-14 Thread buildbot

Modified: websites/production/camel/content/mock.html
==
--- websites/production/camel/content/mock.html (original)
+++ websites/production/camel/content/mock.html Sun Jun 14 07:21:15 2015
@@ -86,54 +86,18 @@
tbody
 tr
 td valign=top width=100%
-div class=wiki-content maincontenth2 id=Mock-MockComponentMock 
Component/h2
-
-a shape=rect href=testing.htmlTesting/a of distributed and 
asynchronous processing is notoriously difficult. The a shape=rect 
href=mock.htmlMock/a, a shape=rect href=test.htmlTest/a and a 
shape=rect href=dataset.htmlDataSet/a endpoints work great with the a 
shape=rect href=testing.htmlCamel Testing Framework/a to simplify your 
unit and integration testing using a shape=rect 
href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a 
and Camel's large range of a shape=rect 
href=components.htmlComponents/a together with the powerful a 
shape=rect href=bean-integration.htmlBean Integration/a.
-
-pThe Mock component provides a powerful declarative testing mechanism, which 
is similar to a shape=rect class=external-link href=http://jmock.org; 
rel=nofollowjMock/a in that it allows declarative expectations to be 
created on any Mock endpoint before a test begins. Then the test is run, which 
typically fires messages to one or more endpoints, and finally the expectations 
can be asserted in a test case to ensure the system  worked as expected. /p
-
-pThis allows you to test various things like:/p
-ulliThe correct number of messages are received on each 
endpoint,/liliThe correct payloads are received, in the right 
order,/liliMessages arrive on an endpoint in order, using some a 
shape=rect href=expression.htmlExpression/a to create an order testing 
function,/liliMessages arrive match some kind of a shape=rect 
href=predicate.htmlPredicate/a such as that specific headers have certain 
values, or that parts of the messages match some predicate, such as by 
evaluating an a shape=rect href=xpath.htmlXPath/a or a shape=rect 
href=xquery.htmlXQuery/a a shape=rect 
href=expression.htmlExpression/a./li/ul
-
-
-pstrongNote/strong that there is also the a shape=rect 
href=test.htmlTest endpoint/a which is a Mock endpoint, but which uses a 
second endpoint to provide the list of expected message bodies and 
automatically sets up the Mock endpoint assertions. In other words, it's a Mock 
endpoint that automatically sets up its assertions from some sample messages in 
a a shape=rect href=file2.htmlFile/a or a shape=rect 
href=jpa.htmldatabase/a, for example./p
-
-div class=aui-message problem shadowed information-macro
+div class=wiki-content maincontenth2 id=Mock-MockComponentMock 
Component/h2pa shape=rect href=testing.htmlTesting/a of distributed 
and asynchronous processing is notoriously difficult. The a shape=rect 
href=mock.htmlMock/a, a shape=rect href=test.htmlTest/a and a 
shape=rect href=dataset.htmlDataSet/a endpoints work great with the a 
shape=rect href=testing.htmlCamel Testing Framework/a to simplify your 
unit and integration testing using a shape=rect 
href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a 
and Camel's large range of a shape=rect 
href=components.htmlComponents/a together with the powerful a 
shape=rect href=bean-integration.htmlBean Integration/a./ppThe Mock 
component provides a powerful declarative testing mechanism, which is similar 
to a shape=rect class=external-link href=http://www.jmock.org; 
rel=nofollowjMock/aa shape=rect class=external-link href=http
 ://jmock.org rel=nofollow/a in that it allows declarative expectations 
to be created on any Mock endpoint before a test begins. Then the test is run, 
which typically fires messages to one or more endpoints, and finally the 
expectations can be asserted in a test case to ensure the system worked as 
expected./ppThis allows you to test various things like:/pulliThe 
correct number of messages are received on each endpoint,/liliThe correct 
payloads are received, in the right order,/liliMessages arrive on an 
endpoint in order, using some a shape=rect 
href=expression.htmlExpression/a to create an order testing 
function,/liliMessages arrive match some kind of a shape=rect 
href=predicate.htmlPredicate/a such as that specific headers have certain 
values, or that parts of the messages match some predicate, such as by 
evaluating an a shape=rect href=xpath.htmlXPath/a or a shape=rect 
href=xquery.htmlXQuery/a a shape=rect href=express
 ion.htmlExpression/a./li/ulpstrongNote/strong that there is also 
the a shape=rect href=test.htmlTest endpoint/a which is a Mock 
endpoint, but which uses a second endpoint to provide the list of expected 
message bodies and automatically sets up the Mock endpoint assertions. In other 
words, it's a Mock endpoint that automatically sets up its assertions from some 
sample messages in a a shape=rect href=file2.htmlFile/a or a 
shape=rect

camel git commit: Upgrade Atmosphere Runtime to version 2.3.2

2015-06-14 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 5522312cb - 3bf0588cc


Upgrade Atmosphere Runtime to version 2.3.2


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3bf0588c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3bf0588c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3bf0588c

Branch: refs/heads/master
Commit: 3bf0588cc05dc84408c7032f6f858e17382a650b
Parents: 5522312
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 00:09:13 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 09:36:58 2015 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3bf0588c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index a05a0eb..fd053b6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -55,7 +55,7 @@
 asm-version3.3.1/asm-version
 aspectj-version1.8.5/aspectj-version
 atmos-client-version2.2.2/atmos-client-version
-atmosphere-version2.2.6/atmosphere-version
+atmosphere-version2.3.2/atmosphere-version
 atmosphere-version-range[2.0,3.0)/atmosphere-version-range
 atomikos-transactions-version3.9.3/atomikos-transactions-version
 avalon-bundle-version4.3.1_1/avalon-bundle-version

camel git commit: Component docs

2015-06-14 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 8739eafec - 3c4b97f03


Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c4b97f0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c4b97f0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c4b97f0

Branch: refs/heads/master
Commit: 3c4b97f03bc907a8045c945d316c4fbb7dfbbd8f
Parents: 8739eaf
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 17:44:17 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 17:44:17 2015 +0200

--
 .../camel/component/cometd/CometdComponent.java | 18 ++
 .../camel/component/cometd/CometdConsumer.java  |  2 +-
 .../camel/component/cometd/CometdEndpoint.java  | 62 
 .../component/cometd/CometdConsumerTest.java|  2 +-
 .../cometd/CometdProducerConsumerTest.java  |  2 +-
 5 files changed, 70 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3c4b97f0/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
--
diff --git 
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
 
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
index fed38ae..50e3b53 100644
--- 
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
+++ 
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdComponent.java
@@ -256,18 +256,30 @@ public class CometdComponent extends UriEndpointComponent 
{
 return sslKeystore;
 }
 
+/**
+ * The password for the keystore when using SSL.
+ */
 public void setSslKeyPassword(String sslKeyPassword) {
 this.sslKeyPassword = sslKeyPassword;
 }
 
+/**
+ * The password when using SSL.
+ */
 public void setSslPassword(String sslPassword) {
 this.sslPassword = sslPassword;
 }
 
+/**
+ * The path to the keystore.
+ */
 public void setSslKeystore(String sslKeystore) {
 this.sslKeystore = sslKeystore;
 }
 
+/**
+ * To use a custom configured SecurityPolicy to control authorization
+ */
 public void setSecurityPolicy(SecurityPolicy securityPolicy) {
 this.securityPolicy = securityPolicy;
 }
@@ -280,6 +292,9 @@ public class CometdComponent extends UriEndpointComponent {
 return extensions;
 }
 
+/**
+ * To use a list of custom BayeuxServer.Extension that allows modifying 
incoming and outgoing requests.
+ */
 public void setExtensions(ListBayeuxServer.Extension extensions) {
 this.extensions = extensions;
 }
@@ -302,6 +317,9 @@ public class CometdComponent extends UriEndpointComponent {
 return sslContextParameters;
 }
 
+/**
+ * To configure security using SSLContextParameters
+ */
 public void setSslContextParameters(SSLContextParameters 
sslContextParameters) {
 this.sslContextParameters = sslContextParameters;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/3c4b97f0/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
--
diff --git 
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
 
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
index 8b8470e..3ddf9f6 100644
--- 
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
+++ 
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdConsumer.java
@@ -85,7 +85,7 @@ public class CometdConsumer extends DefaultConsumer 
implements CometdProducerCon
 }
 
 private CometdBinding createBinding(BayeuxServerImpl bayeux) {
-boolean enableSessionHeaders = endpoint == null ? false : 
endpoint.areSessionHeadersEnabled();
+boolean enableSessionHeaders = endpoint == null ? false : 
endpoint.isSessionHeadersEnabled();
 return new CometdBinding(bayeux, enableSessionHeaders);
 }
 

http://git-wip-us.apache.org/repos/asf/camel/blob/3c4b97f0/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
--
diff --git 
a/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
 
b/components/camel-cometd/src/main/java/org/apache/camel/component/cometd/CometdEndpoint.java
index d553ff0..43d2a35 100644
---

camel git commit: Component docs

2015-06-14 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 1e9700b05 - 8739eafec


Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8739eafe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8739eafe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8739eafe

Branch: refs/heads/master
Commit: 8739eafec2d21a129e33c3e7d8a9040e2118c5d4
Parents: 1e9700b
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 17:03:18 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 17:03:18 2015 +0200

--
 .../netty4/http/NettyHttpComponent.java |  9 +++
 .../netty4/http/NettyHttpConfiguration.java | 68 
 .../netty4/http/NettyHttpEndpoint.java  | 22 +++
 3 files changed, 87 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/8739eafe/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
index 901ff14..bb77cbf 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
@@ -171,6 +171,9 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 return nettyHttpBinding;
 }
 
+/**
+ * To use a custom org.apache.camel.component.netty4.http.NettyHttpBinding 
for binding to/from Netty and Camel Message API.
+ */
 public void setNettyHttpBinding(NettyHttpBinding nettyHttpBinding) {
 this.nettyHttpBinding = nettyHttpBinding;
 }
@@ -179,6 +182,9 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 return headerFilterStrategy;
 }
 
+/**
+ * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter 
headers.
+ */
 public void setHeaderFilterStrategy(HeaderFilterStrategy 
headerFilterStrategy) {
 this.headerFilterStrategy = headerFilterStrategy;
 }
@@ -187,6 +193,9 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 return securityConfiguration;
 }
 
+/**
+ * Refers to a 
org.apache.camel.component.netty4.http.NettyHttpSecurityConfiguration for 
configuring secure web resources.
+ */
 public void setSecurityConfiguration(NettyHttpSecurityConfiguration 
securityConfiguration) {
 this.securityConfiguration = securityConfiguration;
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/8739eafe/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
--
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
index 50a4ffb..468d6f8 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpConfiguration.java
@@ -22,6 +22,7 @@ import java.util.List;
 import io.netty.channel.ChannelHandler;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.netty4.NettyConfiguration;
+import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 import org.apache.camel.spi.UriPath;
@@ -32,7 +33,7 @@ import org.apache.camel.spi.UriPath;
 @UriParams
 public class NettyHttpConfiguration extends NettyConfiguration {
 
-@UriPath
+@UriPath @Metadata(required = true)
 private String path;
 @UriParam
 private boolean urlDecodeHeaders;
@@ -50,12 +51,10 @@ public class NettyHttpConfiguration extends 
NettyConfiguration {
 private boolean bridgeEndpoint;
 @UriParam
 private boolean disableStreamCache;
-@UriParam(defaultValue = true)
+@UriParam(label = consumer, defaultValue = true)
 private boolean send503whenSuspended = true;
 @UriParam(defaultValue =  + 1024 * 1024)
 private int chunkedMaxContentLength = 1024 * 1024;
-@UriParam(defaultValue = true)
-private boolean chunked = true;
 
 public NettyHttpConfiguration() {
 // we need sync=true as http is request/reply by nature
@@ -85,6

[3/4] camel git commit: CAMEL-8869 Resolve Switching httpClient from 4.3.x to 4.4.x break tests

2015-06-14 Thread acosentino

CAMEL-8869 Resolve Switching httpClient from 4.3.x to 4.4.x break tests


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/82526729
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/82526729
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/82526729

Branch: refs/heads/master
Commit: 825267293d5a5a32c41cd95cd540abee76cc514d
Parents: 2da8f19
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 23:05:33 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 23:52:58 2015 +0200

--
 .../component/http4/HttpAuthenticationTest.java |  36 ++---
 .../camel/component/http4/HttpBodyTest.java |  52 +--
 .../component/http4/HttpBridgeEndpointTest.java |  41 --
 .../component/http4/HttpCamelHeadersTest.java   |  47 +--
 .../camel/component/http4/HttpCharsetTest.java  |  43 --
 .../component/http4/HttpCompressionTest.java|  47 +--
 .../component/http4/HttpConcurrentTest.java |  54 ++--
 .../http4/HttpDefaultPortNumberTest.java|  51 +--
 .../camel/component/http4/HttpMethodsTest.java  |  70 +++---
 .../http4/HttpNoConnectionRedeliveryTest.java   |  42 --
 .../component/http4/HttpNoConnectionTest.java   |  44 --
 .../camel/component/http4/HttpPathTest.java |  46 +--
 .../http4/HttpPollingConsumerTest.java  |  43 --
 .../http4/HttpProducerContentTypeTest.java  |  60 +---
 .../http4/HttpProducerSelectMethodTest.java |  54 ++--
 .../HttpProducerTwoHeadersWithSameKeyTest.java  |  83 ---
 ...ttpProducerTwoParametersWithSameKeyTest.java |  63 ++---
 .../component/http4/HttpProxyServerTest.java| 137 ++-
 .../camel/component/http4/HttpQueryTest.java|  50 +--
 .../camel/component/http4/HttpRedirectTest.java |  47 +--
 .../component/http4/HttpSOTimeoutTest.java  |  41 --
 .../http4/HttpThrowExceptionOnFailureTest.java  |  41 --
 .../http4/HttpWithHttpUriHeaderTest.java|  34 -
 .../http4/HttpsAuthenticationTest.java  |  41 +-
 .../camel/component/http4/HttpsGetTest.java |  34 -
 .../http4/HttpsSslContextParametersGetTest.java |  41 +-
 ...woComponentsSslContextParametersGetTest.java |  34 -
 ...TwoDifferentSslContextParametersGetTest.java |  34 -
 28 files changed, 1033 insertions(+), 377 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/82526729/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
index 3a29ef7..4d6e947 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
@@ -44,21 +44,21 @@ import org.junit.Test;
  */
 public class HttpAuthenticationTest extends BaseHttpTest {
 
+private HttpServer localServer;
+
 private String user = camel;
 private String password = password;
-
-protected HttpServer localServer;
-
+   
 @Before
 @Override
 public void setUp() throws Exception {
 localServer = ServerBootstrap.bootstrap().
-   setHttpProcessor(getBasicHttpProcessor()).
-   
setConnectionReuseStrategy(getConnectionReuseStrategy()).
-   setResponseFactory(getHttpResponseFactory()).
-   setExpectationVerifier(getHttpExpectationVerifier()).
-   setSslContext(getSSLContext()).
-   registerHandler(/search, new 
AuthenticationValidationHandler(GET, null, null, getExpectedContent(), user, 
password)).create();
+setHttpProcessor(getBasicHttpProcessor()).
+setConnectionReuseStrategy(getConnectionReuseStrategy()).
+setResponseFactory(getHttpResponseFactory()).
+setExpectationVerifier(getHttpExpectationVerifier()).
+setSslContext(getSSLContext()).
+registerHandler(/search, new 
AuthenticationValidationHandler(GET, null, null, getExpectedContent(), user, 
password)).create();
 localServer.start();
 
 super.setUp();
@@ -76,10 +76,11 @@ public class HttpAuthenticationTest extends BaseHttpTest {
 
 @Test
 public void basicAuthenticationShouldSuccess() throws Exception {
-Exchange exchange = template.request(http4:// + 
localServer.getInetAddress().getHostName() + : + localServer.getLocalPort() +

[2/4] camel git commit: CAMEL-8869 Resolve Switching httpClient from 4.3.x to 4.4.x break tests

2015-06-14 Thread acosentino

http://git-wip-us.apache.org/repos/asf/camel/blob/82526729/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
index 7fc0d2d..edd23e8 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpProxyServerTest.java
@@ -24,6 +24,7 @@ import java.util.Map;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
+import org.apache.camel.component.http4.handler.BasicValidationHandler;
 import org.apache.camel.component.http4.handler.HeaderValidationHandler;
 import 
org.apache.camel.component.http4.handler.ProxyAuthenticationValidationHandler;
 import org.apache.camel.util.URISupport;
@@ -39,8 +40,12 @@ import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.HttpStatus;
 import org.apache.http.ProtocolException;
 import org.apache.http.auth.AUTH;
-import org.apache.http.localserver.LocalTestServer;
+import org.apache.http.impl.bootstrap.HttpServer;
+import org.apache.http.impl.bootstrap.ServerBootstrap;
+import org.apache.http.localserver.RequestBasicAuth;
+import org.apache.http.localserver.ResponseBasicUnauthorized;
 import org.apache.http.protocol.HttpContext;
+import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.ImmutableHttpProcessor;
 import org.apache.http.protocol.ResponseContent;
 import org.junit.After;
@@ -52,37 +57,48 @@ import org.junit.Test;
  * @version 
  */
 public class HttpProxyServerTest extends BaseHttpTest {
-
-private LocalTestServer proxy;
-private String user = camel;
-private String password = password;
-
-@Override
+
+private HttpServer proxy;
+
 @Before
+@Override
 public void setUp() throws Exception {
-super.setUp();
-
-ListHttpRequestInterceptor requestInterceptors = new 
ArrayListHttpRequestInterceptor();
-requestInterceptors.add(new RequestProxyBasicAuth());
-ListHttpResponseInterceptor responseInterceptors = new 
ArrayListHttpResponseInterceptor();
-responseInterceptors.add(new ResponseContent());
-responseInterceptors.add(new ResponseProxyBasicUnauthorized());
-ImmutableHttpProcessor httpproc = new 
ImmutableHttpProcessor(requestInterceptors, responseInterceptors);
-
-proxy = new LocalTestServer(httpproc, null);
+MapString, String expectedHeaders = new HashMapString, String();
+expectedHeaders.put(Proxy-Connection, Keep-Alive);
+proxy = ServerBootstrap.bootstrap().
+setHttpProcessor(getBasicHttpProcessor()).
+setConnectionReuseStrategy(getConnectionReuseStrategy()).
+setResponseFactory(getHttpResponseFactory()).
+setExpectationVerifier(getHttpExpectationVerifier()).
+setSslContext(getSSLContext()).
+registerHandler(*, new HeaderValidationHandler(GET, null, 
null, getExpectedContent(), expectedHeaders)).create();
 proxy.start();
+
+super.setUp();
 }
 
-@Override
 @After
+@Override
 public void tearDown() throws Exception {
+super.tearDown();
+
 if (proxy != null) {
 proxy.stop();
 }
-
-super.tearDown();
 }
 
+@Override
+protected HttpProcessor getBasicHttpProcessor() {
+ListHttpRequestInterceptor requestInterceptors = new 
ArrayListHttpRequestInterceptor();
+requestInterceptors.add(new RequestProxyBasicAuth());
+ListHttpResponseInterceptor responseInterceptors = new 
ArrayListHttpResponseInterceptor();
+responseInterceptors.add(new ResponseContent());
+responseInterceptors.add(new ResponseProxyBasicUnauthorized());
+ImmutableHttpProcessor httpproc = new 
ImmutableHttpProcessor(requestInterceptors, responseInterceptors);
+return httpproc;
+}
+
+
 @Test
 public void testDifferentHttpProxyConfigured() throws Exception {
 HttpEndpoint http1 = 
context.getEndpoint(http4://www.google.com?proxyAuthHost=myproxyproxyAuthPort=1234,
 HttpEndpoint.class);
@@ -99,12 +115,8 @@ public class HttpProxyServerTest extends BaseHttpTest {
 
 @Test
 public void httpGetWithProxyAndWithoutUser() throws Exception {
-MapString, String expectedHeaders = new HashMapString, String();
-expectedHeaders.put(Host, getHostName() + : + getPort());
-expectedHeaders.put(Proxy-Connection, Keep-Alive);
-proxy.register(*, new HeaderValidationHandler(GET, null, null, 
getExpectedContent(), expectedHeaders));
 
-Exchange exchange = template.request(http4:// +

[4/4] camel git commit: Component docs

2015-06-14 Thread acosentino

Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd881496
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd881496
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd881496

Branch: refs/heads/master
Commit: bd881496e4bc80695d4a26c4334c91b51f754554
Parents: 8252672
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 23:53:56 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 23:53:56 2015 +0200

--
 .../org/apache/camel/component/http4/HttpServerTestSupport.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bd881496/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
index 7fc1cc8..4a63e86 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpServerTestSupport.java
@@ -26,8 +26,7 @@ import org.apache.http.protocol.HttpProcessor;
 
 /**
  * Abstract base class for unit testing using a http server.
- * The setUp method starts the server before the camel context is started and
- * the tearDown method stops the server after the camel context is stopped.
+ * This class contains an empty configuration to be used.
  *
  * @version
  */

[1/4] camel git commit: CAMEL-8869 Upgrade httpcore and httpclient to version 4.4.1 and start refactoring tests

2015-06-14 Thread acosentino

Repository: camel
Updated Branches:
  refs/heads/master 3c4b97f03 - bd881496e


CAMEL-8869 Upgrade httpcore and httpclient to version 4.4.1 and start 
refactoring tests


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/2da8f198
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2da8f198
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2da8f198

Branch: refs/heads/master
Commit: 2da8f198b0f4ad303f2a4984403581b26a489ffc
Parents: 3c4b97f
Author: Andrea Cosentino anco...@gmail.com
Authored: Sun Jun 14 15:33:00 2015 +0200
Committer: Andrea Cosentino anco...@gmail.com
Committed: Sun Jun 14 23:51:24 2015 +0200

--
 .../camel/component/http4/BaseHttpTest.java |  1 +
 .../component/http4/HttpAuthenticationTest.java | 45 +++
 .../component/http4/HttpServerTestSupport.java  | 59 
 parent/pom.xml  |  4 +-
 4 files changed, 38 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2da8f198/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java
index 1fd8d1c..ab9840a 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/BaseHttpTest.java
@@ -20,6 +20,7 @@ import java.util.Map;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.http.HttpStatus;
 
 /**

http://git-wip-us.apache.org/repos/asf/camel/blob/2da8f198/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
--
diff --git 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
index 5ca499c..3a29ef7 100644
--- 
a/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
+++ 
b/components/camel-http4/src/test/java/org/apache/camel/component/http4/HttpAuthenticationTest.java
@@ -27,12 +27,15 @@ import 
org.apache.camel.component.http4.handler.AuthenticationValidationHandler;
 import org.apache.http.HttpRequestInterceptor;
 import org.apache.http.HttpResponseInterceptor;
 import org.apache.http.HttpStatus;
-import org.apache.http.localserver.LocalTestServer;
+import org.apache.http.impl.bootstrap.HttpServer;
+import org.apache.http.impl.bootstrap.ServerBootstrap;
 import org.apache.http.localserver.RequestBasicAuth;
 import org.apache.http.localserver.ResponseBasicUnauthorized;
 import org.apache.http.protocol.HttpProcessor;
 import org.apache.http.protocol.ImmutableHttpProcessor;
 import org.apache.http.protocol.ResponseContent;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -43,10 +46,37 @@ public class HttpAuthenticationTest extends BaseHttpTest {
 
 private String user = camel;
 private String password = password;
+
+protected HttpServer localServer;
+
+@Before
+@Override
+public void setUp() throws Exception {
+localServer = ServerBootstrap.bootstrap().
+   setHttpProcessor(getBasicHttpProcessor()).
+   
setConnectionReuseStrategy(getConnectionReuseStrategy()).
+   setResponseFactory(getHttpResponseFactory()).
+   setExpectationVerifier(getHttpExpectationVerifier()).
+   setSslContext(getSSLContext()).
+   registerHandler(/search, new 
AuthenticationValidationHandler(GET, null, null, getExpectedContent(), user, 
password)).create();
+localServer.start();
+
+super.setUp();
+}
+
+@After
+@Override
+public void tearDown() throws Exception {
+super.tearDown();
 
+if (localServer != null) {
+localServer.stop();
+}
+}
+
 @Test
 public void basicAuthenticationShouldSuccess() throws Exception {
-Exchange exchange = template.request(http4:// + getHostName() + : 
+ getPort() + /search?authUsername= + user + authPassword= + password, new 
Processor() {
+Exchange exchange = template.request(http4:// + 
localServer.getInetAddress().getHostName() + : + localServer.getLocalPort() + 
/search?authUsername= + user + authPassword= + password, new Processor() {
 public

camel git commit: Component docs

2015-06-14 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 63df40219 - 1e9700b05


Component docs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e9700b0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e9700b0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e9700b0

Branch: refs/heads/master
Commit: 1e9700b05bcfd5f1bc7cc5ad9e8c76ea03d18ff2
Parents: 63df402
Author: Claus Ibsen davscl...@apache.org
Authored: Sun Jun 14 16:40:24 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Sun Jun 14 16:55:41 2015 +0200

--
 .../component/jetty/JettyHttpComponent.java |   8 +-
 .../component/jetty/JettyHttpEndpoint.java  | 103 +++
 .../netty/http/NettyHttpComponent.java  |   9 ++
 .../netty/http/NettyHttpConfiguration.java  |  68 +---
 .../component/netty/http/NettyHttpEndpoint.java |  22 
 5 files changed, 172 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1e9700b0/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
index c3bc309..d079be2 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpComponent.java
@@ -29,7 +29,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-
 import javax.management.MBeanServer;
 import javax.servlet.Filter;
 import javax.servlet.RequestDispatcher;
@@ -362,7 +361,6 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 connectorRef.servlet.connect(consumer);
 }
 }
-
 
 private void enableJmx(Server server) {
 MBeanContainer containerToRegister = getMbContainer();
@@ -500,7 +498,6 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 return sslKeystore;
 }
 
-
 public ErrorHandler getErrorHandler() {
 return errorHandler;
 }
@@ -542,7 +539,6 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 
 protected Connector createConnector(Server server, JettyHttpEndpoint 
endpoint) {
 
-
 // now we just use the SelectChannelConnector as the default connector
 SslContextFactory sslcf = null;
 
@@ -627,7 +623,7 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
  * Creates a new {@link HttpClient} and configures its proxy/thread pool 
and SSL based on this
  * component settings.
  *
- * @Param endpoint   the instance of JettyHttpEndpoint
+ * @param endpoint   the instance of JettyHttpEndpoint
  * @param minThreads optional minimum number of threads in client thread 
pool
  * @param maxThreads optional maximum number of threads in client thread 
pool
  * @param ssloption SSL parameters
@@ -873,7 +869,6 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 // Implementation methods
 // 
-
 
-
 @Override
 public Consumer createConsumer(CamelContext camelContext, Processor 
processor, String verb, String basePath, String uriTemplate,
String consumes, String produces, 
MapString, Object parameters) throws Exception {
@@ -1014,7 +1009,6 @@ public abstract class JettyHttpComponent extends 
HttpComponent implements RestCo
 }
 }
 }
-
 }
 
 protected Server createServer() {

http://git-wip-us.apache.org/repos/asf/camel/blob/1e9700b0/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
--
diff --git 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
index 4b17416..12d944c 100644
--- 
a/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
+++ 
b/components/camel-jetty-common/src/main/java/org/apache/camel/component/jetty/JettyHttpEndpoint.java
@@ -42,31 +42,49 @@ import org.eclipse.jetty.server.Handler;
  */
 public abstract class JettyHttpEndpoint

camel git commit: Upgrade Jackson to version 2.5.4

[5/5] camel git commit: Component docs

camel git commit: Upgrade Jboss Weld to version 2.2.13.Final

svn commit: r954789 - in /websites/production/camel/content: aws-ec2.html cache/main.pageCache

[2/2] camel git commit: Component docs

[1/2] camel git commit: Component docs

svn commit: r954798 - in /websites/production/camel/content: cache/main.pageCache camel-2160-release.html

[1/2] camel git commit: Component docs

[3/5] camel git commit: Component docs

[3/3] camel git commit: Fixed CS

[2/3] camel git commit: CAMEL-8868 Add remainingCapacity operation to HazelcastComponentHelper mapping

[1/5] camel git commit: Component docs

[4/5] camel git commit: Component docs

[1/3] camel git commit: CAMEL-8868 Camel-Hazelcast: Add remainingCapacity operation to queue

[2/2] camel git commit: Component docs

camel git commit: Component docs

[2/2] camel git commit: Component docs

[1/2] camel git commit: Component docs

[2/3] camel git commit: Upgrade rx

[1/3] camel git commit: CAMEL-8865 Removal of version from url in web based examples

[3/3] camel git commit: Upgrade rx

svn commit: r954779 [3/4] - in /websites/production/camel/content: book-component-appendix.html book-cookbook.html book-in-one-page.html cache/main.pageCache mock.html

svn commit: r954779 [1/4] - in /websites/production/camel/content: book-component-appendix.html book-cookbook.html book-in-one-page.html cache/main.pageCache mock.html

svn commit: r954779 [2/4] - in /websites/production/camel/content: book-component-appendix.html book-cookbook.html book-in-one-page.html cache/main.pageCache mock.html

svn commit: r954779 [4/4] - in /websites/production/camel/content: book-component-appendix.html book-cookbook.html book-in-one-page.html cache/main.pageCache mock.html

camel git commit: Upgrade Atmosphere Runtime to version 2.3.2

camel git commit: Component docs

camel git commit: Component docs

[3/4] camel git commit: CAMEL-8869 Resolve Switching httpClient from 4.3.x to 4.4.x break tests

[2/4] camel git commit: CAMEL-8869 Resolve Switching httpClient from 4.3.x to 4.4.x break tests

[4/4] camel git commit: Component docs

[1/4] camel git commit: CAMEL-8869 Upgrade httpcore and httpclient to version 4.4.1 and start refactoring tests

camel git commit: Component docs

33 matches

Site Navigation

Mail list logo

Footer information