svn commit: r949021 - in /websites/production/camel/content: cache/main.pageCache examples.html spring-boot-example.html
Author: buildbot Date: Fri Apr 24 11:19:52 2015 New Revision: 949021 Log: Production update by buildbot for camel Added: websites/production/camel/content/spring-boot-example.html Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/examples.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/examples.html == --- websites/production/camel/content/examples.html (original) +++ websites/production/camel/content/examples.html Fri Apr 24 11:19:52 2015 @@ -75,46 +75,21 @@ tbody tr td valign=top width=100% -div class=wiki-content maincontenth2 id=Examples-ExamplesExamples/h2 - -pOnce you have read about a shape=rect href=getting-started.htmlGetting Started/a and looked at the a shape=rect href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a, you might want to try out some examples./p - -pBefore starting to work on example you may want to a shape=rect href=what-are-the-dependencies.htmlcheck the requirements for working with Camel/a. Then a shape=rect href=running-examples.htmlRunning Examples/a describes how to get the examples to run/p - -h3 id=Examples-Walk-throughsWalk-throughs/h3 -ulliWalk through the code of a a shape=rect href=walk-through-an-example.htmlbeginner's example/a so you can understand how things fit together using the Java a shape=rect href=dsl.htmlDSL/a to set up some routes in a simple codemain(#8230;)/code method./liliWalk through the a shape=rect href=walk-through-another-example.htmlSpring DSL example/a to look at XML-based routing./liliWalk through the a shape=rect href=console-example.htmlConsole Example/a to practice reading input from the console./li/ul - - -div class=aui-message hint shadowed information-macro +div class=wiki-content maincontenth2 id=Examples-ExamplesExamples/h2pOnce you have read about a shape=rect href=getting-started.htmlGetting Started/a and looked at the a shape=rect href=enterprise-integration-patterns.htmlEnterprise Integration Patterns/a, you might want to try out some examples./ppBefore starting to work on example you may want to a shape=rect href=what-are-the-dependencies.htmlcheck the requirements for working with Camel/a. Then a shape=rect href=running-examples.htmlRunning Examples/a describes how to get the examples to run/ph3 id=Examples-Walk-throughsWalk-throughs/h3ulliWalk through the code of a a shape=rect href=walk-through-an-example.htmlbeginner's example/a so you can understand how things fit together using the Java a shape=rect href=dsl.htmlDSL/a to set up some routes in a simple codemain(#8230;)/code method./liliWalk through the a shape=rect href=walk-through-anot her-example.htmlSpring DSL example/a to look at XML-based routing./liliWalk through the a shape=rect href=console-example.htmlConsole Example/a to practice reading input from the console./li/uldiv class=aui-message hint shadowed information-macro p class=titleNotice/p span class=aui-icon icon-hintIcon/span div class=message-content - -pThe examples listed below are hosted at Apache. We also offer the a shape=rect href=articles.htmlArticles/a page as a collection of 3rd-party Camel material - such as tutorials, blog posts, published articles, videos, podcasts, presentations, and so forth./p - -pIf you have written a Camel-related article, then we are happy to provide a link to it. You can contact the Camel a shape=rect href=team.htmlTeam/a via our a shape=rect href=mailing-lists.htmlMailing Lists/a, or simply post a tweet with the words Apache Camel./p +pThe examples listed below are hosted at Apache. We also offer the a shape=rect href=articles.htmlArticles/a page as a collection of 3rd-party Camel material - such as tutorials, blog posts, published articles, videos, podcasts, presentations, and so forth./ppIf you have written a Camel-related article, then we are happy to provide a link to it. You can contact the Camel a shape=rect href=team.htmlTeam/a via our a shape=rect href=mailing-lists.htmlMailing Lists/a, or simply post a tweet with the words Apache Camel./p /div /div - - -h3 id=Examples-Examples.1Examples/h3 - -ullia shape=rect href=activemq-camel-tomcat.htmlActiveMQ Camel Tomcat/a example shows how to embed Apache ActiveMQ and Camel in a web application running on Apache Tomcat./lilia shape=rect href=aggregate-example.htmlAggregate Example/a shows the overhauled a shape=rect href=aggregator2.htmlAggregator/a EIP with persistent storage, which are part of Camel 2.3./lilia shape=rect href=bam-example.htmlBAM Example/a
svn commit: r949004 - in /websites/production/camel/content: cache/main.pageCache spring-boot.html
Author: buildbot
Date: Fri Apr 24 08:18:52 2015
New Revision: 949004
Log:
Production update by buildbot for camel
Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/spring-boot.html
Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.
Modified: websites/production/camel/content/spring-boot.html
==
--- websites/production/camel/content/spring-boot.html (original)
+++ websites/production/camel/content/spring-boot.html Fri Apr 24 08:18:52 2015
@@ -255,7 +255,7 @@ public class MyFatJarRouter extends FatJ
Â
... // imports
-public class MyFatWarInitializer extends FatWarInitializer {
+public class MyFatJarRouterWarInitializer extends FatWarInitializer {
@Override
[6/6] camel git commit: Component doc
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/654bd8fe
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/654bd8fe
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/654bd8fe
Branch: refs/heads/master
Commit: 654bd8fea0a5103a7b49ea87256eadf004942574
Parents: 9f0ee1c
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 14:13:23 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 14:13:23 2015 +0200
--
.../component/ganglia/GangliaComponent.java | 3 ++
.../component/ganglia/GangliaConfiguration.java | 46
2 files changed, 49 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/654bd8fe/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
--
diff --git
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
index 1ebb9c6..fb2562f 100644
---
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
+++
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaComponent.java
@@ -53,6 +53,9 @@ public class GangliaComponent extends UriEndpointComponent {
return configuration;
}
+/**
+ * To use the shared configuration
+ */
public void setConfiguration(GangliaConfiguration configuration) {
this.configuration = configuration;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/654bd8fe/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
--
diff --git
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
index 39b79f4..6da1412 100644
---
a/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
+++
b/components/camel-ganglia/src/main/java/org/apache/camel/component/ganglia/GangliaConfiguration.java
@@ -120,6 +120,9 @@ public class GangliaConfiguration implements Cloneable {
return host;
}
+/**
+ * Host name for Ganglia server
+ */
public void setHost(String host) {
this.host = host;
}
@@ -128,6 +131,9 @@ public class GangliaConfiguration implements Cloneable {
return port;
}
+/**
+ * Port for Ganglia server
+ */
public void setPort(int port) {
this.port = port;
}
@@ -136,6 +142,9 @@ public class GangliaConfiguration implements Cloneable {
return mode;
}
+/**
+ * Send the UDP metric packets using MULTICAST or UNICAST
+ */
public void setMode(GMetric.UDPAddressingMode mode) {
this.mode = mode;
}
@@ -144,6 +153,9 @@ public class GangliaConfiguration implements Cloneable {
return ttl;
}
+/**
+ * If using multicast, set the TTL of the packets
+ */
public void setTtl(int ttl) {
this.ttl = ttl;
}
@@ -152,6 +164,9 @@ public class GangliaConfiguration implements Cloneable {
return wireFormat31x;
}
+/**
+ * Use the wire format of Ganglia 3.1.0 and later versions. Set this to
false to use Ganglia 3.0.x or earlier.
+ */
public void setWireFormat31x(boolean wireFormat31x) {
this.wireFormat31x = wireFormat31x;
}
@@ -160,6 +175,9 @@ public class GangliaConfiguration implements Cloneable {
return spoofHostname;
}
+/**
+ * Spoofing information IP:hostname
+ */
public void setSpoofHostname(String spoofHostname) {
this.spoofHostname = spoofHostname;
}
@@ -168,6 +186,9 @@ public class GangliaConfiguration implements Cloneable {
return groupName;
}
+/**
+ * The group that the metric belongs to.
+ */
public void setGroupName(String groupName) {
this.groupName = groupName;
}
@@ -176,6 +197,9 @@ public class GangliaConfiguration implements Cloneable {
return prefix;
}
+/**
+ * Prefix the metric name with this string and an underscore.
+ */
public void setPrefix(String prefix) {
this.prefix = prefix;
}
@@ -184,6 +208,9 @@ public class GangliaConfiguration implements Cloneable {
return metricName;
}
+/**
+ * The name to use for the metric.
+ */
public void setMetricName(String metricName) {
this.metricName = metricName;
}
@@ -192,6 +219,9 @@
[4/6] camel git commit: Component doc
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9d9f2b3c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9d9f2b3c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9d9f2b3c
Branch: refs/heads/master
Commit: 9d9f2b3c47c4b138d6d3fc7b210ddd9c788a4c91
Parents: 429b354
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 14:00:00 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 14:00:00 2015 +0200
--
.../component/jgroups/CamelJGroupsReceiver.java | 2 +-
.../component/jgroups/JGroupsComponent.java | 18 +--
.../component/jgroups/JGroupsEndpoint.java | 54
3 files changed, 34 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9d9f2b3c/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
--
diff --git
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
index 1fbbe7a..7233a8a 100644
---
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
+++
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/CamelJGroupsReceiver.java
@@ -49,7 +49,7 @@ public class CamelJGroupsReceiver extends ReceiverAdapter {
@Override
public void viewAccepted(View view) {
-if (endpoint.isResolvedEnableViewMessages()) {
+if (endpoint.isEnableViewMessages()) {
Exchange exchange = endpoint.createExchange(view);
try {
LOG.debug(Processing view: {}, view);
http://git-wip-us.apache.org/repos/asf/camel/blob/9d9f2b3c/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
--
diff --git
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
index b7c906e..9096094 100644
---
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
+++
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsComponent.java
@@ -28,10 +28,8 @@ import org.jgroups.Channel;
public class JGroupsComponent extends UriEndpointComponent {
private Channel channel;
-
private String channelProperties;
-
-private Boolean enableViewMessages;
+private boolean enableViewMessages;
public JGroupsComponent() {
super(JGroupsEndpoint.class);
@@ -46,6 +44,9 @@ public class JGroupsComponent extends UriEndpointComponent {
return channel;
}
+/**
+ * Channel to use
+ */
public void setChannel(Channel channel) {
this.channel = channel;
}
@@ -54,15 +55,22 @@ public class JGroupsComponent extends UriEndpointComponent {
return channelProperties;
}
+/**
+ * Specifies configuration properties of the JChannel used by the endpoint.
+ */
public void setChannelProperties(String channelProperties) {
this.channelProperties = channelProperties;
}
-public Boolean getEnableViewMessages() {
+public boolean isEnableViewMessages() {
return enableViewMessages;
}
-public void setEnableViewMessages(Boolean enableViewMessages) {
+/**
+ * If set to true, the consumer endpoint will receive org.jgroups.View
messages as well (not only org.jgroups.Message instances).
+ * By default only regular messages are consumed by the endpoint.
+ */
+public void setEnableViewMessages(boolean enableViewMessages) {
this.enableViewMessages = enableViewMessages;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/9d9f2b3c/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
--
diff --git
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
index d92d09a..ea32da8 100644
---
a/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
+++
b/components/camel-jgroups/src/main/java/org/apache/camel/component/jgroups/JGroupsEndpoint.java
@@ -39,33 +39,25 @@ import org.slf4j.LoggerFactory;
public class JGroupsEndpoint extends DefaultEndpoint {
public static final String
[1/6] camel git commit: Component doc
Repository: camel
Updated Branches:
refs/heads/master c86c2f11f - 654bd8fea
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4f283d1d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4f283d1d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4f283d1d
Branch: refs/heads/master
Commit: 4f283d1d1abdcdd9e1da4baf61e028c2248cb537
Parents: c86c2f1
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 13:29:53 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 13:29:53 2015 +0200
--
.../apache/camel/component/stomp/StompComponent.java| 12
.../camel/component/stomp/StompConfiguration.java | 12 +++-
.../org/apache/camel/component/stomp/StompEndpoint.java | 2 +-
3 files changed, 24 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/4f283d1d/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
--
diff --git
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
index f8468e4..03459b3 100644
---
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
+++
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompComponent.java
@@ -48,18 +48,30 @@ public class StompComponent extends UriEndpointComponent {
return configuration;
}
+/**
+ * To use the shared stomp configuration
+ */
public void setConfiguration(StompConfiguration configuration) {
this.configuration = configuration;
}
+/**
+ * The URI of the Stomp broker to connect to
+ */
public void setBrokerURL(String brokerURL) {
getConfiguration().setBrokerURL(brokerURL);
}
+/**
+ * The username
+ */
public void setLogin(String login) {
getConfiguration().setLogin(login);
}
+/**
+ * The password
+ */
public void setPasscode(String passcode) {
getConfiguration().setPasscode(passcode);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4f283d1d/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
--
diff --git
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
index 00b7fc8..72c1224 100644
---
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
+++
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompConfiguration.java
@@ -17,13 +17,14 @@
package org.apache.camel.component.stomp;
import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.spi.Metadata;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriParams;
@UriParams
public class StompConfiguration implements Cloneable {
-@UriParam(defaultValue = tcp://localhost:61613)
+@UriParam(defaultValue = tcp://localhost:61613) @Metadata(required =
true)
private String brokerURL = tcp://localhost:61613;
@UriParam
private String login;
@@ -46,6 +47,9 @@ public class StompConfiguration implements Cloneable {
return brokerURL;
}
+/**
+ * The URI of the Stomp broker to connect to
+ */
public void setBrokerURL(String brokerURL) {
this.brokerURL = brokerURL;
}
@@ -54,6 +58,9 @@ public class StompConfiguration implements Cloneable {
return login;
}
+/**
+ * The username
+ */
public void setLogin(String login) {
this.login = login;
}
@@ -62,6 +69,9 @@ public class StompConfiguration implements Cloneable {
return passcode;
}
+/**
+ * The password
+ */
public void setPasscode(String passcode) {
this.passcode = passcode;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/4f283d1d/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
--
diff --git
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
b/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
index 17600e4..2682ae3 100644
---
a/components/camel-stomp/src/main/java/org/apache/camel/component/stomp/StompEndpoint.java
+++
camel git commit: Component doc
Repository: camel
Updated Branches:
refs/heads/master 654bd8fea - c57a42a56
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c57a42a5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c57a42a5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c57a42a5
Branch: refs/heads/master
Commit: c57a42a5622596000b32161b1ff3718548e42e64
Parents: 654bd8f
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 14:39:08 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 14:39:08 2015 +0200
--
.../component/beanstalk/BeanstalkCommand.java | 2 -
.../component/beanstalk/BeanstalkEndpoint.java | 11 ++-
.../camel/component/dns/DnsComponent.java | 2 +
.../apache/camel/component/dns/DnsEndpoint.java | 3 +
.../component/dozer/DozerConfiguration.java | 24 ++
.../camel/component/exec/ExecEndpoint.java | 79
6 files changed, 50 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c57a42a5/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
--
diff --git
a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
index 76859e0..fac52ea 100644
---
a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
+++
b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkCommand.java
@@ -20,6 +20,4 @@ public enum BeanstalkCommand {
bury, release, put, touch, delete, kick
-
-
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c57a42a5/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
--
diff --git
a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
index 590c2b8..be7bfbe 100644
---
a/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
+++
b/components/camel-beanstalk/src/main/java/org/apache/camel/component/beanstalk/BeanstalkEndpoint.java
@@ -47,11 +47,11 @@ public class BeanstalkEndpoint extends
ScheduledPollEndpoint {
private int jobDelay = BeanstalkComponent.DEFAULT_DELAY;
@UriParam(defaultValue = + BeanstalkComponent.DEFAULT_TIME_TO_RUN)
private int jobTimeToRun = BeanstalkComponent.DEFAULT_TIME_TO_RUN;
-@UriParam
+@UriParam(label = consumer)
private BeanstalkCommand onFailure = BeanstalkCommand.bury;
-@UriParam(defaultValue = true)
+@UriParam(label = consumer, defaultValue = true)
private boolean useBlockIO = true;
-@UriParam(defaultValue = true)
+@UriParam(label = consumer, defaultValue = true)
private boolean awaitJob = true;
public BeanstalkEndpoint(final String uri, final Component component,
final ConnectionSettings conn, final String connectionSettings) {
@@ -76,6 +76,11 @@ public class BeanstalkEndpoint extends ScheduledPollEndpoint
{
return command;
}
+/**
+ * put means to put the job into Beanstalk. Job body is specified in the
Camel message body. Job ID will be returned in beanstalk.jobId message header.
+ * delete, release, touch or bury expect Job ID in the message header
beanstalk.jobId. Result of the operation is returned in beanstalk.result
message header
+ * kick expects the number of jobs to kick in the message body and returns
the number of jobs actually kicked out in the message header beanstalk.result.
+ */
public void setCommand(BeanstalkCommand command) {
this.command = command;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/c57a42a5/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
--
diff --git
a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
index 13a6fd8..fc69f62 100644
---
a/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
+++
b/components/camel-dns/src/main/java/org/apache/camel/component/dns/DnsComponent.java
@@ -22,6 +22,8 @@ import org.apache.camel.Endpoint;
import org.apache.camel.impl.UriEndpointComponent;
/**
+ * This is a component for Camel to run DNS queries, using DNSJava.
+ * p/
* The
[3/6] camel git commit: Component doc
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/429b3542
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/429b3542
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/429b3542
Branch: refs/heads/master
Commit: 429b354220b83721be260af54b7ec0c5d22d2184
Parents: 525b56b
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 13:50:23 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 13:50:23 2015 +0200
--
.../camel/component/xquery/XQueryComponent.java | 3 ++
.../camel/component/xquery/XQueryEndpoint.java | 36
2 files changed, 39 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/429b3542/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
--
diff --git
a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
index 2047c4d..0f3be86 100644
---
a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
+++
b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryComponent.java
@@ -54,6 +54,9 @@ public class XQueryComponent extends UriEndpointComponent {
return moduleURIResolver;
}
+/**
+ * To use the custom {@link ModuleURIResolver}
+ */
public void setModuleURIResolver(ModuleURIResolver moduleURIResolver) {
this.moduleURIResolver = moduleURIResolver;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/429b3542/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
--
diff --git
a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
index 1a23db9..d38c89c 100644
---
a/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
+++
b/components/camel-saxon/src/main/java/org/apache/camel/component/xquery/XQueryEndpoint.java
@@ -75,6 +75,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
return resourceUri;
}
+/**
+ * The name of the template to load from classpath or file system
+ */
public void setResourceUri(String resourceUri) {
this.resourceUri = resourceUri;
}
@@ -83,6 +86,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
return configuration;
}
+/**
+ * To use a custom Saxon configuration
+ */
public void setConfiguration(Configuration configuration) {
this.configuration = configuration;
}
@@ -91,6 +97,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
return staticQueryContext;
}
+/**
+ * To use a custom Saxon StaticQueryContext
+ */
public void setStaticQueryContext(StaticQueryContext staticQueryContext) {
this.staticQueryContext = staticQueryContext;
}
@@ -99,6 +108,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
return parameters;
}
+/**
+ * Additional parameters
+ */
public void setParameters(MapString, Object parameters) {
this.parameters = parameters;
}
@@ -107,6 +119,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
return namespacePrefixes;
}
+/**
+ * Allows to control which namespace prefixes to use for a set of
namespace mappings
+ */
public void setNamespacePrefixes(MapString, String namespacePrefixes) {
this.namespacePrefixes = namespacePrefixes;
}
@@ -115,6 +130,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
return resultsFormat;
}
+/**
+ * What output result to use
+ */
public void setResultsFormat(ResultFormat resultsFormat) {
this.resultsFormat = resultsFormat;
}
@@ -123,6 +141,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
return properties;
}
+/**
+ * Properties to configure the serialization parameters
+ */
public void setProperties(Properties properties) {
this.properties = properties;
}
@@ -131,6 +152,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
return resultType;
}
+/**
+ * What output result to use defined as a class
+ */
public void setResultType(Class? resultType) {
this.resultType = resultType;
}
@@ -139,6 +163,9 @@ public class XQueryEndpoint extends ProcessorEndpoint {
return
[2/6] camel git commit: Component doc
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/525b56b7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/525b56b7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/525b56b7
Branch: refs/heads/master
Commit: 525b56b7321004d99d18e25bce0a70da38921079
Parents: 4f283d1
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 13:38:49 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 13:38:49 2015 +0200
--
.../camel/component/ssh/SshComponent.java | 63
.../camel/component/ssh/SshConfiguration.java | 3 +-
2 files changed, 65 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/525b56b7/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
--
diff --git
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
index 5635ff2..3f45770 100644
---
a/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
+++
b/components/camel-ssh/src/main/java/org/apache/camel/component/ssh/SshComponent.java
@@ -55,6 +55,9 @@ public class SshComponent extends UriEndpointComponent {
return configuration;
}
+/**
+ * To use the shared SSH configuration
+ */
public void setConfiguration(SshConfiguration configuration) {
this.configuration = configuration;
}
@@ -63,6 +66,11 @@ public class SshComponent extends UriEndpointComponent {
return getConfiguration().getHost();
}
+/**
+ * Sets the hostname of the remote SSH server.
+ *
+ * @param host String representing hostname of SSH server.
+ */
public void setHost(String host) {
getConfiguration().setHost(host);
}
@@ -71,6 +79,11 @@ public class SshComponent extends UriEndpointComponent {
return getConfiguration().getPort();
}
+/**
+ * Sets the port number for the remote SSH server.
+ *
+ * @param port int representing port number on remote host. Defaults to 22.
+ */
public void setPort(int port) {
getConfiguration().setPort(port);
}
@@ -79,6 +92,11 @@ public class SshComponent extends UriEndpointComponent {
return getConfiguration().getUsername();
}
+/**
+ * Sets the username to use in logging into the remote SSH server.
+ *
+ * @param username String representing login username.
+ */
public void setUsername(String username) {
getConfiguration().setUsername(username);
}
@@ -87,6 +105,12 @@ public class SshComponent extends UriEndpointComponent {
return getConfiguration().getPassword();
}
+/**
+ * Sets the password to use in connecting to remote SSH server.
+ * Requires keyPairProvider to be set to null.
+ *
+ * @param password String representing password for username at remote
host.
+ */
public void setPassword(String password) {
getConfiguration().setPassword(password);
}
@@ -95,6 +119,13 @@ public class SshComponent extends UriEndpointComponent {
return getConfiguration().getPollCommand();
}
+/**
+ * Sets the command string to send to the remote SSH server during every
poll cycle.
+ * Only works with camel-ssh component being used as a consumer, i.e.
from(ssh://...).
+ * You may need to end your command with a newline, and that must be URL
encoded %0A
+ *
+ * @param pollCommand String representing the command to send.
+ */
public void setPollCommand(String pollCommand) {
getConfiguration().setPollCommand(pollCommand);
}
@@ -103,6 +134,14 @@ public class SshComponent extends UriEndpointComponent {
return getConfiguration().getKeyPairProvider();
}
+/**
+ * Sets the KeyPairProvider reference to use when connecting using
Certificates to the remote SSH Server.
+ *
+ * @param keyPairProvider KeyPairProvider reference to use in
authenticating. If set to 'null',
+ *then will attempt to connect using
username/password settings.
+ *
+ * @see KeyPairProvider
+ */
public void setKeyPairProvider(KeyPairProvider keyPairProvider) {
getConfiguration().setKeyPairProvider(keyPairProvider);
}
@@ -111,6 +150,14 @@ public class SshComponent extends UriEndpointComponent {
return getConfiguration().getKeyType();
}
+/**
+ * Sets the key type to pass to the KeyPairProvider as part of
authentication.
+ * KeyPairProvider.loadKey(...) will be passed this value. Defaults to
ssh-rsa.
+ *
+
[1/2] camel git commit: Component doc
Repository: camel
Updated Branches:
refs/heads/master c57a42a56 - 774860517
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e66df5f2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e66df5f2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e66df5f2
Branch: refs/heads/master
Commit: e66df5f26cf315bbc9efd8c35fa45905b3b827f5
Parents: c57a42a
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 15:06:40 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 15:06:40 2015 +0200
--
.../component/dropbox/DropboxConfiguration.java | 33 ++--
.../apache/camel/component/rmi/RmiEndpoint.java | 12 +--
.../component/weather/WeatherConfiguration.java | 26 +++
3 files changed, 66 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/e66df5f2/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
--
diff --git
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
index 2c9c842..4c3a2a5 100755
---
a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
+++
b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/DropboxConfiguration.java
@@ -35,7 +35,7 @@ public class DropboxConfiguration {
@UriPath @Metadata(required = true)
private DropboxOperation operation;
//dropbox auth options
-@UriParam
+@UriParam @Metadata(required = true)
private String accessToken;
//local path to put files
@UriParam
@@ -53,12 +53,15 @@ public class DropboxConfiguration {
@UriParam
private DropboxUploadMode uploadMode;
//id of the app
-@UriParam
+@UriParam @Metadata(required = true)
private String clientIdentifier;
//reference to dropboxclient
@UriParam
private DbxClient client;
+/**
+ * To use an existing DbxClient instance as DropBox client.
+ */
public void setClient(DbxClient client) {
this.client = client;
}
@@ -80,6 +83,9 @@ public class DropboxConfiguration {
return accessToken;
}
+/**
+ * The access token to make API requests for a specific Dropbox user
+ */
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}
@@ -88,6 +94,9 @@ public class DropboxConfiguration {
return localPath;
}
+/**
+ * Folder or file to upload on Dropbox from the local filesystem.
+ */
public void setLocalPath(String localPath) {
this.localPath = localPath;
}
@@ -96,6 +105,9 @@ public class DropboxConfiguration {
return remotePath;
}
+/**
+ * Original file or folder to move
+ */
public void setRemotePath(String remotePath) {
this.remotePath = remotePath;
}
@@ -104,6 +116,9 @@ public class DropboxConfiguration {
return newRemotePath;
}
+/**
+ * Destination file or folder
+ */
public void setNewRemotePath(String newRemotePath) {
this.newRemotePath = newRemotePath;
}
@@ -112,6 +127,9 @@ public class DropboxConfiguration {
return query;
}
+/**
+ * A space-separated list of substrings to search for. A file matches only
if it contains all the substrings. If this option is not set, all files will be
matched.
+ */
public void setQuery(String query) {
this.query = query;
}
@@ -120,6 +138,9 @@ public class DropboxConfiguration {
return clientIdentifier;
}
+/**
+ * Name of the app registered to make API requests
+ */
public void setClientIdentifier(String clientIdentifier) {
this.clientIdentifier = clientIdentifier;
}
@@ -128,6 +149,9 @@ public class DropboxConfiguration {
return operation;
}
+/**
+ * The specific action (typically is a CRUD action) to perform on Dropbox
remote folder.
+ */
public void setOperation(DropboxOperation operation) {
this.operation = operation;
}
@@ -136,6 +160,11 @@ public class DropboxConfiguration {
return uploadMode;
}
+/**
+ * Which mode to upload.
+ * in case of add the new file will be renamed if a file with the same
name already exists on dropbox.
+ * in case of force if a file with the same name already exists on
dropbox, this will be overwritten.
+ */
public void setUploadMode(DropboxUploadMode uploadMode) {
this.uploadMode = uploadMode;
}
[2/2] camel git commit: Component doc
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/77486051
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/77486051
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/77486051
Branch: refs/heads/master
Commit: 774860517bf4c51a98b38fa33b6bef0b5aaffefe
Parents: e66df5f
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 15:14:38 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 15:14:38 2015 +0200
--
.../camel/component/paho/PahoEndpoint.java | 21
.../stringtemplate/StringTemplateEndpoint.java | 10 --
2 files changed, 29 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/77486051/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
--
diff --git
a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
index 7f24703..5ca943a 100644
---
a/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
+++
b/components/camel-paho/src/main/java/org/apache/camel/component/paho/PahoEndpoint.java
@@ -143,6 +143,9 @@ public class PahoEndpoint extends DefaultEndpoint {
return clientId;
}
+/**
+ * MQTT client identifier.
+ */
public void setClientId(String clientId) {
this.clientId = clientId;
}
@@ -151,6 +154,9 @@ public class PahoEndpoint extends DefaultEndpoint {
return brokerUrl;
}
+/**
+ * The URL of the MQTT broker.
+ */
public void setBrokerUrl(String brokerUrl) {
this.brokerUrl = brokerUrl;
}
@@ -159,6 +165,9 @@ public class PahoEndpoint extends DefaultEndpoint {
return topic;
}
+/**
+ * Name of the topic
+ */
public void setTopic(String topic) {
this.topic = topic;
}
@@ -167,6 +176,9 @@ public class PahoEndpoint extends DefaultEndpoint {
return qos;
}
+/**
+ * Client quality of service level (0-2).
+ */
public void setQos(int qos) {
this.qos = qos;
}
@@ -177,6 +189,9 @@ public class PahoEndpoint extends DefaultEndpoint {
return persistence;
}
+/**
+ * Client persistence to be used - memory or file.
+ */
public void setPersistence(PahoPersistence persistence) {
this.persistence = persistence;
}
@@ -185,6 +200,9 @@ public class PahoEndpoint extends DefaultEndpoint {
return client;
}
+/**
+ * To use the existing MqttClient instance as client.
+ */
public void setClient(MqttClient client) {
this.client = client;
}
@@ -193,6 +211,9 @@ public class PahoEndpoint extends DefaultEndpoint {
return connectOptions;
}
+/**
+ * Client connection options
+ */
public void setConnectOptions(MqttConnectOptions connOpts) {
this.connectOptions = connOpts;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/77486051/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
--
diff --git
a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
index 96037be..ca2978a 100644
---
a/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
+++
b/components/camel-stringtemplate/src/main/java/org/apache/camel/component/stringtemplate/StringTemplateEndpoint.java
@@ -37,9 +37,9 @@ import org.stringtemplate.v4.STGroup;
@UriEndpoint(scheme = stringtemplate, title = String Template, syntax =
stringtemplate:resourceUri, producerOnly = true, label = transformation)
public class StringTemplateEndpoint extends ResourceEndpoint {
-@UriParam
+@UriParam(defaultValue = )
private char delimiterStart = STGroup.defaultGroup.delimiterStartChar;
-@UriParam
+@UriParam(defaultValue = )
private char delimiterStop = STGroup.defaultGroup.delimiterStopChar;
public StringTemplateEndpoint() {
@@ -63,6 +63,9 @@ public class StringTemplateEndpoint extends ResourceEndpoint {
return delimiterStart;
}
+/**
+ * The variable start delimiter
+ */
public void setDelimiterStart(char delimiterStart) {
this.delimiterStart = delimiterStart;
}
@@ -71,6 +74,9 @@ public class StringTemplateEndpoint extends ResourceEndpoint {
camel git commit: Update Mvel version from 2.2.1.Final to 2.4.1.Final
Repository: camel Updated Branches: refs/heads/master 774860517 - 3a68f1242 Update Mvel version from 2.2.1.Final to 2.4.1.Final Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3a68f124 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3a68f124 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3a68f124 Branch: refs/heads/master Commit: 3a68f1242eb3eb0e218254e39094d9cde9b967c3 Parents: 7748605 Author: ancosen anco...@gmail.com Authored: Fri Apr 24 18:06:30 2015 +0200 Committer: ancosen anco...@gmail.com Committed: Fri Apr 24 18:06:30 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3a68f124/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 789e586..31b6330 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -352,7 +352,7 @@ mustache-java-version0.9.0/mustache-java-version mustache-guava-version16.0/mustache-guava-version mustache-bundle-version0.8.16_1/mustache-bundle-version -mvel-version2.2.1.Final/mvel-version +mvel-version2.2.4.Final/mvel-version mybatis-version3.2.8/mybatis-version neethi-bundle-version3.0.1/neethi-bundle-version netty3-version3.10.1.Final/netty3-version
svn commit: r949054 - in /websites/production/camel/content: 2015/04/23/welcome-andrea-cosentino-as-the-newest-camel-rider.html cache/main.pageCache camel-2160-release.html index.html news.html
Author: buildbot Date: Fri Apr 24 17:18:43 2015 New Revision: 949054 Log: Production update by buildbot for camel Modified: websites/production/camel/content/2015/04/23/welcome-andrea-cosentino-as-the-newest-camel-rider.html websites/production/camel/content/cache/main.pageCache websites/production/camel/content/camel-2160-release.html websites/production/camel/content/index.html websites/production/camel/content/news.html Modified: websites/production/camel/content/2015/04/23/welcome-andrea-cosentino-as-the-newest-camel-rider.html == --- websites/production/camel/content/2015/04/23/welcome-andrea-cosentino-as-the-newest-camel-rider.html (original) +++ websites/production/camel/content/2015/04/23/welcome-andrea-cosentino-as-the-newest-camel-rider.html Fri Apr 24 17:18:43 2015 @@ -75,7 +75,7 @@ tbody tr td valign=top width=100% -div class=wiki-content maincontentpYesterday, the Camel PMC voted another one of the very active and talented contributors to become a committer./pp#160;/ppAndrea Cosentino is actively involved with Apache Camel since months contributing code and helping other users. Andrea contributed many patches / pull requests for helping to maintain the Camel components and ensure they are using newer releases of the dependency JARs. He is also taking on OSGi and help upgrade and maintain the karaf features as well. He is also working on a cassandra Camel component at GitHub, porting this good stuff back./pp#160;/ppOn behalf of the Camel PMC, welcome aboard#160;Andrea and keep up the great work!/ppChristian/p/div +div class=wiki-content maincontentpYesterday, the Camel PMC voted another one of the very active and talented contributors to become a committer./ppAndrea Cosentino is actively involved with Apache Camel since months contributing code and helping other users. Andrea contributed many patches / pull requests for helping to maintain the Camel components and ensure they are using newer releases of the dependency JARs. He is also taking on OSGi and help upgrade and maintain the karaf features as well. He is also working on a cassandra Camel component at GitHub, porting this good stuff back./ppOn behalf of the Camel PMC, welcome aboard#160;Andrea and keep up the great work!/ppChristian/p/div /td td valign=top div class=navigation 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 Fri Apr 24 17:18:43 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 x.y.z 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 Cha nnel/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.htmlCame lContext/a#160;is stopping to cleanup properly./lilia shape=rect
[1/2] camel git commit: [CAMEL-8655] Created Camel Spring Boot example.
Repository: camel
Updated Branches:
refs/heads/master 196c1f5ea - e1ff9ae54
[CAMEL-8655] Created Camel Spring Boot example.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/00faf61f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/00faf61f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/00faf61f
Branch: refs/heads/master
Commit: 00faf61f83b7cea05fe2d557ee13546e0914ff9c
Parents: 196c1f5
Author: Henryk Konsek hekon...@gmail.com
Authored: Fri Apr 24 09:16:36 2015 +0200
Committer: Henryk Konsek hekon...@gmail.com
Committed: Fri Apr 24 09:16:36 2015 +0200
--
examples/camel-example-spring-boot/README.txt | 29 +++
examples/camel-example-spring-boot/pom.xml | 107 ++
.../example/spring/boot/MySpringBootRouter.java | 38
.../src/main/resources/META-INF/LICENSE.txt | 203 +++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/application.yml | 1 +
.../spring/boot/MySpringBootRouterTest.java | 42
7 files changed, 431 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/00faf61f/examples/camel-example-spring-boot/README.txt
--
diff --git a/examples/camel-example-spring-boot/README.txt
b/examples/camel-example-spring-boot/README.txt
new file mode 100644
index 000..eab7655
--- /dev/null
+++ b/examples/camel-example-spring-boot/README.txt
@@ -0,0 +1,29 @@
+Spring Example
+==
+
+This example shows how to work with the simple Camel application based on the
Spring Boot.
+
+The example generates messages using timer trigger, writes them to the
standard output and the mock
+endpoint (for testing purposes).
+
+You will need to compile this example first:
+ mvn install
+
+To run the example type
+ mvn spring-boot:run
+
+You will see the message printed to the console every second.
+
+To stop the example hit ctrl + c
+
+This example is documented at
+ http://camel.apache.org/spring-boot-example.html
+
+If you hit any problems please talk to us on the Camel Forums
+ http://camel.apache.org/discussion-forums.html
+
+Please help us make Apache Camel better - we appreciate any feedback you
+may have. Enjoy!
+
+
+The Camel riders!
http://git-wip-us.apache.org/repos/asf/camel/blob/00faf61f/examples/camel-example-spring-boot/pom.xml
--
diff --git a/examples/camel-example-spring-boot/pom.xml
b/examples/camel-example-spring-boot/pom.xml
new file mode 100755
index 000..28be114
--- /dev/null
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -0,0 +1,107 @@
+?xml version=1.0 encoding=UTF-8?
+!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the License); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an AS IS BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+--
+project xmlns=http://maven.apache.org/POM/4.0.0;
xmlns:xsi=http://www.w3.org/2001/XMLSchema-instance;
xsi:schemaLocation=http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd;
+
+ modelVersion4.0.0/modelVersion
+
+ parent
+ groupIdorg.apache.camel/groupId
+ artifactIdexamples/artifactId
+ version2.16-SNAPSHOT/version
+ /parent
+
+ artifactIdcamel-example-spring-boot/artifactId
+ packagingwar/packaging
+ nameCamel :: Example :: Spring Boot/name
+ descriptionAn example showing how to work with Camel and Spring
Boot/description
+
+ properties
+ spring.boot-version1.2.3.RELEASE/spring.boot-version
+
+ maven-war-plugin.version2.6/maven-war-plugin.version
+ /properties
+
+ dependencyManagement
+ dependencies
+ dependency
+ groupIdorg.springframework.boot/groupId
+
artifactIdspring-boot-dependencies/artifactId
+ version${spring.boot-version}/version
+ typepom/type
+
[2/2] camel git commit: [CAMEL-8655] Created Camel Spring Boot example.
[CAMEL-8655] Created Camel Spring Boot example. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e1ff9ae5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e1ff9ae5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e1ff9ae5 Branch: refs/heads/master Commit: e1ff9ae54321443851e1cc72694a6300f003afd4 Parents: 00faf61 Author: Henryk Konsek hekon...@gmail.com Authored: Fri Apr 24 09:16:50 2015 +0200 Committer: Henryk Konsek hekon...@gmail.com Committed: Fri Apr 24 09:16:50 2015 +0200 -- examples/pom.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/e1ff9ae5/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 7d02eea..cdade2a 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -72,6 +72,7 @@ modulecamel-example-spark-rest-tomcat/module modulecamel-example-splunk/module modulecamel-example-spring/module +modulecamel-example-spring-boot/module modulecamel-example-spring-javaconfig/module modulecamel-example-spring-jms/module modulecamel-example-spring-ws/module
svn commit: r948997 - in /websites/production/camel/content: cache/main.pageCache team.html
Author: buildbot Date: Fri Apr 24 07:19:59 2015 New Revision: 948997 Log: Production update by buildbot for camel Modified: websites/production/camel/content/cache/main.pageCache websites/production/camel/content/team.html Modified: websites/production/camel/content/cache/main.pageCache == Binary files - no diff available. Modified: websites/production/camel/content/team.html == --- websites/production/camel/content/team.html (original) +++ websites/production/camel/content/team.html Fri Apr 24 07:19:59 2015 @@ -75,14 +75,14 @@ tbody tr td valign=top width=100% -div class=wiki-content maincontentpThis page lists who we are. By all means add yourself to the list - lets sort it in alphabetical order/ph3 id=Team-CommittersCommitters/h3div class=table-wraptable class=confluenceTabletbodytrth colspan=1 rowspan=1 class=confluenceThpName/p/thth colspan=1 rowspan=1 class=confluenceThpID/p/thth colspan=1 rowspan=1 class=confluenceThpOrganisation/p/th/trtrtd colspan=1 rowspan=1 class=confluenceTdpAaron Mulder/p/tdtd colspan=1 rowspan=1 class=confluenceTdpammulder/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://chariotsolutions.com; rel=nofollowChariot Solutions/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpAkitoshi Yoshida/p/tdtd colspan=1 rowspan=1 class=confluenceTdpay/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class =external-link href=http://www.sap.com; rel=nofollowSAP/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.xing.com/profile/Babak_Vahdat; rel=nofollowBabak Vahdat/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpbvahdat/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.cyberlogic.ch; rel=nofollowCyberlogic Consulting GmbH/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.consulting-notes.com; rel=nofollowBen O'Day/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpboday/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://initekconsulting.com; rel=nofollowInitek Consulting/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect clas s=external-link href=http://www.ofbizian.com; rel=nofollowBilgin Ibryam /a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpbibryam/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; rel=nofollowRed Hat/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://bsnyderblog.blogspot.com/; rel=nofollowBruce Snyder/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpbsnyder/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://springsource.com/; rel=nofollowSpringSource/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://cmoulliard.blogspot.com; rel=nofollowCharles Moulliard/a/p/tdtd colspan=1 rowspan=1 class=confluenceT dpcmoulliard/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; rel=nofollowRed Hat/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpChristian Mueller/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcmueller/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.atosworldline.com/index.htm; rel=nofollowAtos Worldline/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.liquid-reality.de; rel=nofollowChristian Schneider/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcschneider/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.talend.com; rel=nofollowTalend/a/p/td/trtrtd colspan=1 rowspa n=1 class=confluenceTdpa shape=rect class=external-link href=http://davsclaus.blogspot.com/; rel=nofollowClaus Ibsen/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpdavsclaus/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.redhat.com/products/jbossenterprisemiddleware/fusesource/; rel=nofollowRed Hat/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://coheigea.blogspot.ie/; rel=nofollowColm O hEigeartaigh/a/p/tdtd colspan=1 rowspan=1 class=confluenceTdpcoheigea/p/tdtd colspan=1 rowspan=1 class=confluenceTdpa shape=rect class=external-link href=http://www.talend.com; rel=nofollowTalend/a/p/td/trtrtd colspan=1 rowspan=1 class=confluenceTdpDavid Jencks/p/tdtd colspan=1 rowspan=1 class=confluenceTdpdjencks/p/tdtd colspan=1
camel git commit: Improved example docs.
Repository: camel Updated Branches: refs/heads/master e1ff9ae54 - dd1f69450 Improved example docs. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dd1f6945 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dd1f6945 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dd1f6945 Branch: refs/heads/master Commit: dd1f6945084eeaa9edb6e23b0b7ba4ae9279defd Parents: e1ff9ae Author: Henryk Konsek hekon...@gmail.com Authored: Fri Apr 24 09:22:44 2015 +0200 Committer: Henryk Konsek hekon...@gmail.com Committed: Fri Apr 24 09:22:44 2015 +0200 -- examples/camel-example-spring-boot/README.txt | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/camel/blob/dd1f6945/examples/camel-example-spring-boot/README.txt -- diff --git a/examples/camel-example-spring-boot/README.txt b/examples/camel-example-spring-boot/README.txt index eab7655..53ed3d5 100644 --- a/examples/camel-example-spring-boot/README.txt +++ b/examples/camel-example-spring-boot/README.txt @@ -6,6 +6,10 @@ This example shows how to work with the simple Camel application based on the Sp The example generates messages using timer trigger, writes them to the standard output and the mock endpoint (for testing purposes). +This example exposes Jolokia API and Spring Boot actuators endpoints (like metrics) via the webmvc endpoint. We consider +this as the best practice - Spring Boot applications with these API exposed can be easily monitored and managed by the +3rd parties tools. + You will need to compile this example first: mvn install
camel git commit: Spring Boot example is not the proper fat WAR.
Repository: camel
Updated Branches:
refs/heads/master dd1f69450 - c86c2f11f
Spring Boot example is not the proper fat WAR.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c86c2f11
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c86c2f11
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c86c2f11
Branch: refs/heads/master
Commit: c86c2f11f090a54c4a721ac51c4c0fd401192e24
Parents: dd1f694
Author: Henryk Konsek hekon...@gmail.com
Authored: Fri Apr 24 09:30:20 2015 +0200
Committer: Henryk Konsek hekon...@gmail.com
Committed: Fri Apr 24 09:30:20 2015 +0200
--
examples/camel-example-spring-boot/README.txt | 8 ++
.../boot/MySpringBootRouterWarInitializer.java | 29
2 files changed, 37 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/c86c2f11/examples/camel-example-spring-boot/README.txt
--
diff --git a/examples/camel-example-spring-boot/README.txt
b/examples/camel-example-spring-boot/README.txt
index 53ed3d5..468a898 100644
--- a/examples/camel-example-spring-boot/README.txt
+++ b/examples/camel-example-spring-boot/README.txt
@@ -10,12 +10,20 @@ This example exposes Jolokia API and Spring Boot actuators
endpoints (like metri
this as the best practice - Spring Boot applications with these API exposed
can be easily monitored and managed by the
3rd parties tools.
+We recommend to package your application as a fat WAR. Fat WARs can be
executed just as regular fat jars, but you can also
+deploy them to the servlet containers like Tomcat. Fat WAR approach gives you
the deployment flexibility, so we highly
+recommend it.
+
You will need to compile this example first:
mvn install
To run the example type
mvn spring-boot:run
+You can also execute the fat WAR directly:
+
+ java -jar target/camel-example-spring-boot-2.x-SNAPSHOT.war
+
You will see the message printed to the console every second.
To stop the example hit ctrl + c
http://git-wip-us.apache.org/repos/asf/camel/blob/c86c2f11/examples/camel-example-spring-boot/src/main/java/org/apache/camel/example/spring/boot/MySpringBootRouterWarInitializer.java
--
diff --git
a/examples/camel-example-spring-boot/src/main/java/org/apache/camel/example/spring/boot/MySpringBootRouterWarInitializer.java
b/examples/camel-example-spring-boot/src/main/java/org/apache/camel/example/spring/boot/MySpringBootRouterWarInitializer.java
new file mode 100644
index 000..e0640f8
--- /dev/null
+++
b/examples/camel-example-spring-boot/src/main/java/org/apache/camel/example/spring/boot/MySpringBootRouterWarInitializer.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.example.spring.boot;
+
+import org.apache.camel.spring.boot.FatJarRouter;
+import org.apache.camel.spring.boot.FatWarInitializer;
+
+public class MySpringBootRouterWarInitializer extends FatWarInitializer {
+
+@Override
+protected Class? extends FatJarRouter routerClass() {
+return MySpringBootRouter.class;
+}
+
+}
[2/2] camel git commit: Component doc
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/196c1f5e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/196c1f5e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/196c1f5e
Branch: refs/heads/master
Commit: 196c1f5ea8c14cc5a36c7f4aed3dacaeb577e733
Parents: df79b59
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 08:03:09 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 08:03:09 2015 +0200
--
.../camel/component/yammer/YammerComponent.java | 12
.../component/yammer/YammerConfiguration.java | 61 +---
2 files changed, 64 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/196c1f5e/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
--
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
index 2655beb..6d83570 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerComponent.java
@@ -57,6 +57,9 @@ public class YammerComponent extends DefaultComponent {
return consumerKey;
}
+/**
+ * The consumer key
+ */
public void setConsumerKey(String consumerKey) {
this.consumerKey = consumerKey;
}
@@ -65,6 +68,9 @@ public class YammerComponent extends DefaultComponent {
return consumerSecret;
}
+/**
+ * The consumer secret
+ */
public void setConsumerSecret(String consumerSecret) {
this.consumerSecret = consumerSecret;
}
@@ -73,6 +79,9 @@ public class YammerComponent extends DefaultComponent {
return accessToken;
}
+/**
+ * The access token
+ */
public void setAccessToken(String accessToken) {
this.accessToken = accessToken;
}
@@ -81,6 +90,9 @@ public class YammerComponent extends DefaultComponent {
return config;
}
+/**
+ * To use a shared yammer configuration
+ */
public void setConfig(YammerConfiguration config) {
this.config = config;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/196c1f5e/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
--
diff --git
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
index deee282..9899d05 100644
---
a/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
+++
b/components/camel-yammer/src/main/java/org/apache/camel/component/yammer/YammerConfiguration.java
@@ -27,25 +27,25 @@ public class YammerConfiguration {
@UriPath(name = function) @Metadata(required = true)
private YammerFunctionType functionType;
private String function;
-@UriParam
+@UriParam @Metadata(required = true)
private String consumerKey;
-@UriParam
+@UriParam @Metadata(required = true)
private String consumerSecret;
-@UriParam
+@UriParam @Metadata(required = true)
private String accessToken;
@UriParam
private boolean useJson;
-@UriParam(defaultValue = 5000)
+@UriParam(label = consumer, defaultValue = 5000)
private long delay = 3000 + 2000; // 3 sec per poll is enforced by yammer;
add 2 sec for safety
-@UriParam(defaultValue = -1)
+@UriParam(label = consumer, defaultValue = -1)
private int limit = -1; // default is unlimited
-@UriParam(defaultValue = -1)
+@UriParam(label = consumer, defaultValue = -1)
private int olderThan = -1;
-@UriParam(defaultValue = -1)
+@UriParam(label = consumer, defaultValue = -1)
private int newerThan = -1;
-@UriParam
+@UriParam(label = consumer, enums = true,extended)
private String threaded;
-@UriParam
+@UriParam(label = consumer)
private String userId;
private ApiRequestor requestor;
@@ -53,6 +53,9 @@ public class YammerConfiguration {
return consumerKey;
}
+/**
+ * The consumer key
+ */
public void setConsumerKey(String consumerKey) {
this.consumerKey = consumerKey;
}
@@ -61,6 +64,9 @@ public class YammerConfiguration {
return consumerSecret;
}
+/**
+ * The consumer secret
+ */
public void setConsumerSecret(String consumerSecret) {
[1/2] camel git commit: Component doc
Repository: camel
Updated Branches:
refs/heads/master 157c7366f - 196c1f5ea
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/df79b599
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/df79b599
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/df79b599
Branch: refs/heads/master
Commit: df79b5991ec555a4befd4fb031d1bfca95b47aea
Parents: 157c736
Author: Claus Ibsen davscl...@apache.org
Authored: Fri Apr 24 07:53:11 2015 +0200
Committer: Claus Ibsen davscl...@apache.org
Committed: Fri Apr 24 07:53:11 2015 +0200
--
.../component/docker/DockerConfiguration.java | 46
1 file changed, 19 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/df79b599/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
--
diff --git
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
index 4ac97a5..442bc83 100644
---
a/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
+++
b/components/camel-docker/src/main/java/org/apache/camel/component/docker/DockerConfiguration.java
@@ -30,45 +30,32 @@ public class DockerConfiguration implements Cloneable {
@UriPath @Metadata(required = true)
private DockerOperation operation;
-
@UriParam(defaultValue = localhost) @Metadata(required = true)
private String host = localhost;
-
@UriParam(defaultValue = 2375) @Metadata(required = true)
private Integer port = 2375;
-
@UriParam
private String username;
-
@UriParam
private String password;
-
@UriParam
private String email;
-
@UriParam(defaultValue = https://index.docker.io/v1/;)
private String serverAddress = https://index.docker.io/v1/;;
-
@UriParam
private Integer requestTimeout;
-
@UriParam
-private Boolean secure;
-
+private boolean secure;
@UriParam
private String certPath;
-
@UriParam(defaultValue = 100)
private Integer maxTotalConnections = 100;
-
@UriParam(defaultValue = 100)
private Integer maxPerRouteConnections = 100;
-
@UriParam
-private Boolean loggingFilterEnabled;
-
+private boolean loggingFilter;
@UriParam
-private Boolean followRedirectFilterEnabled;
+private boolean followRedirectFilter;
private MapString, Object parameters = new HashMapString, Object();
@@ -149,14 +136,14 @@ public class DockerConfiguration implements Cloneable {
this.requestTimeout = requestTimeout;
}
-public Boolean isSecure() {
+public boolean isSecure() {
return secure;
}
/**
* Use HTTPS communication
*/
-public void setSecure(Boolean secure) {
+public void setSecure(boolean secure) {
this.secure = secure;
}
@@ -193,20 +180,26 @@ public class DockerConfiguration implements Cloneable {
this.maxPerRouteConnections = maxPerRouteConnections;
}
-public Boolean isLoggingFilterEnabled() {
-return loggingFilterEnabled;
+public boolean isLoggingFilterEnabled() {
+return loggingFilter;
}
-public void setLoggingFilter(Boolean loggingFilterEnabled) {
-this.loggingFilterEnabled = loggingFilterEnabled;
+/**
+ * Whether to use logging filter
+ */
+public void setLoggingFilter(boolean loggingFilterEnabled) {
+this.loggingFilter = loggingFilterEnabled;
}
-public Boolean isFollowRedirectFilterEnabled() {
-return followRedirectFilterEnabled;
+public boolean isFollowRedirectFilterEnabled() {
+return followRedirectFilter;
}
-public void setFollowRedirectFilter(Boolean followRedirectFilterEnabled) {
-this.followRedirectFilterEnabled = followRedirectFilterEnabled;
+/**
+ * Whether to follow redirect filter
+ */
+public void setFollowRedirectFilter(boolean followRedirectFilterEnabled) {
+this.followRedirectFilter = followRedirectFilterEnabled;
}
public MapString, Object getParameters() {
@@ -239,5 +232,4 @@ public class DockerConfiguration implements Cloneable {
}
}
-
}
camel git commit: CAMEL-8694: java.lang.NullPointerException in at org.apache.camel.component.netty4.http.NettyHttpProducer.done
Repository: camel
Updated Branches:
refs/heads/master 3a68f1242 - dbd6b584e
CAMEL-8694: java.lang.NullPointerException in at
org.apache.camel.component.netty4.http.NettyHttpProducer.done
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/dbd6b584
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/dbd6b584
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/dbd6b584
Branch: refs/heads/master
Commit: dbd6b584e02f5ce0ae46e50d2f4ee6a2785dd7d4
Parents: 3a68f12
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:26:18 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:26:18 2015 +0200
--
.../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/dbd6b584/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
--
diff --git
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index c021494..f88b0b2 100644
---
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -95,8 +95,8 @@ public class NettyHttpProducer extends NettyProducer {
FullHttpResponse response = nettyMessage.getHttpResponse();
// Need to retain the ByteBuffer for producer to consumer
// TODO Remove this part of ByteBuffer right away
-response.content().retain();
if (response != null) {
+response.content().retain();
// the actual url is stored on the IN message in the
getRequestBody method as its accessed on-demand
String actualUrl =
exchange.getIn().getHeader(Exchange.HTTP_URL, String.class);
int code = response.getStatus() != null ?
response.getStatus().code() : -1;
@@ -116,5 +116,4 @@ public class NettyHttpProducer extends NettyProducer {
}
}
}
-
}
camel git commit: CAMEL-8694: java.lang.NullPointerException in at org.apache.camel.component.netty4.http.NettyHttpProducer.done
Repository: camel
Updated Branches:
refs/heads/camel-2.15.x f51e06167 - 9a69b3686
CAMEL-8694: java.lang.NullPointerException in at
org.apache.camel.component.netty4.http.NettyHttpProducer.done
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a69b368
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a69b368
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a69b368
Branch: refs/heads/camel-2.15.x
Commit: 9a69b3686ff9031d82ebe9ab357af42382765395
Parents: f51e061
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:26:18 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:27:16 2015 +0200
--
.../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9a69b368/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
--
diff --git
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index c021494..f88b0b2 100644
---
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -95,8 +95,8 @@ public class NettyHttpProducer extends NettyProducer {
FullHttpResponse response = nettyMessage.getHttpResponse();
// Need to retain the ByteBuffer for producer to consumer
// TODO Remove this part of ByteBuffer right away
-response.content().retain();
if (response != null) {
+response.content().retain();
// the actual url is stored on the IN message in the
getRequestBody method as its accessed on-demand
String actualUrl =
exchange.getIn().getHeader(Exchange.HTTP_URL, String.class);
int code = response.getStatus() != null ?
response.getStatus().code() : -1;
@@ -116,5 +116,4 @@ public class NettyHttpProducer extends NettyProducer {
}
}
}
-
}
camel git commit: CAMEL-8694: java.lang.NullPointerException in at org.apache.camel.component.netty4.http.NettyHttpProducer.done
Repository: camel
Updated Branches:
refs/heads/camel-2.14.x 6a1bfc63c - bd1f252f8
CAMEL-8694: java.lang.NullPointerException in at
org.apache.camel.component.netty4.http.NettyHttpProducer.done
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bd1f252f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bd1f252f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bd1f252f
Branch: refs/heads/camel-2.14.x
Commit: bd1f252f81dd8a117f9466a5c0ee528b8e7a4763
Parents: 6a1bfc6
Author: Christian Mueller cmuel...@apache.org
Authored: Fri Apr 24 23:26:18 2015 +0200
Committer: Christian Mueller cmuel...@apache.org
Committed: Fri Apr 24 23:30:02 2015 +0200
--
.../org/apache/camel/component/netty4/http/NettyHttpProducer.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/bd1f252f/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
--
diff --git
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
index c021494..f88b0b2 100644
---
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
+++
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpProducer.java
@@ -95,8 +95,8 @@ public class NettyHttpProducer extends NettyProducer {
FullHttpResponse response = nettyMessage.getHttpResponse();
// Need to retain the ByteBuffer for producer to consumer
// TODO Remove this part of ByteBuffer right away
-response.content().retain();
if (response != null) {
+response.content().retain();
// the actual url is stored on the IN message in the
getRequestBody method as its accessed on-demand
String actualUrl =
exchange.getIn().getHeader(Exchange.HTTP_URL, String.class);
int code = response.getStatus() != null ?
response.getStatus().code() : -1;
@@ -116,5 +116,4 @@ public class NettyHttpProducer extends NettyProducer {
}
}
}
-
}
camel git commit: upgrade junit 4.11 to 4.12
Repository: camel Updated Branches: refs/heads/master dbd6b584e - 3c083cb07 upgrade junit 4.11 to 4.12 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c083cb0 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c083cb0 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c083cb0 Branch: refs/heads/master Commit: 3c083cb079751096a68a897c3cb13ce0caa5268d Parents: dbd6b58 Author: Christian Mueller cmuel...@apache.org Authored: Fri Apr 24 23:39:08 2015 +0200 Committer: Christian Mueller cmuel...@apache.org Committed: Fri Apr 24 23:39:08 2015 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/3c083cb0/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 31b6330..4035351 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -294,8 +294,8 @@ jt400-bundle-version6.7_1/jt400-bundle-version juel-bundle-version2.1.3_1/juel-bundle-version juel-version2.1.3/juel-version -junit-bundle-version4.11_2/junit-bundle-version -junit-version4.11/junit-version +junit-bundle-version4.12_1/junit-bundle-version +junit-version4.12/junit-version jython-version2.5.3/jython-version jzlib-version1.1.3/jzlib-version kafka-version0.8.2.0/kafka-version
camel git commit: upgrade ognl 3.0.8 to 3.0.9
Repository: camel Updated Branches: refs/heads/master 3c083cb07 - a9093733c upgrade ognl 3.0.8 to 3.0.9 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9093733 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9093733 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9093733 Branch: refs/heads/master Commit: a9093733c64d9b217f1b3fc704400e19b370495b Parents: 3c083cb Author: Christian Mueller cmuel...@apache.org Authored: Fri Apr 24 23:45:16 2015 +0200 Committer: Christian Mueller cmuel...@apache.org Committed: Fri Apr 24 23:45:16 2015 +0200 -- parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/a9093733/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index 4035351..c742695 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -362,8 +362,8 @@ openwebbeans-version1.2.0/openwebbeans-version olingo2-version2.0.0/olingo2-version olingo-odata2-core-bundle-version2.0.0_1/olingo-odata2-core-bundle-version -ognl-version3.0.8/ognl-version -ognl-bundle-version3.0.8_1/ognl-bundle-version +ognl-version3.0.9/ognl-version +ognl-bundle-version3.0.9_1/ognl-bundle-version oncrpc-version1.1.2/oncrpc-version openejb-version4.6.0.2/openejb-version openjpa-version2.3.0/openjpa-version
camel git commit: upgrade openjpa 2.3.0 to 2.4.0
Repository: camel Updated Branches: refs/heads/master a9093733c - 1a24e6a34 upgrade openjpa 2.3.0 to 2.4.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1a24e6a3 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1a24e6a3 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1a24e6a3 Branch: refs/heads/master Commit: 1a24e6a343b71c5b58a29037f3e3fc64210bacca Parents: a909373 Author: Christian Mueller cmuel...@apache.org Authored: Fri Apr 24 23:50:51 2015 +0200 Committer: Christian Mueller cmuel...@apache.org Committed: Fri Apr 24 23:50:51 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/1a24e6a3/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index c742695..b1cd644 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -366,7 +366,7 @@ ognl-bundle-version3.0.9_1/ognl-bundle-version oncrpc-version1.1.2/oncrpc-version openejb-version4.6.0.2/openejb-version -openjpa-version2.3.0/openjpa-version +openjpa-version2.4.0/openjpa-version openshift-java-client-version2.7.0.Final/openshift-java-client-version optaplanner-version6.2.0.Final/optaplanner-version oro-bundle-version2.0.8_6/oro-bundle-version
camel git commit: upgrade testng 6.8.8 to 6.8.21
Repository: camel Updated Branches: refs/heads/master 1a24e6a34 - 7a853c000 upgrade testng 6.8.8 to 6.8.21 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7a853c00 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7a853c00 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7a853c00 Branch: refs/heads/master Commit: 7a853c000f772bb52c484e5a64417cb1ad1c3ed3 Parents: 1a24e6a Author: Christian Mueller cmuel...@apache.org Authored: Fri Apr 24 23:53:43 2015 +0200 Committer: Christian Mueller cmuel...@apache.org Committed: Fri Apr 24 23:53:43 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/7a853c00/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index b1cd644..ab7f7f4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -469,7 +469,7 @@ taglist-maven-plugin-version2.4/taglist-maven-plugin-version tagsoup-bundle-version1.2_5/tagsoup-bundle-version tagsoup-version1.2.1/tagsoup-version -testng-version6.8.8/testng-version +testng-version6.8.21/testng-version twitter4j-bundle-version4.0.3_1/twitter4j-bundle-version twitter4j-version4.0.3/twitter4j-version univocity-parsers-version1.2.1/univocity-parsers-version
camel git commit: upgrade slf4j 1.7.10 to 1.7.12
Repository: camel Updated Branches: refs/heads/master 7a853c000 - 16ea61e23 upgrade slf4j 1.7.10 to 1.7.12 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/16ea61e2 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/16ea61e2 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/16ea61e2 Branch: refs/heads/master Commit: 16ea61e2377a94390824cb358c188a62923a4768 Parents: 7a853c0 Author: Christian Mueller cmuel...@apache.org Authored: Fri Apr 24 23:55:08 2015 +0200 Committer: Christian Mueller cmuel...@apache.org Committed: Fri Apr 24 23:55:08 2015 +0200 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/16ea61e2/parent/pom.xml -- diff --git a/parent/pom.xml b/parent/pom.xml index ab7f7f4..525bcac 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -418,7 +418,7 @@ shiro-version1.2.3/shiro-version !-- use slf4j-api 1.6.x to be easy compatible with older Camel releases -- slf4j-api-version1.6.6/slf4j-api-version -slf4j-version1.7.10/slf4j-version +slf4j-version1.7.12/slf4j-version smack-bundle-version4.0.6/smack-bundle-version smack-version4.0.7/smack-version snakeyaml-version1.14/snakeyaml-version
