This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new c22f737 Rename test support extension to a more meaningful name
c22f737 is described below
commit c22f737cd8a67643b2c3d3feaa761ad8a3b65447
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Tue May 12 14:28:11 2020 +0200
Rename test support extension to a more meaningful name
---
.../{core => custom-log-component}/deployment/pom.xml | 9 +++++----
.../camel/quarkus/core/support/deployment/Feature.java | 0
.../core/support/deployment/SupportBuildStep.java | 0
.../{core-main => custom-log-component}/pom.xml | 6 +++---
.../{core => custom-log-component}/runtime/pom.xml | 7 ++++---
.../camel/quarkus/core/support/SupportRecorder.java | 0
.../deployment/pom.xml | 9 +++++----
.../deployment/CustomMainListenerBuildStep.java} | 12 ++++++------
.../{core => custom-main-listener}/pom.xml | 6 +++---
.../{core-main => custom-main-listener}/runtime/pom.xml | 7 ++++---
.../it/support/mainlistener/CustomMainListener.java} | 4 ++--
.../mainlistener/CustomMainListenerRecorder.java} | 17 ++++++++---------
.../deployment/pom.xml | 9 +++++----
.../core/runtime/support/deployment/Feature.java | 0
.../runtime/support/deployment/SupportBuildStep.java | 0
.../pom.xml | 4 ++--
.../runtime/pom.xml | 7 ++++---
.../quarkus/core/runtime/support/SupportRecorder.java | 0
.../core/runtime/support/SupportRoutesCollector.java | 0
.../deployment/pom.xml | 9 +++++----
.../deployment/CustomTypeConverterBuildStep.java} | 15 ++++-----------
.../{core-main => custom-type-converter}/pom.xml | 4 ++--
.../runtime/pom.xml | 7 ++++---
.../typeconverter/CustomTypeConverterLoader.java} | 4 ++--
.../typeconverter/CustomTypeConverterRecorder.java} | 11 +++--------
.../camel/quarkus/it/support/typeconverter}/MyPair.java | 2 +-
integration-tests-support/pom.xml | 7 ++++---
integration-tests/core-main-collector/pom.xml | 2 +-
integration-tests/core-main/pom.xml | 6 +++++-
.../org/apache/camel/quarkus/core/CoreMainResource.java | 2 +-
.../org/apache/camel/quarkus/core/CoreMainTest.java | 4 ++--
integration-tests/core/pom.xml | 2 +-
poms/bom-test/pom.xml | 13 +++++++++----
33 files changed, 95 insertions(+), 90 deletions(-)
diff --git a/integration-tests-support/core/deployment/pom.xml
b/integration-tests-support/custom-log-component/deployment/pom.xml
similarity index 87%
rename from integration-tests-support/core/deployment/pom.xml
rename to integration-tests-support/custom-log-component/deployment/pom.xml
index 2c6a03f..bc1fc72 100644
--- a/integration-tests-support/core/deployment/pom.xml
+++ b/integration-tests-support/custom-log-component/deployment/pom.xml
@@ -20,13 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-core-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-log-component-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>camel-quarkus-integration-test-support-core-ext-deployment</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core :: Extension
:: Deployment</name>
+
<artifactId>camel-quarkus-integration-tests-support-custom-log-component-deployment</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Log
Component :: Deployment</name>
<description>A test extension</description>
<dependencyManagement>
@@ -59,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-ext</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-log-component</artifactId>
</dependency>
</dependencies>
diff --git
a/integration-tests-support/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/Feature.java
b/integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/Feature.java
similarity index 100%
rename from
integration-tests-support/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/Feature.java
rename to
integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/Feature.java
diff --git
a/integration-tests-support/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
b/integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
similarity index 100%
rename from
integration-tests-support/core/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
rename to
integration-tests-support/custom-log-component/deployment/src/main/java/org/apache/camel/quarkus/core/support/deployment/SupportBuildStep.java
diff --git a/integration-tests-support/core-main/pom.xml
b/integration-tests-support/custom-log-component/pom.xml
similarity index 88%
copy from integration-tests-support/core-main/pom.xml
copy to integration-tests-support/custom-log-component/pom.xml
index 5225e74..2602b2c 100644
--- a/integration-tests-support/core-main/pom.xml
+++ b/integration-tests-support/custom-log-component/pom.xml
@@ -21,15 +21,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <version>1.1.0-SNAPSHOT</version>
<artifactId>camel-quarkus-integration-tests-support</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
<artifactId>camel-quarkus-integration-tests-support-core-main-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-log-component-parent</artifactId>
<packaging>pom</packaging>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core Main ::
Parent</name>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Log
Component</name>
<modules>
<module>runtime</module>
diff --git a/integration-tests-support/core/runtime/pom.xml
b/integration-tests-support/custom-log-component/runtime/pom.xml
similarity index 89%
rename from integration-tests-support/core/runtime/pom.xml
rename to integration-tests-support/custom-log-component/runtime/pom.xml
index 089993a..b674c0d 100644
--- a/integration-tests-support/core/runtime/pom.xml
+++ b/integration-tests-support/custom-log-component/runtime/pom.xml
@@ -20,13 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-core-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-log-component-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>camel-quarkus-integration-test-support-core-ext</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core :: Extension
:: Runtime</name>
+
<artifactId>camel-quarkus-integration-tests-support-custom-log-component</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Log
Component :: Runtime</name>
<description>A test extension</description>
<dependencyManagement>
diff --git
a/integration-tests-support/core/runtime/src/main/java/org/apache/camel/quarkus/core/support/SupportRecorder.java
b/integration-tests-support/custom-log-component/runtime/src/main/java/org/apache/camel/quarkus/core/support/SupportRecorder.java
similarity index 100%
rename from
integration-tests-support/core/runtime/src/main/java/org/apache/camel/quarkus/core/support/SupportRecorder.java
rename to
integration-tests-support/custom-log-component/runtime/src/main/java/org/apache/camel/quarkus/core/support/SupportRecorder.java
diff --git a/integration-tests-support/core-main-collector/deployment/pom.xml
b/integration-tests-support/custom-main-listener/deployment/pom.xml
similarity index 86%
copy from integration-tests-support/core-main-collector/deployment/pom.xml
copy to integration-tests-support/custom-main-listener/deployment/pom.xml
index 7111c7a..d7acd71 100644
--- a/integration-tests-support/core-main-collector/deployment/pom.xml
+++ b/integration-tests-support/custom-main-listener/deployment/pom.xml
@@ -20,13 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-core-main-collector-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>camel-quarkus-integration-test-support-core-main-collector-ext-deployment</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core Main Collector
:: Extension :: Deployment</name>
+
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener-deployment</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Main
Listener :: Deployment</name>
<description>A test extension</description>
<dependencyManagement>
@@ -55,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-main-collector-ext</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
</dependency>
</dependencies>
diff --git
a/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
b/integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerBuildStep.java
similarity index 70%
copy from
integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
copy to
integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerBuildStep.java
index 4b606e8..9f83833 100644
---
a/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
+++
b/integration-tests-support/custom-main-listener/deployment/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/deployment/CustomMainListenerBuildStep.java
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.runtime.support.deployment;
+package org.apache.camel.quarkus.it.support.mainlistener.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
-import
org.apache.camel.quarkus.core.deployment.spi.CamelRoutesCollectorBuildItem;
-import org.apache.camel.quarkus.core.runtime.support.SupportRecorder;
+import org.apache.camel.quarkus.core.deployment.spi.CamelMainListenerBuildItem;
+import
org.apache.camel.quarkus.it.support.mainlistener.CustomMainListenerRecorder;
-public class SupportBuildStep {
+public class CustomMainListenerBuildStep {
@Record(ExecutionTime.STATIC_INIT)
@BuildStep
- CamelRoutesCollectorBuildItem listener(SupportRecorder recorder) {
- return new
CamelRoutesCollectorBuildItem(recorder.createSupportCollector());
+ CamelMainListenerBuildItem listener(CustomMainListenerRecorder recorder) {
+ return new
CamelMainListenerBuildItem(recorder.createSupportListener());
}
}
diff --git a/integration-tests-support/core/pom.xml
b/integration-tests-support/custom-main-listener/pom.xml
similarity index 88%
rename from integration-tests-support/core/pom.xml
rename to integration-tests-support/custom-main-listener/pom.xml
index fce9e27..97cb040 100644
--- a/integration-tests-support/core/pom.xml
+++ b/integration-tests-support/custom-main-listener/pom.xml
@@ -21,15 +21,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
- <artifactId>camel-quarkus-integration-tests-support</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <artifactId>camel-quarkus-integration-tests-support</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
-
<artifactId>camel-quarkus-integration-tests-support-core-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener-parent</artifactId>
<packaging>pom</packaging>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core ::
Parent</name>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Main
Listener</name>
<modules>
<module>runtime</module>
diff --git a/integration-tests-support/core-main/runtime/pom.xml
b/integration-tests-support/custom-main-listener/runtime/pom.xml
similarity index 90%
rename from integration-tests-support/core-main/runtime/pom.xml
rename to integration-tests-support/custom-main-listener/runtime/pom.xml
index 97f5214..01fad00 100644
--- a/integration-tests-support/core-main/runtime/pom.xml
+++ b/integration-tests-support/custom-main-listener/runtime/pom.xml
@@ -20,13 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-core-main-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>camel-quarkus-integration-test-support-core-main-ext</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core Main ::
Extension :: Runtime</name>
+
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Main
Listener :: Runtime</name>
<description>A test extension</description>
<dependencyManagement>
diff --git
a/integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportListener.java
b/integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListener.java
similarity index 94%
rename from
integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportListener.java
rename to
integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListener.java
index decef0a..8a76f65 100644
---
a/integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportListener.java
+++
b/integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListener.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.runtime.support;
+package org.apache.camel.quarkus.it.support.mainlistener;
import org.apache.camel.CamelContext;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.main.BaseMainSupport;
import org.apache.camel.main.MainListener;
-public class SupportListener implements MainListener {
+public class CustomMainListener implements MainListener {
@Override
public void configure(CamelContext context) {
try {
diff --git
a/integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
b/integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListenerRecorder.java
similarity index 68%
rename from
integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
rename to
integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListenerRecorder.java
index fcda057..debf9c2 100644
---
a/integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
+++
b/integration-tests-support/custom-main-listener/runtime/src/main/java/org/apache/camel/quarkus/it/support/mainlistener/CustomMainListenerRecorder.java
@@ -14,16 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.runtime.support.deployment;
+package org.apache.camel.quarkus.it.support.mainlistener;
-import io.quarkus.deployment.annotations.BuildStep;
-import io.quarkus.deployment.builditem.FeatureBuildItem;
+import io.quarkus.runtime.RuntimeValue;
+import io.quarkus.runtime.annotations.Recorder;
+import org.apache.camel.main.MainListener;
-public class Feature {
- private static final String FEATURE = "camel-main-support";
-
- @BuildStep
- FeatureBuildItem feature() {
- return new FeatureBuildItem(FEATURE);
+@Recorder
+public class CustomMainListenerRecorder {
+ public RuntimeValue<MainListener> createSupportListener() {
+ return new RuntimeValue<>(new CustomMainListener());
}
}
diff --git a/integration-tests-support/core-main-collector/deployment/pom.xml
b/integration-tests-support/custom-routes-collector/deployment/pom.xml
similarity index 86%
rename from integration-tests-support/core-main-collector/deployment/pom.xml
rename to integration-tests-support/custom-routes-collector/deployment/pom.xml
index 7111c7a..9d3640b 100644
--- a/integration-tests-support/core-main-collector/deployment/pom.xml
+++ b/integration-tests-support/custom-routes-collector/deployment/pom.xml
@@ -20,13 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-core-main-collector-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-routes-collector-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>camel-quarkus-integration-test-support-core-main-collector-ext-deployment</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core Main Collector
:: Extension :: Deployment</name>
+
<artifactId>camel-quarkus-integration-tests-support-custom-routes-collector-deployment</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Routes
Collector :: Deployment</name>
<description>A test extension</description>
<dependencyManagement>
@@ -55,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-main-collector-ext</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-routes-collector</artifactId>
</dependency>
</dependencies>
diff --git
a/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
b/integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
similarity index 100%
rename from
integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
rename to
integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/Feature.java
diff --git
a/integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
b/integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
similarity index 100%
rename from
integration-tests-support/core-main-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
rename to
integration-tests-support/custom-routes-collector/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
diff --git a/integration-tests-support/core-main-collector/pom.xml
b/integration-tests-support/custom-routes-collector/pom.xml
similarity index 88%
rename from integration-tests-support/core-main-collector/pom.xml
rename to integration-tests-support/custom-routes-collector/pom.xml
index 1f82f7d..6a5f77a 100644
--- a/integration-tests-support/core-main-collector/pom.xml
+++ b/integration-tests-support/custom-routes-collector/pom.xml
@@ -26,10 +26,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
-
<artifactId>camel-quarkus-integration-tests-support-core-main-collector-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-routes-collector-parent</artifactId>
<packaging>pom</packaging>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core Main
Collector:: Parent</name>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Routes
Collector</name>
<modules>
<module>runtime</module>
diff --git a/integration-tests-support/core-main-collector/runtime/pom.xml
b/integration-tests-support/custom-routes-collector/runtime/pom.xml
similarity index 88%
copy from integration-tests-support/core-main-collector/runtime/pom.xml
copy to integration-tests-support/custom-routes-collector/runtime/pom.xml
index cabd394..beac7b8 100644
--- a/integration-tests-support/core-main-collector/runtime/pom.xml
+++ b/integration-tests-support/custom-routes-collector/runtime/pom.xml
@@ -20,13 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-core-main-collector-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-routes-collector-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>camel-quarkus-integration-test-support-core-main-collector-ext</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core Main Collector
:: Extension :: Runtime</name>
+
<artifactId>camel-quarkus-integration-tests-support-custom-routes-collector</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Routes
Collector :: Runtime</name>
<description>A test extension</description>
<dependencyManagement>
diff --git
a/integration-tests-support/core-main-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRecorder.java
b/integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRecorder.java
similarity index 100%
rename from
integration-tests-support/core-main-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRecorder.java
rename to
integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRecorder.java
diff --git
a/integration-tests-support/core-main-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRoutesCollector.java
b/integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRoutesCollector.java
similarity index 100%
rename from
integration-tests-support/core-main-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRoutesCollector.java
rename to
integration-tests-support/custom-routes-collector/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRoutesCollector.java
diff --git a/integration-tests-support/core-main/deployment/pom.xml
b/integration-tests-support/custom-type-converter/deployment/pom.xml
similarity index 86%
rename from integration-tests-support/core-main/deployment/pom.xml
rename to integration-tests-support/custom-type-converter/deployment/pom.xml
index e487fc0..66e2c11 100644
--- a/integration-tests-support/core-main/deployment/pom.xml
+++ b/integration-tests-support/custom-type-converter/deployment/pom.xml
@@ -20,13 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-core-main-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>camel-quarkus-integration-test-support-core-main-ext-deployment</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core Main ::
Extension :: Deployment</name>
+
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter-deployment</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Type
Converter :: Deployment</name>
<description>A test extension</description>
<dependencyManagement>
@@ -55,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-main-ext</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>
</dependency>
</dependencies>
diff --git
a/integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
b/integration-tests-support/custom-type-converter/deployment/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/deployment/CustomTypeConverterBuildStep.java
similarity index 68%
rename from
integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
rename to
integration-tests-support/custom-type-converter/deployment/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/deployment/CustomTypeConverterBuildStep.java
index 8d431d6..0fa6664 100644
---
a/integration-tests-support/core-main/deployment/src/main/java/org/apache/camel/quarkus/core/runtime/support/deployment/SupportBuildStep.java
+++
b/integration-tests-support/custom-type-converter/deployment/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/deployment/CustomTypeConverterBuildStep.java
@@ -14,25 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.runtime.support.deployment;
+package org.apache.camel.quarkus.it.support.typeconverter.deployment;
import io.quarkus.deployment.annotations.BuildStep;
import io.quarkus.deployment.annotations.ExecutionTime;
import io.quarkus.deployment.annotations.Record;
-import org.apache.camel.quarkus.core.deployment.spi.CamelMainListenerBuildItem;
import
org.apache.camel.quarkus.core.deployment.spi.CamelTypeConverterLoaderBuildItem;
-import org.apache.camel.quarkus.core.runtime.support.SupportRecorder;
+import
org.apache.camel.quarkus.it.support.typeconverter.CustomTypeConverterRecorder;
-public class SupportBuildStep {
+public class CustomTypeConverterBuildStep {
@Record(ExecutionTime.STATIC_INIT)
@BuildStep
- CamelMainListenerBuildItem listener(SupportRecorder recorder) {
- return new
CamelMainListenerBuildItem(recorder.createSupportListener());
- }
-
- @Record(ExecutionTime.STATIC_INIT)
- @BuildStep
- CamelTypeConverterLoaderBuildItem typeConverterLoader(SupportRecorder
recorder) {
+ CamelTypeConverterLoaderBuildItem
typeConverterLoader(CustomTypeConverterRecorder recorder) {
return new
CamelTypeConverterLoaderBuildItem(recorder.createTypeConverterLoader());
}
}
diff --git a/integration-tests-support/core-main/pom.xml
b/integration-tests-support/custom-type-converter/pom.xml
similarity index 88%
rename from integration-tests-support/core-main/pom.xml
rename to integration-tests-support/custom-type-converter/pom.xml
index 5225e74..8d65864 100644
--- a/integration-tests-support/core-main/pom.xml
+++ b/integration-tests-support/custom-type-converter/pom.xml
@@ -26,10 +26,10 @@
<relativePath>../pom.xml</relativePath>
</parent>
-
<artifactId>camel-quarkus-integration-tests-support-core-main-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter-parent</artifactId>
<packaging>pom</packaging>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core Main ::
Parent</name>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Type
Converter</name>
<modules>
<module>runtime</module>
diff --git a/integration-tests-support/core-main-collector/runtime/pom.xml
b/integration-tests-support/custom-type-converter/runtime/pom.xml
similarity index 88%
rename from integration-tests-support/core-main-collector/runtime/pom.xml
rename to integration-tests-support/custom-type-converter/runtime/pom.xml
index cabd394..cb1cdbd 100644
--- a/integration-tests-support/core-main-collector/runtime/pom.xml
+++ b/integration-tests-support/custom-type-converter/runtime/pom.xml
@@ -20,13 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<parent>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-tests-support-core-main-collector-parent</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter-parent</artifactId>
<version>1.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
-
<artifactId>camel-quarkus-integration-test-support-core-main-collector-ext</artifactId>
- <name>Camel Quarkus :: Integration Tests :: Support :: Core Main Collector
:: Extension :: Runtime</name>
+
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>
+ <name>Camel Quarkus :: Integration Tests :: Support :: Custom Type
Converter :: Runtime</name>
<description>A test extension</description>
<dependencyManagement>
diff --git
a/integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportTypeConverterLoader.java
b/integration-tests-support/custom-type-converter/runtime/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/CustomTypeConverterLoader.java
similarity index 91%
rename from
integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportTypeConverterLoader.java
rename to
integration-tests-support/custom-type-converter/runtime/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/CustomTypeConverterLoader.java
index ff31293..4da8654 100644
---
a/integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportTypeConverterLoader.java
+++
b/integration-tests-support/custom-type-converter/runtime/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/CustomTypeConverterLoader.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.runtime.support;
+package org.apache.camel.quarkus.it.support.typeconverter;
import org.apache.camel.TypeConverterLoaderException;
import org.apache.camel.spi.TypeConverterLoader;
import org.apache.camel.spi.TypeConverterRegistry;
import org.apache.camel.support.SimpleTypeConverter;
-public class SupportTypeConverterLoader implements TypeConverterLoader {
+public class CustomTypeConverterLoader implements TypeConverterLoader {
@Override
public void load(TypeConverterRegistry registry) throws
TypeConverterLoaderException {
registry.addTypeConverter(
diff --git
a/integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRecorder.java
b/integration-tests-support/custom-type-converter/runtime/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/CustomTypeConverterRecorder.java
similarity index 75%
rename from
integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRecorder.java
rename to
integration-tests-support/custom-type-converter/runtime/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/CustomTypeConverterRecorder.java
index ed27a84..cd9256c 100644
---
a/integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/SupportRecorder.java
+++
b/integration-tests-support/custom-type-converter/runtime/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/CustomTypeConverterRecorder.java
@@ -14,20 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.runtime.support;
+package org.apache.camel.quarkus.it.support.typeconverter;
import io.quarkus.runtime.RuntimeValue;
import io.quarkus.runtime.annotations.Recorder;
-import org.apache.camel.main.MainListener;
import org.apache.camel.spi.TypeConverterLoader;
@Recorder
-public class SupportRecorder {
- public RuntimeValue<MainListener> createSupportListener() {
- return new RuntimeValue<>(new SupportListener());
- }
-
+public class CustomTypeConverterRecorder {
public RuntimeValue<TypeConverterLoader> createTypeConverterLoader() {
- return new RuntimeValue<>(new SupportTypeConverterLoader());
+ return new RuntimeValue<>(new CustomTypeConverterLoader());
}
}
diff --git
a/integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/MyPair.java
b/integration-tests-support/custom-type-converter/runtime/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/MyPair.java
similarity index 95%
rename from
integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/MyPair.java
rename to
integration-tests-support/custom-type-converter/runtime/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/MyPair.java
index 07a8347..9259cc1 100644
---
a/integration-tests-support/core-main/runtime/src/main/java/org/apache/camel/quarkus/core/runtime/support/MyPair.java
+++
b/integration-tests-support/custom-type-converter/runtime/src/main/java/org/apache/camel/quarkus/it/support/typeconverter/MyPair.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.quarkus.core.runtime.support;
+package org.apache.camel.quarkus.it.support.typeconverter;
public class MyPair {
public final String key;
diff --git a/integration-tests-support/pom.xml
b/integration-tests-support/pom.xml
index 5390100..0259955 100644
--- a/integration-tests-support/pom.xml
+++ b/integration-tests-support/pom.xml
@@ -37,11 +37,12 @@
<modules>
<module>custom-dataformat</module>
+ <module>custom-log-component</module>
+ <module>custom-routes-collector</module>
+ <module>custom-type-converter</module>
+ <module>custom-main-listener</module>
<module>test-support</module>
<module>testcontainers-support</module>
- <module>core</module>
- <module>core-main</module>
- <module>core-main-collector</module>
</modules>
</project>
diff --git a/integration-tests/core-main-collector/pom.xml
b/integration-tests/core-main-collector/pom.xml
index 839df54..8f0a576 100644
--- a/integration-tests/core-main-collector/pom.xml
+++ b/integration-tests/core-main-collector/pom.xml
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-main-collector-ext</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-routes-collector</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/integration-tests/core-main/pom.xml
b/integration-tests/core-main/pom.xml
index 338a0a6..70b9886 100644
--- a/integration-tests/core-main/pom.xml
+++ b/integration-tests/core-main/pom.xml
@@ -62,7 +62,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-main-ext</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git
a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java
b/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java
index 96da728..3e4912b 100644
---
a/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java
+++
b/integration-tests/core-main/src/main/java/org/apache/camel/quarkus/core/CoreMainResource.java
@@ -39,7 +39,7 @@ import org.apache.camel.ExtendedCamelContext;
import org.apache.camel.component.log.LogComponent;
import org.apache.camel.component.timer.TimerComponent;
import org.apache.camel.model.ModelCamelContext;
-import org.apache.camel.quarkus.core.runtime.support.MyPair;
+import org.apache.camel.quarkus.it.support.typeconverter.MyPair;
import org.apache.camel.reactive.vertx.VertXReactiveExecutor;
import org.apache.camel.spi.BeanRepository;
import org.apache.camel.spi.DataFormat;
diff --git
a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java
b/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java
index 15f9455..b349bd7 100644
---
a/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java
+++
b/integration-tests/core-main/src/test/java/org/apache/camel/quarkus/core/CoreMainTest.java
@@ -27,7 +27,7 @@ import io.restassured.RestAssured;
import io.restassured.http.ContentType;
import io.restassured.path.json.JsonPath;
import io.restassured.response.Response;
-import org.apache.camel.quarkus.core.runtime.support.SupportListener;
+import org.apache.camel.quarkus.it.support.mainlistener.CustomMainListener;
import org.apache.camel.reactive.vertx.VertXReactiveExecutor;
import org.apache.camel.support.DefaultLRUCacheFactory;
import org.junit.jupiter.api.Test;
@@ -88,7 +88,7 @@ public class CoreMainTest {
assertThat(p.getString("routes-collector.type-xml")).isEqualTo(DisabledXMLRoutesDefinitionLoader.class.getName());
assertThat(p.getList("listeners", String.class))
- .containsOnly(CamelMainEventDispatcher.class.getName(),
SupportListener.class.getName());
+ .containsOnly(CamelMainEventDispatcher.class.getName(),
CustomMainListener.class.getName());
assertThat(p.getList("routeBuilders", String.class))
.contains(CamelRoute.class.getName())
.doesNotContain(CamelRouteFiltered.class.getName());
diff --git a/integration-tests/core/pom.xml b/integration-tests/core/pom.xml
index 9c92af1..9d67e14 100644
--- a/integration-tests/core/pom.xml
+++ b/integration-tests/core/pom.xml
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-ext</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-log-component</artifactId>
</dependency>
<dependency>
diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml
index 3cf38e3..69d8674 100644
--- a/poms/bom-test/pom.xml
+++ b/poms/bom-test/pom.xml
@@ -47,22 +47,27 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-ext</artifactId>
+
<artifactId>camel-quarkus-integration-test-support-custom-dataformat</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-main-ext</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-log-component</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-core-main-collector-ext</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-main-listener</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
-
<artifactId>camel-quarkus-integration-test-support-custom-dataformat</artifactId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-routes-collector</artifactId>
+ <version>${camel-quarkus.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+
<artifactId>camel-quarkus-integration-tests-support-custom-type-converter</artifactId>
<version>${camel-quarkus.version}</version>
</dependency>
<dependency>
