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 d61d0948ca56f11ff33c24d988af745336431f89
Author: nayananga@acerubuntu18.04 <nayanangamuhandi...@gmail.com>
AuthorDate: Fri Jun 28 19:19:43 2019 +0530
fix on S3Configuration.java
---
.../camel-aws-s3/src/main/docs/aws-s3-component.adoc | 2 +-
.../apache/camel/component/aws/s3/S3Configuration.java | 2 +-
.../builder/endpoint/dsl/S3EndpointBuilderFactory.java | 18 ++++++------------
.../modules/ROOT/pages/aws-s3-component.adoc | 2 +-
docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc | 2 +-
.../user-manual/modules/ROOT/pages/resequence-eip.adoc | 2 +-
.../aws/s3/springboot/S3ComponentConfiguration.java | 3 +--
7 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
index 326ee71..dae4ec8 100644
--- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
@@ -87,7 +87,7 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.s3.AmazonS3 in the xref:registry.adocRegistry. | |
AmazonS3
+| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry. | | AmazonS3
| *autoCreateBucket* (common) | Setting the autocreation of the bucket | true
| boolean
| *pathStyleAccess* (common) | Whether or not the S3 client should use path
style access | false | boolean
| *policy* (common) | The policy for this queue to set in the
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | | String
diff --git
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
index 3bbba43..b43f64e 100644
---
a/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
+++
b/components/camel-aws-s3/src/main/java/org/apache/camel/component/aws/s3/S3Configuration.java
@@ -143,7 +143,7 @@ public class S3Configuration implements Cloneable {
/**
* Reference to a `com.amazonaws.services.s3.AmazonS3` in the
- * xref:registry.adoc[Registry].
+ * registry.
*/
public void setAmazonS3Client(AmazonS3 amazonS3Client) {
this.amazonS3Client = amazonS3Client;
diff --git
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
index 2ae0412..8643694 100644
---
a/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
+++
b/core/camel-endpointdsl/src/main/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
@@ -58,8 +58,7 @@ public interface S3EndpointBuilderFactory {
return this;
}
/**
- * Reference to a com.amazonaws.services.s3.AmazonS3 in the
- * xref:registry.adocRegistry.
+ * Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.
* The option is a <code>com.amazonaws.services.s3.AmazonS3</code>
type.
* @group common
*/
@@ -68,8 +67,7 @@ public interface S3EndpointBuilderFactory {
return this;
}
/**
- * Reference to a com.amazonaws.services.s3.AmazonS3 in the
- * xref:registry.adocRegistry.
+ * Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.
* The option will be converted to a
* <code>com.amazonaws.services.s3.AmazonS3</code> type.
* @group common
@@ -1014,8 +1012,7 @@ public interface S3EndpointBuilderFactory {
return this;
}
/**
- * Reference to a com.amazonaws.services.s3.AmazonS3 in the
- * xref:registry.adocRegistry.
+ * Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.
* The option is a <code>com.amazonaws.services.s3.AmazonS3</code>
type.
* @group common
*/
@@ -1024,8 +1021,7 @@ public interface S3EndpointBuilderFactory {
return this;
}
/**
- * Reference to a com.amazonaws.services.s3.AmazonS3 in the
- * xref:registry.adocRegistry.
+ * Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.
* The option will be converted to a
* <code>com.amazonaws.services.s3.AmazonS3</code> type.
* @group common
@@ -1547,8 +1543,7 @@ public interface S3EndpointBuilderFactory {
return this;
}
/**
- * Reference to a com.amazonaws.services.s3.AmazonS3 in the
- * xref:registry.adocRegistry.
+ * Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.
* The option is a <code>com.amazonaws.services.s3.AmazonS3</code>
type.
* @group common
*/
@@ -1557,8 +1552,7 @@ public interface S3EndpointBuilderFactory {
return this;
}
/**
- * Reference to a com.amazonaws.services.s3.AmazonS3 in the
- * xref:registry.adocRegistry.
+ * Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.
* The option will be converted to a
* <code>com.amazonaws.services.s3.AmazonS3</code> type.
* @group common
diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
index 326ee71..dae4ec8 100644
--- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
@@ -87,7 +87,7 @@ with the following path and query parameters:
[width="100%",cols="2,5,^1,2",options="header"]
|===
| Name | Description | Default | Type
-| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.s3.AmazonS3 in the xref:registry.adocRegistry. | |
AmazonS3
+| *amazonS3Client* (common) | Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry. | | AmazonS3
| *autoCreateBucket* (common) | Setting the autocreation of the bucket | true
| boolean
| *pathStyleAccess* (common) | Whether or not the S3 client should use path
style access | false | boolean
| *policy* (common) | The policy for this queue to set in the
com.amazonaws.services.s3.AmazonS3#setBucketPolicy() method. | | String
diff --git a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
index 7bdc23d..7b3082e 100644
--- a/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/aggregate-eip.adoc
@@ -2,7 +2,7 @@
== Aggregate EIP
The
-http://www.enterpriseintegrationpatterns.com/Aggregator.adoc[Aggregator]
+http://www.enterpriseintegrationpatterns.com/Aggregator.html[Aggregator]
from the xref:enterprise-integration-patterns.adoc[EIP patterns] allows
you to combine a number of messages together into a single message.
diff --git a/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
b/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
index 269b7e7..ef21a75 100644
--- a/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
+++ b/docs/user-manual/modules/ROOT/pages/resequence-eip.adoc
@@ -1,7 +1,7 @@
[[resequence-eip]]
== Resequence EIP
-The http://www.enterpriseintegrationpatterns.com/Resequencer.html[Resequencer]
from the https://camel.apache.org/enterprise-integration-patterns.adoc[EIP
patterns] allows you to reorganise messages based on some comparator. +
+The http://www.enterpriseintegrationpatterns.com/Resequencer.html[Resequencer]
from the https://camel.apache.org/enterprise-integration-patterns.html[EIP
patterns] allows you to reorganise messages based on some comparator. +
By default in Camel we use an Expression to create the comparator; so that you
can compare by a message header or the body or a piece of a message etc.
image:http://www.enterpriseintegrationpatterns.com/img/Resequencer.gif[image]
diff --git
a/platforms/spring-boot/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
index 679bc07..3517759 100644
---
a/platforms/spring-boot/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-aws-s3-starter/src/main/java/org/apache/camel/component/aws/s3/springboot/S3ComponentConfiguration.java
@@ -140,8 +140,7 @@ public class S3ComponentConfiguration
*/
private String secretKey;
/**
- * Reference to a `com.amazonaws.services.s3.AmazonS3` in the
- * xref:registry.adoc[Registry].
+ * Reference to a `com.amazonaws.services.s3.AmazonS3` in the registry.
*/
private AmazonS3 amazonS3Client;
/**
