You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2018/01/11 08:36:29 UTC
[camel] 02/02: CAMEL-11665: fix configuration and documentation
This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit fd1fbd3bf7f1d6bca9b8c30703645dcb3f4c1f55
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Thu Jan 11 08:18:32 2018 +0100
CAMEL-11665: fix configuration and documentation
---
camel-core/readme.adoc | 2 +-
camel-core/src/main/docs/saga-component.adoc | 2 --
camel-core/src/main/java/org/apache/camel/Exchange.java | 3 ++-
.../java/org/apache/camel/component/saga/SagaEndpoint.java | 4 ++--
.../org/apache/camel/model/SagaActionUriDefinition.java | 2 +-
components/readme.adoc | 13 ++++++++++---
.../saga/springboot/SagaComponentConfiguration.java | 3 ++-
7 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/camel-core/readme.adoc b/camel-core/readme.adoc
index 50eee0e..d84141c 100644
--- a/camel-core/readme.adoc
+++ b/camel-core/readme.adoc
@@ -64,7 +64,7 @@ Number of Components: 26 in 1 JAR artifacts (1 deprecated)
`rest-api:path/contextIdPattern` | 2.16 | The rest-api component is used for providing Swagger API of the REST services which has been defined using the rest-dsl in Camel.
| link:src/main/docs/saga-component.adoc[Saga] (camel-core) +
-`saga:action` | 2.21 | The default saga endpoint.
+`saga:action` | 2.21 | The saga component provides access to advanced options for managing the flow in the Saga EIP.
| link:src/main/docs/scheduler-component.adoc[Scheduler] (camel-core) +
`scheduler:name` | 2.15 | The scheduler component is used for generating message exchanges when a scheduler fires.
diff --git a/camel-core/src/main/docs/saga-component.adoc b/camel-core/src/main/docs/saga-component.adoc
index 2610f4b..b0ead4c 100644
--- a/camel-core/src/main/docs/saga-component.adoc
+++ b/camel-core/src/main/docs/saga-component.adoc
@@ -16,8 +16,6 @@ Refer to the Saga EIP documentation for help on using sagas in common scenarios.
saga:action
----
-Where *`action`* can be ...
-
=== Options
// component options: START
diff --git a/camel-core/src/main/java/org/apache/camel/Exchange.java b/camel-core/src/main/java/org/apache/camel/Exchange.java
index f3e3774..3ec0fea 100644
--- a/camel-core/src/main/java/org/apache/camel/Exchange.java
+++ b/camel-core/src/main/java/org/apache/camel/Exchange.java
@@ -170,7 +170,8 @@ public interface Exchange {
String LOOP_INDEX = "CamelLoopIndex";
String LOOP_SIZE = "CamelLoopSize";
- // Long running action (saga)
+ // Long running action (saga): using "Long-Running-Action" as header value allows sagas
+ // to be propagated to any remote system supporting the LRA framework
String SAGA_LONG_RUNNING_ACTION = "Long-Running-Action";
String MAXIMUM_CACHE_POOL_SIZE = "CamelMaximumCachePoolSize";
diff --git a/camel-core/src/main/java/org/apache/camel/component/saga/SagaEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/saga/SagaEndpoint.java
index 96cd167..a0f3114 100644
--- a/camel-core/src/main/java/org/apache/camel/component/saga/SagaEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/saga/SagaEndpoint.java
@@ -26,7 +26,7 @@ import org.apache.camel.spi.UriPath;
import org.apache.camel.util.ObjectHelper;
/**
- * The default saga endpoint.
+ * The saga component provides access to advanced options for managing the flow in the Saga EIP.
*/
@UriEndpoint(firstVersion = "2.21.0", scheme = "saga", title = "Saga", syntax = "saga:action", producerOnly = true, label = "core,endpoint")
public class SagaEndpoint extends DefaultEndpoint {
@@ -63,7 +63,7 @@ public class SagaEndpoint extends DefaultEndpoint {
@Override
public boolean isSingleton() {
- return false;
+ return true;
}
}
diff --git a/camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java b/camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
index 39a080e..cb3cefa 100644
--- a/camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/SagaActionUriDefinition.java
@@ -24,7 +24,7 @@ import org.apache.camel.spi.Metadata;
import org.apache.camel.util.ObjectHelper;
/**
- * Allows to declare saga actions e.g. to complete or compensate a saga
+ * Allows to declare saga actions to complete or compensate a saga
*
*/
@Metadata(label = "eip,routing")
diff --git a/components/readme.adoc b/components/readme.adoc
index b314f3c..8847e47 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
^^^^^^^^^^
// components: START
-Number of Components: 287 in 197 JAR artifacts (19 deprecated)
+Number of Components: 288 in 197 JAR artifacts (19 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -80,6 +80,9 @@ Number of Components: 287 in 197 JAR artifacts (19 deprecated)
| link:camel-aws/src/main/docs/aws-lambda-component.adoc[AWS Lambda] (camel-aws) +
`aws-lambda:function` | 2.20 | The aws-lambda is used for managing and invoking functions from Amazon Lambda.
+| link:camel-aws/src/main/docs/aws-mq-component.adoc[AWS MQ] (camel-aws) +
+`aws-mq:label` | 2.21 | The aws-mq is used for managing Amazon MQ instances.
+
| link:camel-aws/src/main/docs/aws-s3-component.adoc[AWS S3 Storage Service] (camel-aws) +
`aws-s3:bucketNameOrArn` | 2.8 | The aws-s3 component is used for storing and retrieving objecct from Amazon S3 Storage Service.
@@ -687,7 +690,7 @@ Number of Components: 287 in 197 JAR artifacts (19 deprecated)
`rss:feedUri` | 2.0 | The rss component is used for consuming RSS feeds.
| link:../camel-core/src/main/docs/saga-component.adoc[Saga] (camel-core) +
-`saga:action` | 2.21 | The default saga endpoint.
+`saga:action` | 2.21 | The saga component provides access to advanced options for managing the flow in the Saga EIP.
| link:camel-salesforce/camel-salesforce-component/src/main/docs/salesforce-component.adoc[Salesforce] (camel-salesforce) +
`salesforce:operationName:topicName` | 2.12 | The salesforce component is used for integrating Camel with the massive Salesforce API.
@@ -1047,7 +1050,7 @@ Miscellaneous Components
^^^^^^^^^^^^^^^^^^^^^^^^
// others: START
-Number of Miscellaneous Components: 39 in 39 JAR artifacts (13 deprecated)
+Number of Miscellaneous Components: 41 in 41 JAR artifacts (14 deprecated)
[width="100%",cols="4,1,5",options="header"]
|===
@@ -1101,10 +1104,14 @@ Number of Miscellaneous Components: 39 in 39 JAR artifacts (13 deprecated)
| link:camel-spring-boot/src/main/docs/spring-boot.adoc[Spring Boot] (camel-spring-boot) | 2.15 | Using Camel with Spring Boot
+| link:camel-spring-boot2/src/main/docs/spring-boot2.adoc[Spring Boot2] (camel-spring-boot2) | 2.20 | Using Camel with Spring Boot 2 (work in progress)
+
| link:camel-spring-cloud/src/main/docs/spring-cloud.adoc[Spring Cloud] (camel-spring-cloud) | 2.19 | Camel Cloud integration with Spring Cloud
| link:camel-spring-cloud-netflix/src/main/docs/spring-cloud-netflix.adoc[Spring Cloud Netflix] (camel-spring-cloud-netflix) | 2.19 | Camel Cloud integration with Spring Cloud Netflix
+| link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring DM] (camel-spring-dm) | 2.18 | *deprecated* Camel SpringDM (OSGi) XML DSL
+
| link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Java Configuration] (camel-spring-javaconfig) | 2.0 | Using Camel with Spring Java Configuration
| link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3 | Security using Spring Security
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentConfiguration.java
index bc67138..7050359 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentConfiguration.java
@@ -21,7 +21,8 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * The default saga endpoint.
+ * The saga component provides access to advanced options for managing the flow
+ * in the Saga EIP.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
--
To stop receiving notification emails like this one, please contact
"commits@camel.apache.org" <co...@camel.apache.org>.