You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2017/03/08 09:06:39 UTC
[1/2] camel git commit: Component doc
Repository: camel
Updated Branches:
refs/heads/master 584111a94 -> 6407919bb
Component doc
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/42b9e9c1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/42b9e9c1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/42b9e9c1
Branch: refs/heads/master
Commit: 42b9e9c1547bd4c8b0f8e8ef3fe82854c1c7d85e
Parents: 584111a
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 8 10:01:24 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 8 10:01:24 2017 +0100
----------------------------------------------------------------------
.../camel-box-component/src/main/docs/box-component.adoc | 4 ++--
.../main/java/org/apache/camel/component/box/BoxEndpoint.java | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/42b9e9c1/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
index 9d2bee5..2a1102c 100644
--- a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
+++ b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
@@ -1,6 +1,6 @@
## Box Component
-*Available as of Camel version *
+*Available as of Camel version 2.14*
The Box component provides access to all of the Box.com APIs accessible
using https://github.com/box/box-java-sdk/[box-java-sdk]. It
@@ -800,4 +800,4 @@ as follows:
.setHeader("CamelBox.output", header("output"))
.to("box://files/download")
.to("file://...");
--------------------------------------------------------
+-------------------------------------------------------
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/42b9e9c1/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
index b406c95..e033839 100644
--- a/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
+++ b/components/camel-box/camel-box-component/src/main/java/org/apache/camel/component/box/BoxEndpoint.java
@@ -46,7 +46,8 @@ import org.apache.camel.util.component.ApiMethodPropertiesHelper;
/**
* For uploading downloading and managing files folders groups collaborations etc on box DOT com.
*/
-@UriEndpoint(scheme = "box", title = "Box", syntax = "box:apiName/methodName", consumerClass = BoxConsumer.class, consumerPrefix = "consumer", label = "api,file,cloud", lenientProperties = true)
+@UriEndpoint(firstVersion = "2.14.0", scheme = "box", title = "Box", syntax = "box:apiName/methodName",
+ consumerClass = BoxConsumer.class, consumerPrefix = "consumer", label = "api,file,cloud", lenientProperties = true)
public class BoxEndpoint extends AbstractApiEndpoint<BoxApiName, BoxConfiguration> {
@UriParam
[2/2] camel git commit: Component docs
Posted by da...@apache.org.
Component docs
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6407919b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6407919b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6407919b
Branch: refs/heads/master
Commit: 6407919bbe503ecae0ded4767b844132a8413dee
Parents: 42b9e9c
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 8 10:05:59 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 8 10:05:59 2017 +0100
----------------------------------------------------------------------
components/readme.adoc | 9 +++++----
docs/user-manual/en/SUMMARY.md | 2 +-
.../camel/maven/packaging/PrepareCatalogKarafMojo.java | 1 +
.../apache/camel/maven/packaging/PrepareCatalogMojo.java | 5 ++++-
.../camel/maven/packaging/PrepareCatalogSpringBootMojo.java | 1 +
5 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6407919b/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 3e1c5a1..0a305b3 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
^^^^^^^^^^
// components: START
-Number of Components: 220 in 174 JAR artifacts (13 deprecated)
+Number of Components: 221 in 175 JAR artifacts (13 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
@@ -98,6 +98,9 @@ Number of Components: 220 in 174 JAR artifacts (13 deprecated)
| link:camel-bonita/src/main/docs/bonita-component.adoc[Bonita] (camel-bonita) +
`bonita:operation` | 2.19 | Camel Bonita support
+| link:camel-box/src/main/docs/box-component.adoc[Box] (camel-box) +
+`box:apiName/methodName` | 2.14 | For uploading downloading and managing files folders groups collaborations etc on box DOT com.
+
| link:camel-braintree/src/main/docs/braintree-component.adoc[Braintree] (camel-braintree) +
`braintree:apiName/methodName` | 2.17 | The braintree component is used for integrating with the Braintree Payment System.
@@ -840,7 +843,7 @@ Miscellaneous Components
^^^^^^^^^^^^^^^^^^^^^^^^
// others: START
-Number of Miscellaneous Components: 37 in 37 JAR artifacts (12 deprecated)
+Number of Miscellaneous Components: 36 in 36 JAR artifacts (12 deprecated)
[width="100%",cols="4,1,5",options="header"]
|=======================================================================
@@ -850,8 +853,6 @@ Number of Miscellaneous Components: 37 in 37 JAR artifacts (12 deprecated)
| link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] (camel-blueprint) | 2.4 | Using Camel with OSGi Blueprint
-| link:camel-box-parent/src/main/docs/box-parent.adoc[Box Parent] (camel-box-parent) | | Camel Box parent
-
| link:camel-cdi/src/main/docs/cdi.adoc[CDI] (camel-cdi) | 2.10 | Using Camel with CDI
| link:camel-cxf-transport/src/main/docs/cxf-transport.adoc[CXF Transport] (camel-cxf-transport) | 2.8 | Camel Transport for Apache CXF
http://git-wip-us.apache.org/repos/asf/camel/blob/6407919b/docs/user-manual/en/SUMMARY.md
----------------------------------------------------------------------
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 935cf23..1edd5ca 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -152,6 +152,7 @@
* [Bean Validator](bean-validator-component.adoc)
* [Beanstalk](beanstalk-component.adoc)
* [Bonita](bonita-component.adoc)
+ * [Box](box-component.adoc)
* [Braintree](braintree-component.adoc)
* [Camel Context](context-component.adoc)
* [Cassandra CQL](cql-component.adoc)
@@ -328,7 +329,6 @@
* Miscellaneous Components
* [BAM](bam.adoc)
* [Blueprint](blueprint.adoc)
- * [Box Parent](box-parent.adoc)
* [CDI](cdi.adoc)
* [CXF Transport](cxf-transport.adoc)
* [Eclipse](eclipse.adoc)
http://git-wip-us.apache.org/repos/asf/camel/blob/6407919b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
index c60522b..7585325 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
@@ -393,6 +393,7 @@ public class PrepareCatalogKarafMojo extends AbstractMojo {
// (camel-jetty is a placeholder, as camel-jetty9 is the actual component)
if ("camel-core-osgi".equals(dir.getName())
|| "camel-core-xml".equals(dir.getName())
+ || "camel-box".equals(dir.getName())
|| "camel-http-common".equals(dir.getName())
|| "camel-jetty".equals(dir.getName())
|| "camel-jetty-common".equals(dir.getName())
http://git-wip-us.apache.org/repos/asf/camel/blob/6407919b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 3514c6a..3c28fe7 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -59,7 +59,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
private static final String[] EXCLUDE_DOC_FILES = {"camel-core-osgi", "camel-core-xml", "camel-hystrix",
"camel-http-common", "camel-jetty", "camel-jetty-common", "camel-jetty8",
- "camel-linkedin", "camel-olingo2", "camel-ribbon", "camel-salesforce", "camel-spring-boot-starter",
+ "camel-box", "camel-linkedin", "camel-olingo2", "camel-ribbon", "camel-salesforce", "camel-spring-boot-starter",
"camel-spring-dm", "camel-test-karaf", "camel-test-spring", "camel-testng", "camel-test-spring3",
"camel-test-spring40", "camel-zipkin-starter"};
@@ -355,6 +355,8 @@ public class PrepareCatalogMojo extends AbstractMojo {
target = new File(dir, "camel-linkedin-component/target/classes");
} else if ("camel-olingo2".equals(dir.getName())) {
target = new File(dir, "camel-olingo2-component/target/classes");
+ } else if ("camel-box".equals(dir.getName())) {
+ target = new File(dir, "camel-box-component/target/classes");
}
int before = componentFiles.size();
@@ -793,6 +795,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
// (camel-jetty is a placeholder, as camel-jetty9 is the actual component)
if ("camel-core-osgi".equals(dir.getName())
|| "camel-core-xml".equals(dir.getName())
+ || "camel-box".equals(dir.getName())
|| "camel-http-common".equals(dir.getName())
|| "camel-jetty".equals(dir.getName())
|| "camel-jetty-common".equals(dir.getName())
http://git-wip-us.apache.org/repos/asf/camel/blob/6407919b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
----------------------------------------------------------------------
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
index fa61295..558ecf0 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogSpringBootMojo.java
@@ -425,6 +425,7 @@ public class PrepareCatalogSpringBootMojo extends AbstractMojo {
// (camel-jetty is a placeholder, as camel-jetty9 is the actual component)
if ("camel-core-osgi".equals(dir.getName())
|| "camel-core-xml".equals(dir.getName())
+ || "camel-box".equals(dir.getName())
|| "camel-http-common".equals(dir.getName())
|| "camel-jetty".equals(dir.getName())
|| "camel-jetty-common".equals(dir.getName())