diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index b31bc50..0e8b029 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -7,7 +7,7 @@ TIP: Solace Quarkus Extension for integrating with Solace PubSub+ message broker == Installation -If you want to use this extension, you need to add the `com.solace.quarkus:quarkus-solace` extension first to your build file. +If you want to use this extension, you need to add the `com.solace.quarkus:quarkus-solace-client` extension first to your build file. For instance, with Maven, add the following dependency to your POM file: @@ -15,7 +15,7 @@ For instance, with Maven, add the following dependency to your POM file: ---- com.solace.quarkus - quarkus-solace + quarkus-solace-client {project-version} ---- diff --git a/docs/pom.xml b/docs/pom.xml index 5cc5ca2..f8f93d2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -17,7 +17,12 @@ com.solace.quarkus - quarkus-solace-deployment + quarkus-solace-client-deployment + ${project.version} + + + com.solace.quarkus + quarkus-solace-messaging-connector-deployment ${project.version} diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 74e5515..548e664 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -7,7 +7,7 @@ 999-SNAPSHOT quarkus-solace-integration-tests-parent - Quarkus - Solace - Integration Tests - Parent + Quarkus Solace - Integration Tests - Parent pom solace-client-integration-tests diff --git a/integration-tests/solace-client-integration-tests/pom.xml b/integration-tests/solace-client-integration-tests/pom.xml index 9849ef7..7230dd5 100644 --- a/integration-tests/solace-client-integration-tests/pom.xml +++ b/integration-tests/solace-client-integration-tests/pom.xml @@ -11,6 +11,7 @@ solace-client-integration-tests + Quarkus Solace Client - Integration Tests @@ -19,7 +20,7 @@ com.solace.quarkus - quarkus-solace + quarkus-solace-client ${project.version} diff --git a/pom.xml b/pom.xml index b3de769..8d6f8b0 100644 --- a/pom.xml +++ b/pom.xml @@ -14,9 +14,8 @@ Quarkus Solace - Parent - deployment - runtime - pubsub-plus-connector + quarkus-solace-client + quarkus-solace-messaging-connector docs samples/hello-solace samples/hello-connector-solace diff --git a/deployment/pom.xml b/quarkus-solace-client/deployment/pom.xml similarity index 91% rename from deployment/pom.xml rename to quarkus-solace-client/deployment/pom.xml index 573e55a..6fa3f55 100644 --- a/deployment/pom.xml +++ b/quarkus-solace-client/deployment/pom.xml @@ -4,11 +4,11 @@ 4.0.0 com.solace.quarkus - quarkus-solace-parent + quarkus-solace-client-parent 999-SNAPSHOT - quarkus-solace-deployment - Quarkus Solace - Deployment + quarkus-solace-client-deployment + Quarkus Solace Client - Deployment io.quarkus @@ -20,7 +20,7 @@ com.solace.quarkus - quarkus-solace + quarkus-solace-client ${project.version} diff --git a/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesConfig.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesConfig.java similarity index 100% rename from deployment/src/main/java/com/solace/quarkus/deployment/DevServicesConfig.java rename to quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesConfig.java diff --git a/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java similarity index 100% rename from deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java rename to quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/DevServicesSolaceProcessor.java diff --git a/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildItem.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildItem.java similarity index 100% rename from deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildItem.java rename to quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildItem.java diff --git a/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildTimeConfig.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildTimeConfig.java similarity index 100% rename from deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildTimeConfig.java rename to quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceBuildTimeConfig.java diff --git a/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java similarity index 98% rename from deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java rename to quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java index 4b7d02b..6305d4e 100644 --- a/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java +++ b/quarkus-solace-client/deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java @@ -32,7 +32,7 @@ class SolaceProcessor { - private static final String FEATURE = "solace"; + private static final String FEATURE = "solace-client"; private static final ParameterizedType SOLACE_CUSTOMIZER_INJECTION_TYPE = ParameterizedType.create( DotName.createSimple(Instance.class), diff --git a/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceContainer.java b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceContainer.java similarity index 100% rename from deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceContainer.java rename to quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceContainer.java diff --git a/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceCustomizerTest.java b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceCustomizerTest.java similarity index 100% rename from deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceCustomizerTest.java rename to quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceCustomizerTest.java diff --git a/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java similarity index 100% rename from deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java rename to quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceDevModeTest.java diff --git a/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldPersistentTest.java b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldPersistentTest.java similarity index 100% rename from deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldPersistentTest.java rename to quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldPersistentTest.java diff --git a/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldTest.java b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldTest.java similarity index 100% rename from deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldTest.java rename to quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceHelloWorldTest.java diff --git a/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceTestResource.java b/quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceTestResource.java similarity index 100% rename from deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceTestResource.java rename to quarkus-solace-client/deployment/src/test/java/com/solace/quarkus/deployment/test/SolaceTestResource.java diff --git a/quarkus-solace-client/pom.xml b/quarkus-solace-client/pom.xml new file mode 100644 index 0000000..4360b55 --- /dev/null +++ b/quarkus-solace-client/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + com.solace.quarkus + quarkus-solace-parent + 999-SNAPSHOT + + quarkus-solace-client-parent + Quarkus Solace Client - Parent + pom + + + deployment + runtime + + + diff --git a/runtime/pom.xml b/quarkus-solace-client/runtime/pom.xml similarity index 92% rename from runtime/pom.xml rename to quarkus-solace-client/runtime/pom.xml index 52a79e7..04c47c8 100644 --- a/runtime/pom.xml +++ b/quarkus-solace-client/runtime/pom.xml @@ -4,11 +4,11 @@ 4.0.0 com.solace.quarkus - quarkus-solace-parent + quarkus-solace-client-parent 999-SNAPSHOT - quarkus-solace - Quarkus Solace - Runtime + quarkus-solace-client + Quarkus Solace Client - Runtime io.quarkus diff --git a/runtime/src/main/java/com/solace/quarkus/MessagingServiceClientCustomizer.java b/quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/MessagingServiceClientCustomizer.java similarity index 100% rename from runtime/src/main/java/com/solace/quarkus/MessagingServiceClientCustomizer.java rename to quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/MessagingServiceClientCustomizer.java diff --git a/runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java b/quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java similarity index 100% rename from runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java rename to quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/SolaceConfig.java diff --git a/runtime/src/main/java/com/solace/quarkus/runtime/SolaceRecorder.java b/quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/SolaceRecorder.java similarity index 100% rename from runtime/src/main/java/com/solace/quarkus/runtime/SolaceRecorder.java rename to quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/SolaceRecorder.java diff --git a/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceHealthCheck.java b/quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceHealthCheck.java similarity index 100% rename from runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceHealthCheck.java rename to quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceHealthCheck.java diff --git a/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceMetricBinder.java b/quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceMetricBinder.java similarity index 100% rename from runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceMetricBinder.java rename to quarkus-solace-client/runtime/src/main/java/com/solace/quarkus/runtime/observability/SolaceMetricBinder.java diff --git a/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus-solace-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml similarity index 100% rename from runtime/src/main/resources/META-INF/quarkus-extension.yaml rename to quarkus-solace-client/runtime/src/main/resources/META-INF/quarkus-extension.yaml diff --git a/quarkus-solace-messaging-connector/deployment/pom.xml b/quarkus-solace-messaging-connector/deployment/pom.xml new file mode 100644 index 0000000..bdea0cb --- /dev/null +++ b/quarkus-solace-messaging-connector/deployment/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + com.solace.quarkus + quarkus-solace-messaging-connector-parent + 999-SNAPSHOT + + quarkus-solace-messaging-connector-deployment + Quarkus Solace Messaging Connector - Deployment + + + io.quarkus + quarkus-smallrye-reactive-messaging-deployment + + + com.solace.quarkus + quarkus-solace-client-deployment + ${project.version} + + + + + + maven-compiler-plugin + + + + io.quarkus + quarkus-extension-processor + ${quarkus.version} + + + + + + + diff --git a/quarkus-solace-messaging-connector/deployment/src/main/java/com/solace/quarkus/messaging/deployment/SolaceMessagingProcessor.java b/quarkus-solace-messaging-connector/deployment/src/main/java/com/solace/quarkus/messaging/deployment/SolaceMessagingProcessor.java new file mode 100644 index 0000000..6c8f9fc --- /dev/null +++ b/quarkus-solace-messaging-connector/deployment/src/main/java/com/solace/quarkus/messaging/deployment/SolaceMessagingProcessor.java @@ -0,0 +1,15 @@ +package com.solace.quarkus.messaging.deployment; + +import io.quarkus.deployment.annotations.BuildStep; +import io.quarkus.deployment.builditem.FeatureBuildItem; + +public class SolaceMessagingProcessor { + + public static final String FEATURE = "solace-messaging-connector"; + + @BuildStep + FeatureBuildItem feature() { + return new FeatureBuildItem(FEATURE); + } + +} diff --git a/quarkus-solace-messaging-connector/pom.xml b/quarkus-solace-messaging-connector/pom.xml new file mode 100644 index 0000000..1ffdd58 --- /dev/null +++ b/quarkus-solace-messaging-connector/pom.xml @@ -0,0 +1,19 @@ + + + 4.0.0 + + com.solace.quarkus + quarkus-solace-parent + 999-SNAPSHOT + + quarkus-solace-messaging-connector-parent + Quarkus Solace Messaging Connector - Parent + pom + + + deployment + runtime + + + diff --git a/pubsub-plus-connector/pom.xml b/quarkus-solace-messaging-connector/runtime/pom.xml similarity index 97% rename from pubsub-plus-connector/pom.xml rename to quarkus-solace-messaging-connector/runtime/pom.xml index 7de54fe..272e46e 100644 --- a/pubsub-plus-connector/pom.xml +++ b/quarkus-solace-messaging-connector/runtime/pom.xml @@ -5,13 +5,11 @@ 4.0.0 com.solace.quarkus - quarkus-solace-parent + quarkus-solace-messaging-connector-parent 999-SNAPSHOT - quarkus-solace-messaging-connector - Quarkus Solace Messaging Connector - + Quarkus Solace Messaging Connector - Runtime io.smallrye.config diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/SolaceConnector.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/SolaceConnector.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/SolaceConnector.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/SolaceConnector.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/converters/SolaceMessageConverter.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/converters/SolaceMessageConverter.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/converters/SolaceMessageConverter.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/converters/SolaceMessageConverter.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/OutboundErrorMessageMapper.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/OutboundErrorMessageMapper.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/OutboundErrorMessageMapper.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/OutboundErrorMessageMapper.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceDiscard.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceDiscard.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceDiscard.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceDiscard.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopic.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopic.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopic.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopic.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopicPublisherHandler.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopicPublisherHandler.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopicPublisherHandler.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceErrorTopicPublisherHandler.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFail.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceFail.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFail.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceFail.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFailureHandler.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceFailureHandler.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceFailureHandler.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceFailureHandler.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceIgnoreFailure.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceIgnoreFailure.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/fault/SolaceIgnoreFailure.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/fault/SolaceIgnoreFailure.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceExceptions.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/i18n/SolaceExceptions.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceExceptions.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/i18n/SolaceExceptions.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceLogging.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/i18n/SolaceLogging.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/i18n/SolaceLogging.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/i18n/SolaceLogging.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/IncomingMessagesUnsignedCounterBarrier.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/IncomingMessagesUnsignedCounterBarrier.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/IncomingMessagesUnsignedCounterBarrier.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/IncomingMessagesUnsignedCounterBarrier.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SettleMetadata.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SettleMetadata.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SettleMetadata.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SettleMetadata.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceAckHandler.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceAckHandler.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceAckHandler.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceAckHandler.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMessage.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMessage.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMessage.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMessage.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMetadata.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMetadata.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMetadata.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceInboundMetadata.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceIncomingChannel.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceIncomingChannel.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/incoming/SolaceIncomingChannel.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/incoming/SolaceIncomingChannel.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/OutgoingMessagesUnsignedCounterBarrier.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/OutgoingMessagesUnsignedCounterBarrier.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/OutgoingMessagesUnsignedCounterBarrier.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/OutgoingMessagesUnsignedCounterBarrier.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SenderProcessor.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/SenderProcessor.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SenderProcessor.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/SenderProcessor.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMessage.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMessage.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMessage.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMessage.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMetadata.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMetadata.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMetadata.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutboundMetadata.java diff --git a/pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutgoingChannel.java b/quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutgoingChannel.java similarity index 100% rename from pubsub-plus-connector/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutgoingChannel.java rename to quarkus-solace-messaging-connector/runtime/src/main/java/com/solace/quarkus/messaging/outgoing/SolaceOutgoingChannel.java diff --git a/pubsub-plus-connector/src/main/resources/META-INF/beans.xml b/quarkus-solace-messaging-connector/runtime/src/main/resources/META-INF/beans.xml similarity index 100% rename from pubsub-plus-connector/src/main/resources/META-INF/beans.xml rename to quarkus-solace-messaging-connector/runtime/src/main/resources/META-INF/beans.xml diff --git a/quarkus-solace-messaging-connector/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/quarkus-solace-messaging-connector/runtime/src/main/resources/META-INF/quarkus-extension.yaml new file mode 100644 index 0000000..89187ff --- /dev/null +++ b/quarkus-solace-messaging-connector/runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -0,0 +1,13 @@ +name: Solace Messaging Connector +description: Solace Quarkus Messaging Connector Extension for integrating with Solace PubSub+ message brokers with Reactive Messaging. +metadata: + keywords: + - "solace" + - "pubsubplus event broker" +# guide: https://quarkiverse.github.io/quarkiverse-docs/solace/dev/ # To create and publish this guide, see https://github.com/quarkiverse/quarkiverse/wiki#documenting-your-extension + categories: + - "messaging" + status: "preview" + config: + - "mp.messaging." + - "quarkus.reactive-messaging." diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceConsumerTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/SolaceConsumerTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceConsumerTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/SolaceConsumerTest.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceProcessorTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/SolaceProcessorTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolaceProcessorTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/SolaceProcessorTest.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolacePublisherTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/SolacePublisherTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/SolacePublisherTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/SolacePublisherTest.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/MessagingServiceProvider.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/MessagingServiceProvider.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/MessagingServiceProvider.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/MessagingServiceProvider.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBaseTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/SolaceBaseTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBaseTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/SolaceBaseTest.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBrokerExtension.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/SolaceBrokerExtension.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceBrokerExtension.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/SolaceBrokerExtension.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceContainer.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/SolaceContainer.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/SolaceContainer.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/SolaceContainer.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/WeldTestBase.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/WeldTestBase.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/base/WeldTestBase.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/base/WeldTestBase.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolaceConsumerHealthTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/health/SolaceConsumerHealthTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolaceConsumerHealthTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/health/SolaceConsumerHealthTest.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolacePublisherHealthCheck.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/health/SolacePublisherHealthCheck.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/health/SolacePublisherHealthCheck.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/health/SolacePublisherHealthCheck.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationAckTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationAckTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationAckTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationAckTest.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/locals/LocalPropagationTest.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/logging/SolaceTestAppender.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/logging/SolaceTestAppender.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/logging/SolaceTestAppender.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/logging/SolaceTestAppender.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/EndToEndPerformanceTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/perf/EndToEndPerformanceTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/EndToEndPerformanceTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/perf/EndToEndPerformanceTest.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolaceConsumerPerformanceTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/perf/SolaceConsumerPerformanceTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolaceConsumerPerformanceTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/perf/SolaceConsumerPerformanceTest.java diff --git a/pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolacePublisherPerformanceTest.java b/quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/perf/SolacePublisherPerformanceTest.java similarity index 100% rename from pubsub-plus-connector/src/test/java/com/solace/quarkus/messaging/perf/SolacePublisherPerformanceTest.java rename to quarkus-solace-messaging-connector/runtime/src/test/java/com/solace/quarkus/messaging/perf/SolacePublisherPerformanceTest.java diff --git a/pubsub-plus-connector/src/test/resources/log4j.properties b/quarkus-solace-messaging-connector/runtime/src/test/resources/log4j.properties similarity index 100% rename from pubsub-plus-connector/src/test/resources/log4j.properties rename to quarkus-solace-messaging-connector/runtime/src/test/resources/log4j.properties diff --git a/samples/hello-connector-solace/pom.xml b/samples/hello-connector-solace/pom.xml index 3e9a7fc..2cfe197 100644 --- a/samples/hello-connector-solace/pom.xml +++ b/samples/hello-connector-solace/pom.xml @@ -17,7 +17,7 @@ com.solace.quarkus - quarkus-solace + quarkus-solace-client ${project.version} diff --git a/samples/hello-solace/pom.xml b/samples/hello-solace/pom.xml index ea91be7..640cdc1 100644 --- a/samples/hello-solace/pom.xml +++ b/samples/hello-solace/pom.xml @@ -17,7 +17,7 @@ com.solace.quarkus - quarkus-solace + quarkus-solace-client ${project.version}