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 2019/08/05 11:35:24 UTC
[camel] branch master updated (681f5ad -> 55ca107)
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 681f5ad CAMEL-13824 - Regen
new bf2c783 CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava
new c154369 CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - renamed service
new 03cb34f CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - updated references
new 80e77be CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - updated tests
new d8c1180 CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - Updated docs link and regen
new 55ca107 CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - Regen
The 6 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:
apache-camel/pom.xml | 4 ++--
apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
bom/camel-bom/pom.xml | 4 ++--
components/{camel-rxjava2 => camel-rxjava}/pom.xml | 4 ++--
.../docs/rxjava2.adoc => camel-rxjava/src/main/docs/rxjava.adoc} | 8 ++++----
.../camel/component/rxjava2/engine/RxJavaCamelProcessor.java | 0
.../camel/component/rxjava2/engine/RxJavaStreamsConstants.java | 2 +-
.../camel/component/rxjava2/engine/RxJavaStreamsService.java | 0
.../component/rxjava2/engine/RxJavaStreamsServiceFactory.java | 0
.../META-INF/services/org/apache/camel/reactive-streams/rxjava} | 0
.../rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java | 0
.../rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java | 0
.../rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java | 0
.../camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java | 0
.../component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java | 0
.../camel/component/rxjava2/engine/suport/TestSubscriber.java | 0
.../src/test/resources/log4j2.properties | 2 +-
components/pom.xml | 2 +-
components/readme.adoc | 2 +-
docs/components/modules/ROOT/nav.adoc | 2 +-
docs/components/modules/ROOT/pages/{rxjava2.adoc => rxjava.adoc} | 8 ++++----
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
parent/pom.xml | 4 ++--
.../{camel-rxjava2-starter => camel-rxjava-starter}/pom.xml | 6 +++---
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.provides | 2 +-
platforms/spring-boot/components-starter/pom.xml | 2 +-
.../spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++--
29 files changed, 31 insertions(+), 31 deletions(-)
rename components/{camel-rxjava2 => camel-rxjava}/pom.xml (97%)
rename components/{camel-rxjava2/src/main/docs/rxjava2.adoc => camel-rxjava/src/main/docs/rxjava.adoc} (69%)
rename components/{camel-rxjava2 => camel-rxjava}/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java (100%)
rename components/{camel-rxjava2 => camel-rxjava}/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java (95%)
rename components/{camel-rxjava2 => camel-rxjava}/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsService.java (100%)
rename components/{camel-rxjava2 => camel-rxjava}/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceFactory.java (100%)
rename components/{camel-rxjava2/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava2 => camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava} (100%)
rename components/{camel-rxjava2 => camel-rxjava}/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java (100%)
rename components/{camel-rxjava2 => camel-rxjava}/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java (100%)
rename components/{camel-rxjava2 => camel-rxjava}/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java (100%)
rename components/{camel-rxjava2 => camel-rxjava}/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java (100%)
rename components/{camel-rxjava2 => camel-rxjava}/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java (100%)
rename components/{camel-rxjava2 => camel-rxjava}/src/test/java/org/apache/camel/component/rxjava2/engine/suport/TestSubscriber.java (100%)
rename components/{camel-rxjava2 => camel-rxjava}/src/test/resources/log4j2.properties (96%)
rename docs/components/modules/ROOT/pages/{rxjava2.adoc => rxjava.adoc} (69%)
rename platforms/spring-boot/components-starter/{camel-rxjava2-starter => camel-rxjava-starter}/pom.xml (93%)
rename platforms/spring-boot/components-starter/{camel-rxjava2-starter => camel-rxjava-starter}/src/main/resources/META-INF/LICENSE.txt (100%)
rename platforms/spring-boot/components-starter/{camel-rxjava2-starter => camel-rxjava-starter}/src/main/resources/META-INF/NOTICE.txt (100%)
rename platforms/spring-boot/components-starter/{camel-rxjava2-starter => camel-rxjava-starter}/src/main/resources/META-INF/spring.provides (97%)
[camel] 01/06: CAMEL-13792 - Rename components to default names,
Camel-rxjava2 to camel-rxjava
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 bf2c783061750b8c8d55d499251ad1855e834745
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 12:39:42 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava
---
components/{camel-rxjava2 => camel-rxjava}/pom.xml | 4 ++--
.../{camel-rxjava2 => camel-rxjava}/src/main/docs/rxjava2.adoc | 0
.../apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java | 0
.../camel/component/rxjava2/engine/RxJavaStreamsConstants.java | 0
.../apache/camel/component/rxjava2/engine/RxJavaStreamsService.java | 0
.../camel/component/rxjava2/engine/RxJavaStreamsServiceFactory.java | 0
.../META-INF/services/org/apache/camel/reactive-streams/rxjava2 | 0
.../rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java | 0
.../component/rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java | 0
.../rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java | 0
.../camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java | 0
.../component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java | 0
.../camel/component/rxjava2/engine/suport/TestSubscriber.java | 0
.../src/test/resources/log4j2.properties | 0
.../{camel-rxjava2-starter => camel-rxjava-starter}/pom.xml | 6 +++---
.../src/main/resources/META-INF/LICENSE.txt | 0
.../src/main/resources/META-INF/NOTICE.txt | 0
.../src/main/resources/META-INF/spring.provides | 2 +-
platforms/spring-boot/components-starter/pom.xml | 1 +
19 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/components/camel-rxjava2/pom.xml b/components/camel-rxjava/pom.xml
similarity index 97%
rename from components/camel-rxjava2/pom.xml
rename to components/camel-rxjava/pom.xml
index ce08574..2a20e0b 100644
--- a/components/camel-rxjava2/pom.xml
+++ b/components/camel-rxjava/pom.xml
@@ -27,9 +27,9 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<packaging>jar</packaging>
- <name>Camel :: RxJava2</name>
+ <name>Camel :: RxJava</name>
<description>RxJava2 based back-end for Camel's reactive streams component</description>
<properties>
diff --git a/components/camel-rxjava2/src/main/docs/rxjava2.adoc b/components/camel-rxjava/src/main/docs/rxjava2.adoc
similarity index 100%
rename from components/camel-rxjava2/src/main/docs/rxjava2.adoc
rename to components/camel-rxjava/src/main/docs/rxjava2.adoc
diff --git a/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java
similarity index 100%
rename from components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java
rename to components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaCamelProcessor.java
diff --git a/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java
similarity index 100%
rename from components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java
rename to components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java
diff --git a/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsService.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsService.java
similarity index 100%
rename from components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsService.java
rename to components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsService.java
diff --git a/components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceFactory.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceFactory.java
similarity index 100%
rename from components/camel-rxjava2/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceFactory.java
rename to components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceFactory.java
diff --git a/components/camel-rxjava2/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava2 b/components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava2
similarity index 100%
rename from components/camel-rxjava2/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava2
rename to components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava2
diff --git a/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java
similarity index 100%
rename from components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceBackpressureTest.java
diff --git a/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java
similarity index 100%
rename from components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceEventTypeTest.java
diff --git a/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java
similarity index 100%
rename from components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceSubscriberTest.java
diff --git a/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java
similarity index 100%
rename from components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTest.java
diff --git a/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java
similarity index 100%
rename from components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsServiceTestSupport.java
diff --git a/components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/suport/TestSubscriber.java b/components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/suport/TestSubscriber.java
similarity index 100%
rename from components/camel-rxjava2/src/test/java/org/apache/camel/component/rxjava2/engine/suport/TestSubscriber.java
rename to components/camel-rxjava/src/test/java/org/apache/camel/component/rxjava2/engine/suport/TestSubscriber.java
diff --git a/components/camel-rxjava2/src/test/resources/log4j2.properties b/components/camel-rxjava/src/test/resources/log4j2.properties
similarity index 100%
rename from components/camel-rxjava2/src/test/resources/log4j2.properties
rename to components/camel-rxjava/src/test/resources/log4j2.properties
diff --git a/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rxjava-starter/pom.xml
similarity index 93%
rename from platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml
rename to platforms/spring-boot/components-starter/camel-rxjava-starter/pom.xml
index 252ffc0..9d65c45 100644
--- a/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-rxjava-starter/pom.xml
@@ -24,9 +24,9 @@
<artifactId>components-starter</artifactId>
<version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>camel-rxjava2-starter</artifactId>
+ <artifactId>camel-rxjava-starter</artifactId>
<packaging>jar</packaging>
- <name>Spring-Boot Starter :: Camel :: RxJava2</name>
+ <name>Spring-Boot Starter :: Camel :: RxJava</name>
<description>Spring-Boot Starter for RxJava2 based back-end for Camel's reactive streams component</description>
<dependencies>
<dependency>
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>${project.version}</version>
</dependency>
<!--START OF GENERATED CODE-->
diff --git a/platforms/spring-boot/components-starter/camel-rxjava2-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-rxjava-starter/src/main/resources/META-INF/LICENSE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-rxjava2-starter/src/main/resources/META-INF/LICENSE.txt
rename to platforms/spring-boot/components-starter/camel-rxjava-starter/src/main/resources/META-INF/LICENSE.txt
diff --git a/platforms/spring-boot/components-starter/camel-rxjava2-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-rxjava-starter/src/main/resources/META-INF/NOTICE.txt
similarity index 100%
rename from platforms/spring-boot/components-starter/camel-rxjava2-starter/src/main/resources/META-INF/NOTICE.txt
rename to platforms/spring-boot/components-starter/camel-rxjava-starter/src/main/resources/META-INF/NOTICE.txt
diff --git a/platforms/spring-boot/components-starter/camel-rxjava2-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-rxjava-starter/src/main/resources/META-INF/spring.provides
similarity index 97%
rename from platforms/spring-boot/components-starter/camel-rxjava2-starter/src/main/resources/META-INF/spring.provides
rename to platforms/spring-boot/components-starter/camel-rxjava-starter/src/main/resources/META-INF/spring.provides
index 1cea613..8614d16 100644
--- a/platforms/spring-boot/components-starter/camel-rxjava2-starter/src/main/resources/META-INF/spring.provides
+++ b/platforms/spring-boot/components-starter/camel-rxjava-starter/src/main/resources/META-INF/spring.provides
@@ -14,4 +14,4 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-provides: camel-rxjava2
+provides: camel-rxjava
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index e4887f7..a3fd015 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -311,6 +311,7 @@
<module>camel-restlet-starter</module>
<module>camel-ribbon-starter</module>
<module>camel-rss-starter</module>
+ <module>camel-rxjava-starter</module>
<module>camel-rxjava2-starter</module>
<module>camel-saga-starter</module>
<module>camel-salesforce-starter</module>
[camel] 04/06: CAMEL-13792 - Rename components to default names,
Camel-rxjava2 to camel-rxjava - updated tests
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 80e77be8274ca417378df2631b588f542b3a145b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 12:47:50 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - updated tests
---
components/camel-rxjava/src/test/resources/log4j2.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-rxjava/src/test/resources/log4j2.properties b/components/camel-rxjava/src/test/resources/log4j2.properties
index 6510773..c1ad2f5 100644
--- a/components/camel-rxjava/src/test/resources/log4j2.properties
+++ b/components/camel-rxjava/src/test/resources/log4j2.properties
@@ -17,7 +17,7 @@
appender.file.type = File
appender.file.name = file
-appender.file.fileName = target/camel-rxjava2-test.log
+appender.file.fileName = target/camel-rxjava-test.log
appender.file.layout.type = PatternLayout
appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
appender.stdout.type = Console
[camel] 02/06: CAMEL-13792 - Rename components to default names,
Camel-rxjava2 to camel-rxjava - renamed service
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 c1543693ce805854c822d0b9956543e11b700fb4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 12:43:43 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - renamed service
---
.../apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java | 2 +-
.../services/org/apache/camel/reactive-streams/{rxjava2 => rxjava} | 0
platforms/spring-boot/components-starter/pom.xml | 1 -
3 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java
index b2e3fdb..baf7cb3 100644
--- a/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java
+++ b/components/camel-rxjava/src/main/java/org/apache/camel/component/rxjava2/engine/RxJavaStreamsConstants.java
@@ -22,7 +22,7 @@ import org.apache.camel.AsyncCallback;
* Useful constants used in the Camel Reactive Streams component.
*/
public final class RxJavaStreamsConstants {
- public static final String SERVICE_NAME = "rxjava2";
+ public static final String SERVICE_NAME = "rxjava";
/**
* An implementation of the {@link AsyncCallback} that does nothing.
diff --git a/components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava2 b/components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava
similarity index 100%
rename from components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava2
rename to components/camel-rxjava/src/main/resources/META-INF/services/org/apache/camel/reactive-streams/rxjava
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index a3fd015..be30897 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -312,7 +312,6 @@
<module>camel-ribbon-starter</module>
<module>camel-rss-starter</module>
<module>camel-rxjava-starter</module>
- <module>camel-rxjava2-starter</module>
<module>camel-saga-starter</module>
<module>camel-salesforce-starter</module>
<module>camel-sap-netweaver-starter</module>
[camel] 06/06: CAMEL-13792 - Rename components to default names,
Camel-rxjava2 to camel-rxjava - Regen
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 55ca107f2d003c4333f26a7988c6786ac16e3dbb
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 13:28:59 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - Regen
---
docs/components/modules/ROOT/pages/rxjava.adoc | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/docs/components/modules/ROOT/pages/rxjava.adoc b/docs/components/modules/ROOT/pages/rxjava.adoc
new file mode 100644
index 0000000..daf3c5a
--- /dev/null
+++ b/docs/components/modules/ROOT/pages/rxjava.adoc
@@ -0,0 +1,20 @@
+= RxJava Component
+
+*Available as of Camel version 2.22*
+
+RxJava based back-end for Camel's reactive streams component.
+
+See more details in the camel-streams-component documentation.
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-rxjava</artifactId>
+ <version>x.x.x</version>
+ <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
[camel] 05/06: CAMEL-13792 - Rename components to default names,
Camel-rxjava2 to camel-rxjava - Updated docs link and regen
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 d8c1180dddf7f441fef82e58b81350ca6d28553b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 13:21:46 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - Updated docs link and regen
---
components/readme.adoc | 2 +-
docs/components/modules/ROOT/nav.adoc | 2 +-
docs/components/modules/ROOT/pages/rxjava2.adoc | 20 --------------------
docs/user-manual/modules/ROOT/pages/index.adoc | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 4 ++--
5 files changed, 5 insertions(+), 25 deletions(-)
diff --git a/components/readme.adoc b/components/readme.adoc
index 442597a..333eba1 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -1085,7 +1085,7 @@ Number of Miscellaneous Components: 33 in 33 JAR artifacts (0 deprecated)
| link:camel-ribbon/src/main/docs/ribbon.adoc[Ribbon] (camel-ribbon) | 2.18 | Using Netflix Ribbon for client side load balancing
-| link:camel-rxjava2/src/main/docs/rxjava2.adoc[Rxjava2] (camel-rxjava2) | 2.22 | RxJava2 based back-end for Camel's reactive streams component
+| link:camel-rxjava/src/main/docs/rxjava.adoc[Rxjava] (camel-rxjava) | 2.22 | RxJava2 based back-end for Camel's reactive streams component
| link:camel-shiro/src/main/docs/shiro.adoc[Shiro] (camel-shiro) | 2.5 | Security using Shiro
diff --git a/docs/components/modules/ROOT/nav.adoc b/docs/components/modules/ROOT/nav.adoc
index c602e3c..204a2b7 100644
--- a/docs/components/modules/ROOT/nav.adoc
+++ b/docs/components/modules/ROOT/nav.adoc
@@ -286,7 +286,7 @@
* xref:ribbon.adoc[Ribbon Component]
* xref:rss-component.adoc[RSS Component]
* xref:rss-dataformat.adoc[RSS DataFormat]
-* xref:rxjava2.adoc[RxJava2 Component]
+* xref:rxjava.adoc[RxJava Component]
* xref:saga-component.adoc[Saga Component]
* xref:salesforce-component.adoc[Salesforce Component]
* xref:sap-netweaver-component.adoc[SAP NetWeaver Component]
diff --git a/docs/components/modules/ROOT/pages/rxjava2.adoc b/docs/components/modules/ROOT/pages/rxjava2.adoc
deleted file mode 100644
index ad080e9..0000000
--- a/docs/components/modules/ROOT/pages/rxjava2.adoc
+++ /dev/null
@@ -1,20 +0,0 @@
-= RxJava2 Component
-
-*Available as of Camel version 2.22*
-
-RxJava2 based back-end for Camel's reactive streams component.
-
-See more details in the camel-streams-component documentation.
-
-Maven users will need to add the following dependency to their `pom.xml`
-for this component:
-
-[source,xml]
-------------------------------------------------------------
-<dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
- <version>x.x.x</version>
- <!-- use the same version as your Camel core version -->
-</dependency>
-------------------------------------------------------------
\ No newline at end of file
diff --git a/docs/user-manual/modules/ROOT/pages/index.adoc b/docs/user-manual/modules/ROOT/pages/index.adoc
index 353487e..84e80b3 100644
--- a/docs/user-manual/modules/ROOT/pages/index.adoc
+++ b/docs/user-manual/modules/ROOT/pages/index.adoc
@@ -443,7 +443,7 @@ camel routes without them knowing
** xref:components::opentracing.adoc[OpenTracing]
** xref:components::reactor-component.adoc[Reactor]
** xref:components::ribbon.adoc[Ribbon]
-** xref:components::rxjava2.adoc[Rxjava2]
+** xref:components::rxjava.adoc[Rxjava]
** xref:components::shiro.adoc[Shiro]
** xref:components::spring-boot.adoc[Spring Boot]
** xref:components::spring-cloud.adoc[Spring Cloud]
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index d3e7368..a05920e 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -2565,12 +2565,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2-starter</artifactId>
+ <artifactId>camel-rxjava-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
[camel] 03/06: CAMEL-13792 - Rename components to default names,
Camel-rxjava2 to camel-rxjava - updated references
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 03cb34fbc0b06d9ef3797f962b102a056169b17a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Aug 5 12:47:20 2019 +0200
CAMEL-13792 - Rename components to default names, Camel-rxjava2 to camel-rxjava - updated references
---
apache-camel/pom.xml | 4 ++--
apache-camel/src/main/descriptors/common-bin.xml | 4 ++--
bom/camel-bom/pom.xml | 4 ++--
.../camel-rxjava/src/main/docs/{rxjava2.adoc => rxjava.adoc} | 8 ++++----
components/pom.xml | 2 +-
parent/pom.xml | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index df4ab2b..bf322aa 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -1209,7 +1209,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -2698,7 +2698,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2-starter</artifactId>
+ <artifactId>camel-rxjava-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 131e951..9bcdafa 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -262,7 +262,7 @@
<include>org.apache.camel:camel-restlet</include>
<include>org.apache.camel:camel-ribbon</include>
<include>org.apache.camel:camel-rss</include>
- <include>org.apache.camel:camel-rxjava2</include>
+ <include>org.apache.camel:camel-rxjava</include>
<include>org.apache.camel:camel-saga</include>
<include>org.apache.camel:camel-salesforce</include>
<include>org.apache.camel:camel-sap-netweaver</include>
@@ -599,7 +599,7 @@
<include>org.apache.camel:camel-restlet-starter</include>
<include>org.apache.camel:camel-ribbon-starter</include>
<include>org.apache.camel:camel-rss-starter</include>
- <include>org.apache.camel:camel-rxjava2-starter</include>
+ <include>org.apache.camel:camel-rxjava-starter</include>
<include>org.apache.camel:camel-saga-starter</include>
<include>org.apache.camel:camel-salesforce-starter</include>
<include>org.apache.camel:camel-sap-netweaver-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 7033723..39c28f9 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -2340,12 +2340,12 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2-starter</artifactId>
+ <artifactId>camel-rxjava-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/components/camel-rxjava/src/main/docs/rxjava2.adoc b/components/camel-rxjava/src/main/docs/rxjava.adoc
similarity index 69%
rename from components/camel-rxjava/src/main/docs/rxjava2.adoc
rename to components/camel-rxjava/src/main/docs/rxjava.adoc
index ad080e9..daf3c5a 100644
--- a/components/camel-rxjava/src/main/docs/rxjava2.adoc
+++ b/components/camel-rxjava/src/main/docs/rxjava.adoc
@@ -1,8 +1,8 @@
-= RxJava2 Component
+= RxJava Component
*Available as of Camel version 2.22*
-RxJava2 based back-end for Camel's reactive streams component.
+RxJava based back-end for Camel's reactive streams component.
See more details in the camel-streams-component documentation.
@@ -13,8 +13,8 @@ for this component:
------------------------------------------------------------
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>x.x.x</version>
<!-- use the same version as your Camel core version -->
</dependency>
-------------------------------------------------------------
\ No newline at end of file
+------------------------------------------------------------
diff --git a/components/pom.xml b/components/pom.xml
index b6c2da4..18773aa 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -273,7 +273,7 @@
<module>camel-rest-swagger</module>
<module>camel-restlet</module>
<module>camel-rss</module>
- <module>camel-rxjava2</module>
+ <module>camel-rxjava</module>
<module>camel-saga</module>
<module>camel-sap-netweaver</module>
<module>camel-saxon</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index 08bacbf..65fe4b6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1934,7 +1934,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2</artifactId>
+ <artifactId>camel-rxjava</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
@@ -3443,7 +3443,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-rxjava2-starter</artifactId>
+ <artifactId>camel-rxjava-starter</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>