Repository: camel Updated Branches: refs/heads/master 3392b15b4 -> ea816240e
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea816240 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea816240 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea816240 Branch: refs/heads/master Commit: ea816240efbe32f70fe02acef14e1ef6258a5239 Parents: 3392b15 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Feb 8 19:24:54 2017 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Feb 8 19:26:00 2017 +0100 ---------------------------------------------------------------------- components/camel-bam/pom.xml | 1 + components/camel-cdi/pom.xml | 1 + components/camel-cxf-transport/pom.xml | 1 + components/camel-leveldb/pom.xml | 1 + components/camel-rx/pom.xml | 1 + components/camel-scr/pom.xml | 1 + components/camel-servletlistener/pom.xml | 1 + components/camel-spring-dm/pom.xml | 1 + components/camel-spring-javaconfig/pom.xml | 1 + components/camel-test-cdi/pom.xml | 1 + components/camel-testng/pom.xml | 1 + components/camel-urlrewrite/pom.xml | 1 + components/readme.adoc | 159 +++++++++---------- docs/user-manual/en/SUMMARY.md | 24 +-- .../src/main/resources/readme-others.mvel | 2 +- 15 files changed, 104 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-bam/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml index 879ad37..351cf57 100644 --- a/components/camel-bam/pom.xml +++ b/components/camel-bam/pom.xml @@ -32,6 +32,7 @@ <!-- use by camel-catalog --> <firstVersion>1.0.0</firstVersion> <label>monitoring</label> + <title>BAM</title> <camel.osgi.export.pkg>org.apache.camel.bam.*</camel.osgi.export.pkg> <eclipselink-version>2.3.2</eclipselink-version> http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml index cb30a0e..c54521e 100644 --- a/components/camel-cdi/pom.xml +++ b/components/camel-cdi/pom.xml @@ -33,6 +33,7 @@ <!-- use by camel-catalog --> <firstVersion>2.10.0</firstVersion> <label>java</label> + <title>CDI</title> <camel.osgi.import> !org.apache.camel.cdi.*, http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-cxf-transport/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 91f6f08..2dfbe4e 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -33,6 +33,7 @@ <!-- use by camel-catalog --> <firstVersion>2.8.0</firstVersion> <label>soap,webservice</label> + <title>CXF Transport</title> <camel.osgi.import> !org.apache.camel.component.cxf.*, http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-leveldb/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml index 6cd71ab..7e25564 100644 --- a/components/camel-leveldb/pom.xml +++ b/components/camel-leveldb/pom.xml @@ -33,6 +33,7 @@ <!-- use by camel-catalog --> <firstVersion>2.10.0</firstVersion> <label>database</label> + <title>LevelDB</title> <camel.osgi.export.pkg>org.apache.camel.component.leveldb.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-rx/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-rx/pom.xml b/components/camel-rx/pom.xml index 242dfc2..78a355f 100644 --- a/components/camel-rx/pom.xml +++ b/components/camel-rx/pom.xml @@ -33,6 +33,7 @@ <!-- use by camel-catalog --> <firstVersion>2.11.0</firstVersion> <label>reactive</label> + <title>RX</title> <camel.osgi.export.pkg>org.apache.camel.rx.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-scr/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml index c1d2d43..5016be2 100644 --- a/components/camel-scr/pom.xml +++ b/components/camel-scr/pom.xml @@ -33,6 +33,7 @@ <!-- use by camel-catalog --> <firstVersion>2.15.0</firstVersion> <label>osgi</label> + <title>SCR</title> <camel.osgi.export.pkg>org.apache.camel.scr</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-servletlistener/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml index 65945dd..443536f 100644 --- a/components/camel-servletlistener/pom.xml +++ b/components/camel-servletlistener/pom.xml @@ -33,6 +33,7 @@ <!-- use by camel-catalog --> <firstVersion>2.11.0</firstVersion> <label>java</label> + <title>Servlet Listener</title> <camel.osgi.import.before.defaults> javax.servlet.*;version="${servlet-version-range}" http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-spring-dm/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-dm/pom.xml b/components/camel-spring-dm/pom.xml index 74dabe3..254de8b 100644 --- a/components/camel-spring-dm/pom.xml +++ b/components/camel-spring-dm/pom.xml @@ -34,6 +34,7 @@ <!-- use by camel-catalog --> <firstVersion>2.18.0</firstVersion> <label>osgi,spring</label> + <title>Spring DM</title> <!-- spring-dm only supports spring 3.x so we need to import that range --> <camel.osgi.import> http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-spring-javaconfig/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml index 7f48f47..ce09027 100644 --- a/components/camel-spring-javaconfig/pom.xml +++ b/components/camel-spring-javaconfig/pom.xml @@ -33,6 +33,7 @@ <!-- use by camel-catalog --> <firstVersion>2.0.0</firstVersion> <label>spring</label> + <title>Spring Java Configuration</title> <camel.osgi.export.pkg>org.apache.camel.spring.javaconfig.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-test-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-test-cdi/pom.xml b/components/camel-test-cdi/pom.xml index 54b38c7..88efec8 100644 --- a/components/camel-test-cdi/pom.xml +++ b/components/camel-test-cdi/pom.xml @@ -34,6 +34,7 @@ <!-- use by camel-catalog --> <firstVersion>2.17.0</firstVersion> <label>testing,java</label> + <title>Test CDI</title> <camel.osgi.export.pkg>org.apache.camel.test.cdi.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-testng/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml index ce68132..abacd5f 100644 --- a/components/camel-testng/pom.xml +++ b/components/camel-testng/pom.xml @@ -33,6 +33,7 @@ <!-- use by camel-catalog --> <firstVersion>2.8.0</firstVersion> <label>testing,java</label> + <title>TestNG</title> <camel.osgi.export.pkg>org.apache.camel.testng.*</camel.osgi.export.pkg> </properties> http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/camel-urlrewrite/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml index df8a71d..9c53f24 100644 --- a/components/camel-urlrewrite/pom.xml +++ b/components/camel-urlrewrite/pom.xml @@ -33,6 +33,7 @@ <!-- use by camel-catalog --> <firstVersion>2.11.0</firstVersion> <label>http</label> + <title>URLRewrite</title> <camel.osgi.import.before.defaults> javax.servlet.*;version="${servlet-version-range}" http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/components/readme.adoc ---------------------------------------------------------------------- diff --git a/components/readme.adoc b/components/readme.adoc index 4e7e407..3ebf754 100644 --- a/components/readme.adoc +++ b/components/readme.adoc @@ -666,86 +666,6 @@ Number of Components: 218 // components: END -Other Components -^^^^^^^^^^^^^^^^ - -// others: START -Number of Other Components: 33 - -[width="100%",cols="4,1,5",options="header"] -|======================================================================= -| Component | Available From | Description - -| link:camel-bam/src/main/docs/bam.adoc[Bam] (camel-bam) | 1.0.0 | *deprecated* Business Activity Monitoring - -| link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] (camel-blueprint) | 2.4.0 | Using Camel with OSGi Blueprint - -| link:camel-cdi/src/main/docs/cdi.adoc[Cdi] (camel-cdi) | 2.10.0 | Using Camel with CDI - -| link:camel-cxf-transport/src/main/docs/cxf-transport.adoc[Cxf Transport] (camel-cxf-transport) | 2.8.0 | Camel Transport for Apache CXF - -| link:camel-eclipse/src/main/docs/eclipse.adoc[Eclipse] (camel-eclipse) | 2.3.0 | *deprecated* Camel classpath scanning support for running in Eclipse Desktop Applications - -| link:camel-guice/src/main/docs/guice.adoc[Guice] (camel-guice) | 1.5.0 | Using Camel with Guice - -| link:camel-hawtdb/src/main/docs/hawtdb.adoc[Hawtdb] (camel-hawtdb) | 2.3.0 | *deprecated* Using HawtDB as persistent EIP store - -| link:camel-hystrix/src/main/docs/hystrix.adoc[Hystrix] (camel-hystrix) | 2.18.0 | Circuit Breaker EIP using Netflix Hystrix - -| link:camel-jasypt/src/main/docs/jasypt.adoc[Jasypt] (camel-jasypt) | 2.5.0 | Security using Jasypt - -| link:camel-kura/src/main/docs/kura.adoc[Kura] (camel-kura) | 2.15.0 | Using Camel with Eclipse Kura (OSGi) - -| link:camel-leveldb/src/main/docs/leveldb.adoc[Leveldb] (camel-leveldb) | 2.10.0 | Using LevelDB as persistent EIP store - -| link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18.0 | Camel Components - -| link:camel-ruby/src/main/docs/ruby.adoc[Ruby] (camel-ruby) | 1.0.0 | *deprecated* Camel Ruby DSL - -| link:camel-rx/src/main/docs/rx.adoc[Rx] (camel-rx) | 2.11.0 | Camel Reactive using RxJava library - -| link:camel-scala/src/main/docs/scala.adoc[Scala] (camel-scala) | 1.4.0 | Camel Scala DSL - -| link:camel-scr/src/main/docs/scr.adoc[Scr] (camel-scr) | 2.15.0 | Camel with OSGi SCR (Declarative Services) - -| link:camel-servletlistener/src/main/docs/servletlistener.adoc[Servletlistener] (camel-servletlistener) | 2.11.0 | Bootstrapping Camel using Servet Listener - -| link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5.0 | Security using Shiro - -| link:camel-spring-boot/src/main/docs/spring-boot.adoc[Spring Boot] (camel-spring-boot) | 2.15.0 | Using Camel with Spring Boot - -| link:camel-spring-cloud/src/main/docs/spring-cloud.adoc[Spring Cloud] (camel-spring-cloud) | 2.19.0 | Camel Cloud integration with Spring Cloud - -| link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring Dm] (camel-spring-dm) | 2.18.0 | *deprecated* Camel SpringDM (OSGi) XML DSL - -| link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Javaconfig] (camel-spring-javaconfig) | 2.0.0 | Using Camel with Spring Java Configuration - -| link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3.0 | Security using Spring Security - -| link:camel-swagger/src/main/docs/swagger.adoc[Swagger] (camel-swagger) | 2.14.0 | *deprecated* Rest-dsl support for using swagger api-doc - -| link:camel-swagger-java/src/main/docs/swagger-java.adoc[Swagger Java] (camel-swagger-java) | 2.16.0 | Rest-dsl support for using swagger api-doc - -| link:camel-test/src/main/docs/test.adoc[Test] (camel-test) | 2.9.0 | Camel unit testing - -| link:camel-test-blueprint/src/main/docs/test-blueprint.adoc[Test Blueprint] (camel-test-blueprint) | 2.10.0 | Camel unit testing with OSGi Blueprint - -| link:camel-test-cdi/src/main/docs/test-cdi.adoc[Test Cdi] (camel-test-cdi) | 2.17.0 | Camel unit testing with CDI - -| link:camel-test-karaf/src/main/docs/test-karaf.adoc[Test Karaf] (camel-test-karaf) | 2.18.0 | Camel integration testing with Apache Karaf - -| link:camel-test-spring/src/main/docs/test-spring.adoc[Test Spring] (camel-test-spring) | 2.10.0 | Camel unit testing with Spring - -| link:camel-testng/src/main/docs/testng.adoc[Testng] (camel-testng) | 2.8.0 | *deprecated* Camel unit testing with TestNG - -| link:camel-urlrewrite/src/main/docs/urlrewrite.adoc[Urlrewrite] (camel-urlrewrite) | 2.11.0 | *deprecated* URL rewrite support for HTTP components - -| link:camel-zipkin/src/main/docs/zipkin.adoc[Zipkin] (camel-zipkin) | 2.18.0 | Distributed message tracing using Zipkin -|======================================================================= -// others: END - - - Data Formats ^^^^^^^^^^^^ @@ -909,3 +829,82 @@ Number of Languages: 24 |======================================================================= // languages: END + +Miscellaneous Components +^^^^^^^^^^^^^^^^^^^^^^^^ + +// others: START +Number of Other Components: 33 + +[width="100%",cols="4,1,5",options="header"] +|======================================================================= +| Component | Available From | Description + +| link:camel-bam/src/main/docs/bam.adoc[BAM] (camel-bam) | 1.0.0 | *deprecated* Business Activity Monitoring + +| link:camel-blueprint/src/main/docs/blueprint.adoc[Blueprint] (camel-blueprint) | 2.4.0 | Using Camel with OSGi Blueprint + +| link:camel-cdi/src/main/docs/cdi.adoc[CDI] (camel-cdi) | 2.10.0 | Using Camel with CDI + +| link:camel-cxf-transport/src/main/docs/cxf-transport.adoc[CXF Transport] (camel-cxf-transport) | 2.8.0 | Camel Transport for Apache CXF + +| link:camel-eclipse/src/main/docs/eclipse.adoc[Eclipse] (camel-eclipse) | 2.3.0 | *deprecated* Camel classpath scanning support for running in Eclipse Desktop Applications + +| link:camel-guice/src/main/docs/guice.adoc[Guice] (camel-guice) | 1.5.0 | Using Camel with Guice + +| link:camel-hawtdb/src/main/docs/hawtdb.adoc[Hawtdb] (camel-hawtdb) | 2.3.0 | *deprecated* Using HawtDB as persistent EIP store + +| link:camel-hystrix/src/main/docs/hystrix.adoc[Hystrix] (camel-hystrix) | 2.18.0 | Circuit Breaker EIP using Netflix Hystrix + +| link:camel-jasypt/src/main/docs/jasypt.adoc[Jasypt] (camel-jasypt) | 2.5.0 | Security using Jasypt + +| link:camel-kura/src/main/docs/kura.adoc[Kura] (camel-kura) | 2.15.0 | Using Camel with Eclipse Kura (OSGi) + +| link:camel-leveldb/src/main/docs/leveldb.adoc[LevelDB] (camel-leveldb) | 2.10.0 | Using LevelDB as persistent EIP store + +| link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18.0 | Camel Components + +| link:camel-ruby/src/main/docs/ruby.adoc[Ruby] (camel-ruby) | 1.0.0 | *deprecated* Camel Ruby DSL + +| link:camel-rx/src/main/docs/rx.adoc[RX] (camel-rx) | 2.11.0 | Camel Reactive using RxJava library + +| link:camel-scala/src/main/docs/scala.adoc[Scala] (camel-scala) | 1.4.0 | Camel Scala DSL + +| link:camel-scr/src/main/docs/scr.adoc[SCR] (camel-scr) | 2.15.0 | Camel with OSGi SCR (Declarative Services) + +| link:camel-servletlistener/src/main/docs/servletlistener.adoc[Servlet Listener] (camel-servletlistener) | 2.11.0 | Bootstrapping Camel using Servet Listener + +| link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5.0 | Security using Shiro + +| link:camel-spring-boot/src/main/docs/spring-boot.adoc[Spring Boot] (camel-spring-boot) | 2.15.0 | Using Camel with Spring Boot + +| link:camel-spring-cloud/src/main/docs/spring-cloud.adoc[Spring Cloud] (camel-spring-cloud) | 2.19.0 | Camel Cloud integration with Spring Cloud + +| link:camel-spring-dm/src/main/docs/spring-dm.adoc[Spring DM] (camel-spring-dm) | 2.18.0 | *deprecated* Camel SpringDM (OSGi) XML DSL + +| link:camel-spring-javaconfig/src/main/docs/spring-javaconfig.adoc[Spring Java Configuration] (camel-spring-javaconfig) | 2.0.0 | Using Camel with Spring Java Configuration + +| link:camel-spring-security/src/main/docs/spring-security.adoc[Spring Security] (camel-spring-security) | 2.3.0 | Security using Spring Security + +| link:camel-swagger/src/main/docs/swagger.adoc[Swagger] (camel-swagger) | 2.14.0 | *deprecated* Rest-dsl support for using swagger api-doc + +| link:camel-swagger-java/src/main/docs/swagger-java.adoc[Swagger Java] (camel-swagger-java) | 2.16.0 | Rest-dsl support for using swagger api-doc + +| link:camel-test/src/main/docs/test.adoc[Test] (camel-test) | 2.9.0 | Camel unit testing + +| link:camel-test-blueprint/src/main/docs/test-blueprint.adoc[Test Blueprint] (camel-test-blueprint) | 2.10.0 | Camel unit testing with OSGi Blueprint + +| link:camel-test-cdi/src/main/docs/test-cdi.adoc[Test CDI] (camel-test-cdi) | 2.17.0 | Camel unit testing with CDI + +| link:camel-test-karaf/src/main/docs/test-karaf.adoc[Test Karaf] (camel-test-karaf) | 2.18.0 | Camel integration testing with Apache Karaf + +| link:camel-test-spring/src/main/docs/test-spring.adoc[Test Spring] (camel-test-spring) | 2.10.0 | Camel unit testing with Spring + +| link:camel-testng/src/main/docs/testng.adoc[TestNG] (camel-testng) | 2.8.0 | *deprecated* Camel unit testing with TestNG + +| link:camel-urlrewrite/src/main/docs/urlrewrite.adoc[URLRewrite] (camel-urlrewrite) | 2.11.0 | *deprecated* URL rewrite support for HTTP components + +| link:camel-zipkin/src/main/docs/zipkin.adoc[Zipkin] (camel-zipkin) | 2.18.0 | Distributed message tracing using Zipkin +|======================================================================= +// others: END + http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/docs/user-manual/en/SUMMARY.md ---------------------------------------------------------------------- diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md index 7565313..d1d6174 100644 --- a/docs/user-manual/en/SUMMARY.md +++ b/docs/user-manual/en/SUMMARY.md @@ -324,38 +324,38 @@ <!-- others: START --> * Other Components - * [Bam](bam.adoc) + * [BAM](bam.adoc) * [Blueprint](blueprint.adoc) - * [Cdi](cdi.adoc) - * [Cxf Transport](cxf-transport.adoc) + * [CDI](cdi.adoc) + * [CXF Transport](cxf-transport.adoc) * [Eclipse](eclipse.adoc) * [Guice](guice.adoc) * [Hawtdb](hawtdb.adoc) * [Hystrix](hystrix.adoc) * [Jasypt](jasypt.adoc) * [Kura](kura.adoc) - * [Leveldb](leveldb.adoc) + * [LevelDB](leveldb.adoc) * [Ribbon](ribbon.adoc) * [Ruby](ruby.adoc) - * [Rx](rx.adoc) + * [RX](rx.adoc) * [Scala](scala.adoc) - * [Scr](scr.adoc) - * [Servletlistener](servletlistener.adoc) + * [SCR](scr.adoc) + * [Servlet Listener](servletlistener.adoc) * [Shiro](shiro.adoc) * [Spring Boot](spring-boot.adoc) * [Spring Cloud](spring-cloud.adoc) - * [Spring Dm](spring-dm.adoc) - * [Spring Javaconfig](spring-javaconfig.adoc) + * [Spring DM](spring-dm.adoc) + * [Spring Java Configuration](spring-javaconfig.adoc) * [Spring Security](spring-security.adoc) * [Swagger](swagger.adoc) * [Swagger Java](swagger-java.adoc) * [Test](test.adoc) * [Test Blueprint](test-blueprint.adoc) - * [Test Cdi](test-cdi.adoc) + * [Test CDI](test-cdi.adoc) * [Test Karaf](test-karaf.adoc) * [Test Spring](test-spring.adoc) - * [Testng](testng.adoc) - * [Urlrewrite](urlrewrite.adoc) + * [TestNG](testng.adoc) + * [URLRewrite](urlrewrite.adoc) * [Zipkin](zipkin.adoc) <!-- others: END --> http://git-wip-us.apache.org/repos/asf/camel/blob/ea816240/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel index 6b8f858..0ea5935 100644 --- a/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel +++ b/tooling/maven/camel-package-maven-plugin/src/main/resources/readme-others.mvel @@ -1,6 +1,6 @@ @if{!others.isEmpty()} -Number of Other Components: @{others.size} +Number of Miscellaneous Components: @{others.size} [width="100%",cols="4,1,5",options="header"] |=======================================================================
