[camel] branch master updated: CAMEL-12148: Reworked FileIdempontentRepository so LRUCache is only act as quick lookup. And in case of 1st-level miss the file store is checked. File store also writes
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 8b42f4e CAMEL-12148: Reworked FileIdempontentRepository so LRUCache
is only act as quick lookup. And in case of 1st-level miss the file store is
checked. File store also writes the entries in the same order they are added.
8b42f4e is described below
commit 8b42f4ec031755f0c507dcbf8538b5c10adc59e4
Author: Claus Ibsen
AuthorDate: Wed Jan 17 09:19:32 2018 +0100
CAMEL-12148: Reworked FileIdempontentRepository so LRUCache is only act as
quick lookup. And in case of 1st-level miss the file store is checked. File
store also writes the entries in the same order they are added.
---
.../camel/processor/idempotent/FileIdempotentRepository.java | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git
a/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
b/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
index 339838b..e441977 100644
---
a/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
+++
b/camel-core/src/main/java/org/apache/camel/processor/idempotent/FileIdempotentRepository.java
@@ -45,9 +45,9 @@ import org.slf4j.LoggerFactory;
* frequently used keys. When {@link #add(String)} or {@link
#contains(String)} methods are being used
* then in case of 1st-level cache miss, the underlying file is scanned which
may cost additional performance.
* So try to find the right balance of the size of the 1st-level cache, the
default size is 1000.
- * The file store has a maximum capacity of 32mb by default. If the file store
grows bigger, then
- * the {@link #getDropOldestFileStore()} number of entries from the file store
is dropped to reduce
- * the file store and make room for newer entries.
+ * The file store has a maximum capacity of 32mb by default (you can turn this
off and have unlimited size).
+ * If the file store grows bigger than the maximum capacity, then the {@link
#getDropOldestFileStore()} (is default 1000)
+ * number of entries from the file store is dropped to reduce the file store
and make room for newer entries.
*
* @version
*/
@@ -140,8 +140,8 @@ public class FileIdempotentRepository extends
ServiceSupport implements Idempote
// its a new key so append to file store
appendToStore(key);
-// check if we hit maximum capacity and report a warning about
this
-if (fileStore.length() > maxFileStoreSize) {
+// check if we hit maximum capacity (if enabled) and report a
warning about this
+if (maxFileStoreSize > 0 && fileStore.length() >
maxFileStoreSize) {
LOG.warn("Maximum capacity of file store: {} hit at {}
bytes. Dropping {} oldest entries from the file store", fileStore,
maxFileStoreSize, dropOldestFileStore);
trunkStore();
}
@@ -215,6 +215,7 @@ public class FileIdempotentRepository extends
ServiceSupport implements Idempote
/**
* Sets the maximum file size for the file store in bytes.
+ * You can set the value to 0 or negative to turn this off, and have
unlimited file store size.
*
* The default is 32mb.
*/
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" '].
[camel] branch master updated: Upgrade OS Maven Plugin to version 1.5.0.Final
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new 1b23a30 Upgrade OS Maven Plugin to version 1.5.0.Final 1b23a30 is described below commit 1b23a30419cf847a78e749ebd450acb2b899c470 Author: Andrea Cosentino AuthorDate: Wed Jan 17 10:15:43 2018 +0100 Upgrade OS Maven Plugin to version 1.5.0.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index cce13a5..bb323f8 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -548,7 +548,7 @@ 1.5.0 7.3.0.Final 2.0.8_6 -1.4.1.Final +1.5.0.Final 2.4_5 4.3.1 1.2.0 -- To stop receiving notification emails like this one, please contact ['"commits@camel.apache.org" '].
[camel] 02/02: CAMEL-12061: camel-ftp now forces a hard disconnect in case of rollback such as error during scanning files etc, to force a fresh client/login on next poll to mitigate any transient iss
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit e52425e6b9f70a7f59e5a2b6025330470049f0f0
Author: Claus Ibsen
AuthorDate: Wed Jan 17 10:40:46 2018 +0100
CAMEL-12061: camel-ftp now forces a hard disconnect in case of rollback
such as error during scanning files etc, to force a fresh client/login on next
poll to mitigate any transient issues in the ftp client.
---
.../camel/component/file/remote/FtpOperations.java | 5 +
.../camel/component/file/remote/RemoteFileConsumer.java | 16
.../component/file/remote/RemoteFileOperations.java | 7 +++
.../remote/RemoteFilePollingConsumerPollStrategy.java | 6 +++---
.../camel/component/file/remote/SftpOperations.java | 17 -
.../org/apache/camel/component/scp/ScpOperations.java | 16 ++--
6 files changed, 61 insertions(+), 6 deletions(-)
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
index 36a7c5d..fba2389 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/FtpOperations.java
@@ -249,6 +249,11 @@ public class FtpOperations implements
RemoteFileOperations {
}
}
+@Override
+public void forceDisconnect() throws GenericFileOperationFailedException {
+doDisconnect();
+}
+
protected void doDisconnect() throws GenericFileOperationFailedException {
// logout before disconnecting
clientActivityListener.onDisconnecting(endpoint.getConfiguration().remoteServerInformation());
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
index 483e4aa..a676732 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
@@ -166,6 +166,22 @@ public abstract class RemoteFileConsumer extends
GenericFileConsumer {
}
}
+protected void forceDisconnect() {
+// eager indicate we are no longer logged in
+loggedIn = false;
+
+// disconnect
+try {
+if (log.isDebugEnabled()) {
+log.debug("Force disconnecting from: {}", remoteServer());
+}
+getOperations().forceDisconnect();
+} catch (GenericFileOperationFailedException e) {
+// ignore just log a warning
+log.warn("Error occurred while disconnecting from " +
remoteServer() + " due: " + e.getMessage() + ". This exception will be
ignored.");
+}
+}
+
protected void recoverableConnectIfNecessary() throws Exception {
try {
connectIfNecessary();
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileOperations.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileOperations.java
index 55573cb..7136682 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileOperations.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileOperations.java
@@ -49,6 +49,13 @@ public interface RemoteFileOperations extends
GenericFileOperations {
void disconnect() throws GenericFileOperationFailedException;
/**
+ * Forces a hard disconnect from the remote server and cause the client to
be re-created on next poll.
+ *
+ * @throws GenericFileOperationFailedException can be thrown
+ */
+void forceDisconnect() throws GenericFileOperationFailedException;
+
+/**
* Sends a noop command to the remote server
*
* @return true if the noop was a success, false
otherwise
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
index fea8be2..85d40cd 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFilePollingConsumerPollStrategy.java
@@ -35,12 +35,12 @@ public class RemoteFilePollingConsumerPollStrategy extends
DefaultPollingConsume
// only try to recover if we are allowed to run
if (rfc.isRunAllowed()) {
// disconnect from the serve
[camel] branch master updated (1b23a30 -> e52425e)
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from 1b23a30 Upgrade OS Maven Plugin to version 1.5.0.Final new 494e9d8 Polished new e52425e CAMEL-12061: camel-ftp now forces a hard disconnect in case of rollback such as error during scanning files etc, to force a fresh client/login on next poll to mitigate any transient issues in the ftp client. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../camel/component/file/remote/FtpOperations.java | 5 .../component/file/remote/RemoteFileConsumer.java | 32 -- .../file/remote/RemoteFileOperations.java | 7 + .../RemoteFilePollingConsumerPollStrategy.java | 6 ++-- .../component/file/remote/SftpOperations.java | 17 +++- .../apache/camel/component/scp/ScpOperations.java | 16 +-- 6 files changed, 69 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@camel.apache.org" '].
[camel] 01/02: Polished
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 494e9d8027db61c2894cb78f798f34ea8b053752
Author: Claus Ibsen
AuthorDate: Wed Jan 17 10:12:30 2018 +0100
Polished
---
.../camel/component/file/remote/RemoteFileConsumer.java | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
index d8653e3..483e4aa 100644
---
a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
+++
b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFileConsumer.java
@@ -228,12 +228,12 @@ public abstract class RemoteFileConsumer extends
GenericFileConsumer {
}
/**
- * Executes doPollDirectory and on exception checks if it can be ignored
by calling ignoreCannotRetrieveFile .
+ * Executes doPollDirectory and on exception checks if it can be ignored
by calling ignoreCannotRetrieveFile.
*
- * @param absolutePath The path of the directory to poll
- * @param dirName The name of the directory to poll
- * @param fileList current list of files gathered
- * @param depth the current depth of the directory
+ * @param absolutePath the path of the directory to poll
+ * @param dirName the name of the directory to poll
+ * @param fileList current list of files gathered
+ * @param depth the current depth of the directory
* @return whether or not to continue polling, false means the
maxMessagesPerPoll limit has been hit
* @throws GenericFileOperationFailedException if the exception during
doPollDirectory can not be ignored
*/
@@ -243,13 +243,13 @@ public abstract class RemoteFileConsumer extends
GenericFileConsumer {
//Try to poll the directory
return doPollDirectory(absolutePath, dirName, fileList, depth);
} catch (Exception e) {
-log.debug("Caught exception " + e.getMessage());
+log.debug("Caught exception {}", e.getMessage());
if (ignoreCannotRetrieveFile(absolutePath, null, e)) {
-log.trace("Ignoring file error " + e.getMessage() + " for " +
absolutePath);
+log.trace("Ignoring file error {} for {}", e.getMessage(),
absolutePath);
//indicate no files in this directory to poll, continue with
fileList
return true;
} else {
-log.trace("Not ignoring file error " + e.getMessage() + " for
" + absolutePath);
+log.trace("Not ignoring file error {} for {}", e.getMessage(),
absolutePath);
if (e instanceof GenericFileOperationFailedException) {
throw (GenericFileOperationFailedException) e;
} else {
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" .
[camel] branch master updated: CAMEL-12150 - Camel-AWS EC2: Add the ability to specify credentials and region at component level
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 1a6a807 CAMEL-12150 - Camel-AWS EC2: Add the ability to specify
credentials and region at component level
1a6a807 is described below
commit 1a6a807c0f0cc0678ef83ef7f1c839283189879a
Author: Andrea Cosentino
AuthorDate: Wed Jan 17 11:15:00 2018 +0100
CAMEL-12150 - Camel-AWS EC2: Add the ability to specify credentials and
region at component level
---
.../camel-aws/src/main/docs/aws-ec2-component.adoc | 14 +-
.../camel/component/aws/ec2/EC2Component.java | 67 +-
.../camel/component/aws/ec2/EC2Configuration.java | 15 ++-
.../aws/ec2/EC2ComponentConfigurationTest.java | 25
.../ec2/springboot/EC2ComponentConfiguration.java | 147 +
5 files changed, 265 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-ec2-component.adoc
b/components/camel-aws/src/main/docs/aws-ec2-component.adoc
index 897fec9..db18894 100644
--- a/components/camel-aws/src/main/docs/aws-ec2-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-ec2-component.adoc
@@ -25,7 +25,19 @@ You can append query options to the URI in the following
format,
// component options: START
-The AWS EC2 component has no options.
+The AWS EC2 component supports 5 options which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *configuration* (advanced) | The AWS EC2 default configuration | |
EC2Configuration
+| *region* (producer) | The region in which EC2 client needs to work | |
String
+| *accessKey* (producer) | Amazon AWS Access Key | | String
+| *secretKey* (producer) | Amazon AWS Secret Key | | String
+| *resolveProperty Placeholders* (advanced) | Whether the component should
resolve property placeholders on itself when starting. Only properties which
are of String type can use property placeholders. | true | boolean
+|===
// component options: END
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Component.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Component.java
index c2df816..ba16ab9 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Component.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ec2/EC2Component.java
@@ -21,12 +21,23 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.ObjectHelper;
/**
* For working with Amazon's Elastic Compute Cloud (EC2).
*/
public class EC2Component extends DefaultComponent {
+@Metadata
+private String accessKey;
+@Metadata
+private String secretKey;
+@Metadata
+private String region;
+@Metadata(label = "advanced")
+private EC2Configuration configuration;
+
public EC2Component() {
this(null);
}
@@ -34,14 +45,24 @@ public class EC2Component extends DefaultComponent {
public EC2Component(CamelContext context) {
super(context);
+this.configuration = new EC2Configuration();
registerExtension(new EC2ComponentVerifierExtension());
}
@Override
protected Endpoint createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
-EC2Configuration configuration = new EC2Configuration();
+EC2Configuration configuration = this.configuration.copy();
setProperties(configuration, parameters);
+if (ObjectHelper.isEmpty(configuration.getAccessKey())) {
+setAccessKey(accessKey);
+}
+if (ObjectHelper.isEmpty(configuration.getSecretKey())) {
+setSecretKey(secretKey);
+}
+if (ObjectHelper.isEmpty(configuration.getRegion())) {
+setRegion(region);
+}
if (configuration.getAmazonEc2Client() == null &&
(configuration.getAccessKey() == null || configuration.getSecretKey() == null))
{
throw new IllegalArgumentException("amazonEC2Client or accessKey
and secretKey must be specified");
}
@@ -49,5 +70,49 @@ public class EC2Component extends DefaultComponent {
EC2Endpoint endpoint = new EC2Endpoint(uri, this, configuration);
return endpoint;
}
+
+public EC2Configuration getConfiguration() {
+return configuration;
+}
+
+/**
+ * The AWS EC2 default configuration
+ */
+public void setConfiguration(EC2Configuration configuration) {
+this.configuration = configuration;
+}
+
+/**
+ * The region in which EC2 client needs to work
+ */
+public String getRegion(
[camel] branch master updated: CAMEL-12151 - Camel-AWS CW: Add the ability to specify credentials and region at component level
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new c9666fe CAMEL-12151 - Camel-AWS CW: Add the ability to specify
credentials and region at component level
c9666fe is described below
commit c9666fe25bf082ea41364d2d97bddb9b35b6cd44
Author: Andrea Cosentino
AuthorDate: Wed Jan 17 11:47:52 2018 +0100
CAMEL-12151 - Camel-AWS CW: Add the ability to specify credentials and
region at component level
---
.../camel-aws/src/main/docs/aws-cw-component.adoc | 14 +-
.../apache/camel/component/aws/cw/CwComponent.java | 72 +++-
.../camel/component/aws/cw/CwConfiguration.java| 12 ++
.../aws/cw/CwComponentConfigurationTest.java | 28 +++
.../cw/springboot/CwComponentConfiguration.java| 190 +
5 files changed, 312 insertions(+), 4 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-cw-component.adoc
b/components/camel-aws/src/main/docs/aws-cw-component.adoc
index 84b8c74..079f9db 100644
--- a/components/camel-aws/src/main/docs/aws-cw-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-cw-component.adoc
@@ -28,7 +28,19 @@ The metrics will be created if they don't already exists. +
// component options: START
-The AWS CloudWatch component has no options.
+The AWS CloudWatch component supports 5 options which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *configuration* (advanced) | The AWS CW default configuration | |
CwConfiguration
+| *accessKey* (producer) | Amazon AWS Access Key | | String
+| *secretKey* (producer) | Amazon AWS Secret Key | | String
+| *region* (producer) | The region in which CW client needs to work | | String
+| *resolveProperty Placeholders* (advanced) | Whether the component should
resolve property placeholders on itself when starting. Only properties which
are of String type can use property placeholders. | true | boolean
+|===
// component options: END
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
index 5a3822e..6995b37 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwComponent.java
@@ -20,10 +20,22 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
+import org.apache.camel.component.aws.s3.S3Configuration;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.ObjectHelper;
public class CwComponent extends DefaultComponent {
+@Metadata
+private String accessKey;
+@Metadata
+private String secretKey;
+@Metadata
+private String region;
+@Metadata(label = "advanced")
+private CwConfiguration configuration;
+
public CwComponent() {
this(null);
}
@@ -31,11 +43,12 @@ public class CwComponent extends DefaultComponent {
public CwComponent(CamelContext context) {
super(context);
+this.configuration = new CwConfiguration();
registerExtension(new CwComponentVerifierExtension());
}
protected Endpoint createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
-CwConfiguration configuration = new CwConfiguration();
+CwConfiguration configuration = this.configuration.copy();
setProperties(configuration, parameters);
if (remaining == null || remaining.trim().length() == 0) {
@@ -43,11 +56,64 @@ public class CwComponent extends DefaultComponent {
}
configuration.setNamespace(remaining);
-if (configuration.getAmazonCwClient() == null) {
-throw new IllegalArgumentException("AmazonCwClient must be
specified");
+if (ObjectHelper.isEmpty(configuration.getAccessKey())) {
+setAccessKey(accessKey);
+}
+if (ObjectHelper.isEmpty(configuration.getSecretKey())) {
+setSecretKey(secretKey);
+}
+if (ObjectHelper.isEmpty(configuration.getRegion())) {
+setRegion(region);
+}
+if (configuration.getAmazonCwClient() == null &&
(configuration.getAccessKey() == null || configuration.getSecretKey() == null))
{
+throw new IllegalArgumentException("AmazonCwClient or accessKey
and secretKey must be specified");
}
CwEndpoint endpoint = new CwEndpoint(uri, this, configuration);
return endpoint;
}
+
+public CwConfiguration getConfiguration() {
+return configuration;
+}
+
+/**
+ * The AWS CW default configuration
+ */
[camel] 01/02: Camel-AWS CW - accessKey and secretKey are secret
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit f43488fd6b02ff95e7ec925a3385ca3f613d919b
Author: Andrea Cosentino
AuthorDate: Wed Jan 17 11:51:26 2018 +0100
Camel-AWS CW - accessKey and secretKey are secret
---
.../main/java/org/apache/camel/component/aws/cw/CwConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
index a1b0618..2d34014 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/cw/CwConfiguration.java
@@ -35,9 +35,9 @@ public class CwConfiguration implements Cloneable {
private AmazonCloudWatch amazonCwClient;
@UriParam
private String amazonCwEndpoint;
-@UriParam
+@UriParam(label = "security", secret = true)
private String accessKey;
-@UriParam
+@UriParam(label = "security", secret = true)
private String secretKey;
@UriParam
private String name;
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" .
[camel] branch master updated (c9666fe -> 83cf524)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from c9666fe CAMEL-12151 - Camel-AWS CW: Add the ability to specify credentials and region at component level new f43488f Camel-AWS CW - accessKey and secretKey are secret new 83cf524 Camel-AWS CW - Regen docs The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: components/camel-aws/src/main/docs/aws-cw-component.adoc | 4 ++-- .../main/java/org/apache/camel/component/aws/cw/CwConfiguration.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@camel.apache.org" '].
[camel] 02/02: Camel-AWS CW - Regen docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 83cf5246234538d58fec285df8dd9836427e8435 Author: Andrea Cosentino AuthorDate: Wed Jan 17 11:54:33 2018 +0100 Camel-AWS CW - Regen docs --- components/camel-aws/src/main/docs/aws-cw-component.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-aws/src/main/docs/aws-cw-component.adoc b/components/camel-aws/src/main/docs/aws-cw-component.adoc index 079f9db..4d23515 100644 --- a/components/camel-aws/src/main/docs/aws-cw-component.adoc +++ b/components/camel-aws/src/main/docs/aws-cw-component.adoc @@ -68,18 +68,18 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *accessKey* (producer) | Amazon AWS Access Key | | String | *amazonCwClient* (producer) | To use the AmazonCloudWatch as the client | | AmazonCloudWatch | *amazonCwEndpoint* (producer) | The endpoint with which the AWS-CW client wants to work with. | | String | *name* (producer) | The metric name | | String | *proxyHost* (producer) | To define a proxy host when instantiating the CW client | | String | *proxyPort* (producer) | To define a proxy port when instantiating the CW client | | Integer | *region* (producer) | The region in which CW client needs to work | | String -| *secretKey* (producer) | Amazon AWS Secret Key | | String | *timestamp* (producer) | The metric timestamp | | Date | *unit* (producer) | The metric unit | | String | *value* (producer) | The metric value | | Double | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean +| *accessKey* (security) | Amazon AWS Access Key | | String +| *secretKey* (security) | Amazon AWS Secret Key | | String |=== // endpoint options: END -- To stop receiving notification emails like this one, please contact "commits@camel.apache.org" .
[camel] branch master updated: CAMEL-12153 Upgrade OpenTracing Java API version to 0.31
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 96b20a1 CAMEL-12153 Upgrade OpenTracing Java API version to 0.31
96b20a1 is described below
commit 96b20a1988fd858e2443ed176a5ad1346e28c466
Author: Gary Brown
AuthorDate: Wed Jan 17 12:34:54 2018 +
CAMEL-12153 Upgrade OpenTracing Java API version to 0.31
---
components/camel-opentracing/pom.xml| 6 ++
components/camel-opentracing/src/main/docs/opentracing.adoc | 3 +++
.../main/java/org/apache/camel/opentracing/OpenTracingTracer.java | 3 ++-
.../camel/opentracing/OpentracingSpanCollectorInRegistryTest.java | 4 ++--
parent/pom.xml | 6 +++---
5 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/components/camel-opentracing/pom.xml
b/components/camel-opentracing/pom.xml
index 95e79bb..5ae0830 100644
--- a/components/camel-opentracing/pom.xml
+++ b/components/camel-opentracing/pom.xml
@@ -82,6 +82,12 @@
test
+ io.opentracing
+ opentracing-util
+ ${opentracing-version}
+ test
+
+
org.apache.camel
camel-test-spring
test
diff --git a/components/camel-opentracing/src/main/docs/opentracing.adoc
b/components/camel-opentracing/src/main/docs/opentracing.adoc
index f7e0a8b..99e8c7c 100644
--- a/components/camel-opentracing/src/main/docs/opentracing.adoc
+++ b/components/camel-opentracing/src/main/docs/opentracing.adoc
@@ -3,6 +3,9 @@
*Available as of Camel 2.19*
+IMPORTANT: Starting with Camel 2.21, it will be necessary to use an
OpenTracing complaint tracer that is
+compatible with OpenTracing Java API version 0.31 or higher.
+
The camel-opentracing component is used for tracing and timing incoming and
outgoing Camel messages using http://opentracing.io/[OpenTracing].
diff --git
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
index c3395c9..776559c 100644
---
a/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
+++
b/components/camel-opentracing/src/main/java/org/apache/camel/opentracing/OpenTracingTracer.java
@@ -23,13 +23,14 @@ import java.util.Map;
import java.util.ServiceLoader;
import java.util.Set;
-import io.opentracing.NoopTracerFactory;
import io.opentracing.Span;
import io.opentracing.Tracer;
import io.opentracing.Tracer.SpanBuilder;
import io.opentracing.contrib.tracerresolver.TracerResolver;
+import io.opentracing.noop.NoopTracerFactory;
import io.opentracing.propagation.Format;
import io.opentracing.tag.Tags;
+
import org.apache.camel.CamelContext;
import org.apache.camel.CamelContextAware;
import org.apache.camel.Endpoint;
diff --git
a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
index e2c8f18..1749f2f 100644
---
a/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
+++
b/components/camel-opentracing/src/test/java/org/apache/camel/opentracing/OpentracingSpanCollectorInRegistryTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.camel.opentracing;
-import io.opentracing.NoopTracer;
-import io.opentracing.NoopTracerFactory;
+import io.opentracing.noop.NoopTracer;
+import io.opentracing.noop.NoopTracerFactory;
import org.apache.camel.CamelContext;
import org.apache.camel.impl.JndiRegistry;
diff --git a/parent/pom.xml b/parent/pom.xml
index bb323f8..20b9b54 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -542,9 +542,9 @@
2.7.0.Final
3.0.2
17.0
-0.1.0
-0.30.0
-
0.1.0
+0.2.0
+0.31.0
+
0.1.4
1.5.0
7.3.0.Final
2.0.8_6
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" '].
[camel] 02/03: Camel AWS DDB - secretKey and accessKey are secret
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 65746540eec0b6fa1984bbd922f06ddee473e880
Author: Andrea Cosentino
AuthorDate: Wed Jan 17 16:19:15 2018 +0100
Camel AWS DDB - secretKey and accessKey are secret
---
.../java/org/apache/camel/component/aws/ddb/DdbConfiguration.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
index 352b2a8..cecd2c5 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbConfiguration.java
@@ -29,9 +29,9 @@ public class DdbConfiguration implements Cloneable {
@UriPath @Metadata(required = "true")
private String tableName;
-@UriParam
+@UriParam(label = "security", secret = true)
private String accessKey;
-@UriParam
+@UriParam(label = "security", secret = true)
private String secretKey;
@UriParam
private AmazonDynamoDB amazonDDBClient;
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" .
[camel] 03/03: Camel AWS DDB - Regen docs
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 86d407b942556d902dd8b0ebe795147887d03a67 Author: Andrea Cosentino AuthorDate: Wed Jan 17 16:21:33 2018 +0100 Camel AWS DDB - Regen docs --- components/camel-aws/src/main/docs/aws-ddb-component.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/camel-aws/src/main/docs/aws-ddb-component.adoc b/components/camel-aws/src/main/docs/aws-ddb-component.adoc index 59eb6d2..5ddc69d 100644 --- a/components/camel-aws/src/main/docs/aws-ddb-component.adoc +++ b/components/camel-aws/src/main/docs/aws-ddb-component.adoc @@ -65,7 +65,6 @@ with the following path and query parameters: [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type -| *accessKey* (producer) | Amazon AWS Access Key | | String | *amazonDDBClient* (producer) | To use the AmazonDynamoDB as the client | | AmazonDynamoDB | *amazonDdbEndpoint* (producer) | The endpoint with which the AWS-DDB client wants to work with. | | String | *consistentRead* (producer) | Determines whether or not strong consistency should be enforced when data is read. | false | boolean @@ -76,9 +75,10 @@ with the following path and query parameters: | *proxyPort* (producer) | To define a proxy port when instantiating the DDB client | | Integer | *readCapacity* (producer) | The provisioned throughput to reserve for reading resources from your table | | Long | *region* (producer) | The region in which DDB client needs to work | | String -| *secretKey* (producer) | Amazon AWS Secret Key | | String | *writeCapacity* (producer) | The provisioned throughput to reserved for writing resources to your table | | Long | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). | false | boolean +| *accessKey* (security) | Amazon AWS Access Key | | String +| *secretKey* (security) | Amazon AWS Secret Key | | String |=== // endpoint options: END -- To stop receiving notification emails like this one, please contact "commits@camel.apache.org" .
[camel] branch master updated (96b20a1 -> 86d407b)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 96b20a1 CAMEL-12153 Upgrade OpenTracing Java API version to 0.31
new 54a7982 CAMEL-12152 - Camel-AWS DDB: Add the ability to specify
credentials and region at component level
new 6574654 Camel AWS DDB - secretKey and accessKey are secret
new 86d407b Camel AWS DDB - Regen docs
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../camel-aws/src/main/docs/aws-ddb-component.adoc | 18 +-
.../camel/component/aws/ddb/DdbComponent.java | 67 ++-
.../camel/component/aws/ddb/DdbConfiguration.java | 19 +-
.../DdbComponentConfigurationTest.java}| 19 +-
.../ddb/springboot/DdbComponentConfiguration.java | 218 +
5 files changed, 325 insertions(+), 16 deletions(-)
copy
components/camel-aws/src/test/java/org/apache/camel/component/aws/{swf/SWFComponentConfigurationTest.java
=> ddb/DdbComponentConfigurationTest.java} (73%)
--
To stop receiving notification emails like this one, please contact
['"commits@camel.apache.org" '].
[camel] 01/03: CAMEL-12152 - Camel-AWS DDB: Add the ability to specify credentials and region at component level
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 54a79828eb329eb4786026279c2b5fda383a5aaf
Author: Andrea Cosentino
AuthorDate: Wed Jan 17 16:18:41 2018 +0100
CAMEL-12152 - Camel-AWS DDB: Add the ability to specify credentials and
region at component level
---
.../camel-aws/src/main/docs/aws-ddb-component.adoc | 14 +-
.../camel/component/aws/ddb/DdbComponent.java | 67 ++-
.../camel/component/aws/ddb/DdbConfiguration.java | 15 +-
.../aws/ddb/DdbComponentConfigurationTest.java | 52 +
.../ddb/springboot/DdbComponentConfiguration.java | 218 +
5 files changed, 363 insertions(+), 3 deletions(-)
diff --git a/components/camel-aws/src/main/docs/aws-ddb-component.adoc
b/components/camel-aws/src/main/docs/aws-ddb-component.adoc
index cc3145b..59eb6d2 100644
--- a/components/camel-aws/src/main/docs/aws-ddb-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-ddb-component.adoc
@@ -25,7 +25,19 @@ You can append query options to the URI in the following
format,
// component options: START
-The AWS DynamoDB component has no options.
+The AWS DynamoDB component supports 5 options which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *configuration* (advanced) | The AWS DDB default configuration | |
DdbConfiguration
+| *accessKey* (producer) | Amazon AWS Access Key | | String
+| *secretKey* (producer) | Amazon AWS Secret Key | | String
+| *region* (producer) | The region in which DDB client needs to work | |
String
+| *resolveProperty Placeholders* (advanced) | Whether the component should
resolve property placeholders on itself when starting. Only properties which
are of String type can use property placeholders. | true | boolean
+|===
// component options: END
diff --git
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
index a49fae1..91c18a3 100644
---
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
+++
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/ddb/DdbComponent.java
@@ -21,9 +21,20 @@ import java.util.Map;
import org.apache.camel.CamelContext;
import org.apache.camel.Endpoint;
import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.ObjectHelper;
public class DdbComponent extends DefaultComponent {
+@Metadata
+private String accessKey;
+@Metadata
+private String secretKey;
+@Metadata
+private String region;
+@Metadata(label = "advanced")
+private DdbConfiguration configuration;
+
public DdbComponent() {
this(null);
}
@@ -31,11 +42,12 @@ public class DdbComponent extends DefaultComponent {
public DdbComponent(CamelContext context) {
super(context);
+this.configuration = new DdbConfiguration();
registerExtension(new DdbComponentVerifierExtension());
}
protected Endpoint createEndpoint(String uri, String remaining,
Map parameters) throws Exception {
-DdbConfiguration configuration = new DdbConfiguration();
+DdbConfiguration configuration = this.configuration.copy();
setProperties(configuration, parameters);
if (remaining == null || remaining.trim().length() == 0) {
@@ -43,6 +55,15 @@ public class DdbComponent extends DefaultComponent {
}
configuration.setTableName(remaining);
+if (ObjectHelper.isEmpty(configuration.getAccessKey())) {
+setAccessKey(accessKey);
+}
+if (ObjectHelper.isEmpty(configuration.getSecretKey())) {
+setSecretKey(secretKey);
+}
+if (ObjectHelper.isEmpty(configuration.getRegion())) {
+setRegion(region);
+}
if (configuration.getAmazonDDBClient() == null &&
(configuration.getAccessKey() == null || configuration.getSecretKey() == null))
{
throw new IllegalArgumentException("amazonDDBClient or accessKey
and secretKey must be specified");
}
@@ -50,4 +71,48 @@ public class DdbComponent extends DefaultComponent {
DdbEndpoint endpoint = new DdbEndpoint(uri, this, configuration);
return endpoint;
}
+
+public DdbConfiguration getConfiguration() {
+return configuration;
+}
+
+/**
+ * The AWS DDB default configuration
+ */
+public void setConfiguration(DdbConfiguration configuration) {
+this.configuration = configuration;
+}
+
+public String getAccessKey() {
+return configuration.getAccessKey();
+}
+
+/**
+ * Amazon AWS Access Key
+ */
+public void setAccessKey(String accessKey) {
[camel] branch master updated: Upgrade Kotlin
This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new ce4e54e Upgrade Kotlin ce4e54e is described below commit ce4e54ed594dbea4859f105b9ea34f32aa892628 Author: Claus Ibsen AuthorDate: Wed Jan 17 16:43:54 2018 +0100 Upgrade Kotlin --- examples/camel-example-kotlin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/camel-example-kotlin/pom.xml b/examples/camel-example-kotlin/pom.xml index bda991f..4c2f455 100644 --- a/examples/camel-example-kotlin/pom.xml +++ b/examples/camel-example-kotlin/pom.xml @@ -35,7 +35,7 @@ Other Languages -1.2.0 +1.2.20 -- To stop receiving notification emails like this one, please contact ['"commits@camel.apache.org" '].
[camel] 01/02: Upgrade Rabbitmq Amqp client to version 5.1.2
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 36084422a6ae6779d56d9c746a1d06b1685e7f03 Author: Andrea Cosentino AuthorDate: Thu Jan 18 07:35:27 2018 +0100 Upgrade Rabbitmq Amqp client to version 5.1.2 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 20b9b54..8bac2e7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -573,7 +573,7 @@ [1.8,2) 2.3.0 2.0.0 -5.1.1 +5.1.2 1.0.0 3.0.7.RELEASE 0.9.11 -- To stop receiving notification emails like this one, please contact "commits@camel.apache.org" .
[camel] 02/02: Upgrade Atmosphere to version 2.4.19
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git commit 4f091b10178a0d78aa6bed0f4eec442e19798883 Author: Andrea Cosentino AuthorDate: Thu Jan 18 07:40:26 2018 +0100 Upgrade Atmosphere to version 2.4.19 --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 8bac2e7..fedf965 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -69,7 +69,7 @@ 1.0.0-final 1.0.0-final_1 2.2.2 -2.4.18 +2.4.19 [2.4,3.0) 1.0.8 1.2.1 -- To stop receiving notification emails like this one, please contact "commits@camel.apache.org" .
[camel] branch master updated (ce4e54e -> 4f091b1)
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/camel.git. from ce4e54e Upgrade Kotlin new 3608442 Upgrade Rabbitmq Amqp client to version 5.1.2 new 4f091b1 Upgrade Atmosphere to version 2.4.19 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: parent/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact ['"commits@camel.apache.org" '].
[camel] branch master updated: Upgrade Undertow to version 1.4.22.Final
This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git The following commit(s) were added to refs/heads/master by this push: new a5ef1d2 Upgrade Undertow to version 1.4.22.Final a5ef1d2 is described below commit a5ef1d27335b7e0cab76e1e5eb0a8e24fb66444d Author: Andrea Cosentino AuthorDate: Thu Jan 18 07:57:12 2018 +0100 Upgrade Undertow to version 1.4.22.Final --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index fedf965..7467547 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -689,7 +689,7 @@ 4.0.6_1 4.0.6 1.3.0.Final -1.4.21.Final +1.4.22.Final 2.3.1 2015-01-27T15-02-14 1.0.0 -- To stop receiving notification emails like this one, please contact ['"commits@camel.apache.org" '].
