Merge pull request #41 from ozangunalp/refactor_extensions

Refactor modules to publish two extensions

docs/modules/ROOT/pages/index.adoc

@@ -7,15 +7,15 @@ 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:
 
 [source,xml,subs=attributes+]
 ----
 <dependency>
     <groupId>com.solace.quarkus</groupId>
-    <artifactId>quarkus-solace</artifactId>
+    <artifactId>quarkus-solace-client</artifactId>
     <version>{project-version}</version>
 </dependency>
 ----

docs/pom.xml

@@ -17,7 +17,12 @@
         <!-- Make sure the doc is built after the other artifacts -->
         <dependency>
             <groupId>com.solace.quarkus</groupId>
-            <artifactId>quarkus-solace-deployment</artifactId>
+            <artifactId>quarkus-solace-client-deployment</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.solace.quarkus</groupId>
+            <artifactId>quarkus-solace-messaging-connector-deployment</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>

integration-tests/pom.xml

@@ -7,7 +7,7 @@
         <version>999-SNAPSHOT</version>
     </parent>
     <artifactId>quarkus-solace-integration-tests-parent</artifactId>
-    <name>Quarkus - Solace - Integration Tests - Parent</name>
+    <name>Quarkus Solace - Integration Tests - Parent</name>
     <packaging>pom</packaging>
     <modules>
         <module>solace-client-integration-tests</module>

integration-tests/solace-client-integration-tests/pom.xml

@@ -11,6 +11,7 @@
     </parent>
 
     <artifactId>solace-client-integration-tests</artifactId>
+    <name>Quarkus Solace Client - Integration Tests</name>
 
     <dependencies>
         <dependency>
@@ -19,7 +20,7 @@
         </dependency>
         <dependency>
             <groupId>com.solace.quarkus</groupId>
-            <artifactId>quarkus-solace</artifactId>
+            <artifactId>quarkus-solace-client</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

pom.xml

@@ -14,9 +14,8 @@
   <name>Quarkus Solace - Parent</name>
 
   <modules>
-    <module>deployment</module>
-    <module>runtime</module>
-    <module>pubsub-plus-connector</module>
+    <module>quarkus-solace-client</module>
+    <module>quarkus-solace-messaging-connector</module>
     <module>docs</module>
     <module>samples/hello-solace</module>
     <module>samples/hello-connector-solace</module>

deployment/pom.xml → quarkus-solace-client/deployment/pom.xml

@@ -4,11 +4,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.solace.quarkus</groupId>
-    <artifactId>quarkus-solace-parent</artifactId>
+    <artifactId>quarkus-solace-client-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>quarkus-solace-deployment</artifactId>
-  <name>Quarkus Solace - Deployment</name>
+  <artifactId>quarkus-solace-client-deployment</artifactId>
+  <name>Quarkus Solace Client - Deployment</name>
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>
@@ -20,7 +20,7 @@
     </dependency>
     <dependency>
       <groupId>com.solace.quarkus</groupId>
-      <artifactId>quarkus-solace</artifactId>
+      <artifactId>quarkus-solace-client</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>

deployment/src/main/java/com/solace/quarkus/deployment/SolaceProcessor.java → 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),

quarkus-solace-client/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.solace.quarkus</groupId>
+        <artifactId>quarkus-solace-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <artifactId>quarkus-solace-client-parent</artifactId>
+    <name>Quarkus Solace Client - Parent</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>

runtime/pom.xml → quarkus-solace-client/runtime/pom.xml

@@ -4,11 +4,11 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.solace.quarkus</groupId>
-    <artifactId>quarkus-solace-parent</artifactId>
+    <artifactId>quarkus-solace-client-parent</artifactId>
     <version>999-SNAPSHOT</version>
   </parent>
-  <artifactId>quarkus-solace</artifactId>
-  <name>Quarkus Solace - Runtime</name>
+  <artifactId>quarkus-solace-client</artifactId>
+  <name>Quarkus Solace Client - Runtime</name>
   <dependencies>
     <dependency>
       <groupId>io.quarkus</groupId>

quarkus-solace-messaging-connector/deployment/pom.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.solace.quarkus</groupId>
+        <artifactId>quarkus-solace-messaging-connector-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <artifactId>quarkus-solace-messaging-connector-deployment</artifactId>
+    <name>Quarkus Solace Messaging Connector - Deployment</name>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-smallrye-reactive-messaging-deployment</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.solace.quarkus</groupId>
+            <artifactId>quarkus-solace-client-deployment</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${quarkus.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

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);
+    }
+
+}

quarkus-solace-messaging-connector/pom.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.solace.quarkus</groupId>
+        <artifactId>quarkus-solace-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <artifactId>quarkus-solace-messaging-connector-parent</artifactId>
+    <name>Quarkus Solace Messaging Connector - Parent</name>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+
+</project>

pubsub-plus-connector/pom.xml → quarkus-solace-messaging-connector/runtime/pom.xml

@@ -5,13 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.solace.quarkus</groupId>
-        <artifactId>quarkus-solace-parent</artifactId>
+        <artifactId>quarkus-solace-messaging-connector-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
-
     <artifactId>quarkus-solace-messaging-connector</artifactId>
-    <name>Quarkus Solace Messaging Connector</name>
-
+    <name>Quarkus Solace Messaging Connector - Runtime</name>
     <dependencies>
         <dependency>
             <groupId>io.smallrye.config</groupId>

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."

samples/hello-connector-solace/pom.xml

@@ -17,7 +17,7 @@
         </dependency>
         <dependency>
             <groupId>com.solace.quarkus</groupId>
-            <artifactId>quarkus-solace</artifactId>
+            <artifactId>quarkus-solace-client</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

samples/hello-solace/pom.xml

@@ -17,7 +17,7 @@
         </dependency>
         <dependency>
             <groupId>com.solace.quarkus</groupId>
-            <artifactId>quarkus-solace</artifactId>
+            <artifactId>quarkus-solace-client</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>