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 <[email protected]> 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>
