You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2020/02/07 12:31:00 UTC
[camel] branch master updated (b4994db -> 379a2c4)
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 b4994db CAMEL-14518 - Create an AWS-EC2 component based on SDK v2, fixed CS
new fe1b42e Camel-AWS2-EC2: Added a note about OSGi support
new cc0689f Regen docs
new 9266dcb Camel-AWS2-EC2: Changed some descriptions
new 379a2c4 Regen again
The 4 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:
.../resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json | 2 +-
components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc | 7 ++++++-
.../java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java | 2 +-
.../java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java | 2 +-
.../java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java | 2 +-
.../apache/camel/builder/component/ComponentsBuilderFactory.java | 2 +-
.../builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java | 4 ++--
core/camel-componentdsl/src/generated/resources/metadata.json | 2 +-
docs/components/modules/ROOT/pages/aws2-ec2-component.adoc | 7 ++++++-
docs/components/modules/ROOT/pages/index.adoc | 2 +-
10 files changed, 21 insertions(+), 11 deletions(-)
[camel] 04/04: Regen again
Posted by ac...@apache.org.
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 379a2c4cf692108720d7d144d4418f4145304cb8
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 7 13:30:26 2020 +0100
Regen again
---
docs/components/modules/ROOT/pages/index.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index 8096781..b98e1b2 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -48,7 +48,7 @@ Number of Components: 320 in 258 JAR artifacts (1 deprecated)
| xref:aws2-cw-component.adoc[AWS 2 CloudWatch] (camel-aws2-cw) | 3.1 | The aws2-cw component is used for sending metrics to an Amazon CloudWatch.
-| xref:aws2-ec2-component.adoc[AWS 2 EC2] (camel-aws2-ec2) | 3.1 | The aws-ec2 is used for managing Amazon EC2 instances.
+| xref:aws2-ec2-component.adoc[AWS 2 EC2] (camel-aws2-ec2) | 3.1 | The aws2-ec2 is used for managing Amazon EC2 instances.
| xref:aws2-ecs-component.adoc[AWS 2 ECS] (camel-aws2-ecs) | 3.1 | The aws2-ecs is used for managing Amazon ECS
[camel] 03/04: Camel-AWS2-EC2: Changed some descriptions
Posted by ac...@apache.org.
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 9266dcbd98eba68fe68674c91a00b171e73d2671
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 7 13:13:43 2020 +0100
Camel-AWS2-EC2: Changed some descriptions
---
.../resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json | 2 +-
.../java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java | 2 +-
.../java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java | 2 +-
.../java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java | 2 +-
.../org/apache/camel/builder/component/ComponentsBuilderFactory.java | 2 +-
.../camel/builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java | 4 ++--
core/camel-componentdsl/src/generated/resources/metadata.json | 2 +-
7 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/components/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json b/components/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
index 67310c3..0d11dbd 100644
--- a/components/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
+++ b/components/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
@@ -5,7 +5,7 @@
"extendsScheme": "",
"syntax": "aws2-ec2:label",
"title": "AWS 2 EC2",
- "description": "The aws-ec2 is used for managing Amazon EC2 instances.",
+ "description": "The aws2-ec2 is used for managing Amazon EC2 instances.",
"label": "cloud,management",
"deprecated": false,
"async": false,
diff --git a/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java b/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java
index 4f3fdf7..966ae24 100644
--- a/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java
+++ b/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Component.java
@@ -27,7 +27,7 @@ import org.apache.camel.support.DefaultComponent;
import software.amazon.awssdk.services.ec2.Ec2Client;
/**
- * For working with Amazon's Elastic Compute Cloud (EC2).
+ * For working with Amazon's Elastic Compute Cloud (EC2) SDK v2.
*/
@Component("aws2-ec2")
public class AWS2EC2Component extends DefaultComponent {
diff --git a/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java b/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java
index 5c79a38..2e4bddb 100644
--- a/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java
+++ b/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java
@@ -17,7 +17,7 @@
package org.apache.camel.component.aws2.ec2;
/**
- * Constants used in Camel AWS EC2 module
+ * Constants used in Camel AWS EC2 module SDK v2
*/
public interface AWS2EC2Constants {
diff --git a/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java b/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java
index c61eae7..a04c9fc 100644
--- a/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java
+++ b/components/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Endpoint.java
@@ -35,7 +35,7 @@ import software.amazon.awssdk.services.ec2.Ec2Client;
import software.amazon.awssdk.services.ec2.Ec2ClientBuilder;
/**
- * The aws-ec2 is used for managing Amazon EC2 instances.
+ * The aws2-ec2 is used for managing Amazon EC2 instances.
*/
@UriEndpoint(firstVersion = "3.1.0", scheme = "aws2-ec2", title = "AWS 2 EC2", syntax = "aws2-ec2:label", producerOnly = true, label = "cloud,management")
public class AWS2EC2Endpoint extends ScheduledPollEndpoint {
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 10d6f42..3b65f6c 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -474,7 +474,7 @@ public interface ComponentsBuilderFactory {
}
/**
* AWS 2 EC2 (camel-aws2-ec2)
- * The aws-ec2 is used for managing Amazon EC2 instances.
+ * The aws2-ec2 is used for managing Amazon EC2 instances.
*
* Category: cloud,management
* Since: 3.1
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java
index 8c8f981..1bdc988 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/Aws2Ec2ComponentBuilderFactory.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.component.ComponentBuilder;
import org.apache.camel.component.aws2.ec2.AWS2EC2Component;
/**
- * The aws-ec2 is used for managing Amazon EC2 instances.
+ * The aws2-ec2 is used for managing Amazon EC2 instances.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -32,7 +32,7 @@ public interface Aws2Ec2ComponentBuilderFactory {
/**
* AWS 2 EC2 (camel-aws2-ec2)
- * The aws-ec2 is used for managing Amazon EC2 instances.
+ * The aws2-ec2 is used for managing Amazon EC2 instances.
*
* Category: cloud,management
* Since: 3.1
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index 2df3351..bbfd504 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -387,7 +387,7 @@
"extendsScheme": "",
"syntax": "aws2-ec2:label",
"title": "AWS 2 EC2",
- "description": "The aws-ec2 is used for managing Amazon EC2 instances.",
+ "description": "The aws2-ec2 is used for managing Amazon EC2 instances.",
"label": "cloud,management",
"deprecated": false,
"deprecationNote": "cloud,management",
[camel] 01/04: Camel-AWS2-EC2: Added a note about OSGi support
Posted by ac...@apache.org.
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 fe1b42eabd985ac42be89f07f8d59e7aa1a38fe4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 7 13:04:16 2020 +0100
Camel-AWS2-EC2: Added a note about OSGi support
---
components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc b/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
index c75594d..39a5ea3 100644
--- a/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
+++ b/components/camel-aws2-ec2/src/main/docs/aws2-ec2-component.adoc
@@ -16,6 +16,11 @@ You must have a valid Amazon Web Services developer account, and be
signed up to use Amazon EC2. More information is available at
https://aws.amazon.com/ec2/[Amazon EC2].
+[NOTE]
+====
+The AWS2 EC2 component is not supported in OSGI
+====
+
== URI Format
[source,java]
@@ -179,4 +184,4 @@ Maven users will need to add the following dependency to their pom.xml.
</dependency>
---------------------------------------
-where `$\{camel-version\}` must be replaced by the actual version of Camel.
\ No newline at end of file
+where `$\{camel-version\}` must be replaced by the actual version of Camel.
[camel] 02/04: Regen docs
Posted by ac...@apache.org.
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 cc0689f7b508d9abc726abccd133779b4e7757bb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Feb 7 13:05:10 2020 +0100
Regen docs
---
docs/components/modules/ROOT/pages/aws2-ec2-component.adoc | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc b/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
index 095558d..5e5961c 100644
--- a/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-ec2-component.adoc
@@ -17,6 +17,11 @@ You must have a valid Amazon Web Services developer account, and be
signed up to use Amazon EC2. More information is available at
https://aws.amazon.com/ec2/[Amazon EC2].
+[NOTE]
+====
+The AWS2 EC2 component is not supported in OSGI
+====
+
== URI Format
[source,java]
@@ -180,4 +185,4 @@ Maven users will need to add the following dependency to their pom.xml.
</dependency>
---------------------------------------
-where `$\{camel-version\}` must be replaced by the actual version of Camel.
\ No newline at end of file
+where `$\{camel-version\}` must be replaced by the actual version of Camel.