#115 - introduces new isis-module-publishmq-dom-mq module as an SPI f…

…or publishmq service The JMS code now moves into this module, meaning that publishmq service itself is agnostic, just iterates over its own SPI.
incodehq · Oct 3, 2019 · c742ec1 · c742ec1
1 parent baf1057
commit c742ec1
Show file tree

Hide file tree

Showing 32 changed files with 655 additions and 174 deletions.
diff --git a/archetype/app/quickstart/appdefn/pom.xml b/archetype/app/quickstart/appdefn/pom.xml
@@ -182,6 +182,10 @@
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-servicespi</artifactId>

diff --git a/archetype/arch/quickstart/src/main/resources/archetype-resources/appdefn/pom.xml b/archetype/arch/quickstart/src/main/resources/archetype-resources/appdefn/pom.xml
@@ -211,6 +211,10 @@
                     <groupId>org.isisaddons.module.publishmq</groupId>
                     <artifactId>isis-module-publishmq-dom-jdo</artifactId>
                 </dependency>
+                <dependency>
+                    <groupId>org.isisaddons.module.publishmq</groupId>
+                    <artifactId>isis-module-publishmq-dom-mq</artifactId>
+                </dependency>
                 <dependency>
                     <groupId>org.isisaddons.module.publishmq</groupId>
                     <artifactId>isis-module-publishmq-dom-servicespi</artifactId>

diff --git a/modules/ext/flywaydb/fixture/pom.xml b/modules/ext/flywaydb/fixture/pom.xml
@@ -173,6 +173,11 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>
             <artifactId>isis-module-security-dom</artifactId>

diff --git a/modules/lib/docx/fixture/pom.xml b/modules/lib/docx/fixture/pom.xml
@@ -173,6 +173,11 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>
             <artifactId>isis-module-security-dom</artifactId>

diff --git a/modules/lib/excel/fixture/pom.xml b/modules/lib/excel/fixture/pom.xml
@@ -173,6 +173,11 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>
             <artifactId>isis-module-security-dom</artifactId>

diff --git a/modules/lib/fakedata/fixture/pom.xml b/modules/lib/fakedata/fixture/pom.xml
@@ -173,6 +173,11 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>
             <artifactId>isis-module-security-dom</artifactId>

diff --git a/modules/lib/poly/fixture/pom.xml b/modules/lib/poly/fixture/pom.xml
@@ -173,6 +173,11 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>
             <artifactId>isis-module-security-dom</artifactId>

diff --git a/modules/lib/servletapi/fixture/pom.xml b/modules/lib/servletapi/fixture/pom.xml
@@ -173,6 +173,11 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>
             <artifactId>isis-module-security-dom</artifactId>

diff --git a/modules/lib/stringinterpolator/fixture/pom.xml b/modules/lib/stringinterpolator/fixture/pom.xml
@@ -173,6 +173,11 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>
             <artifactId>isis-module-security-dom</artifactId>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -695,6 +695,18 @@
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.isisaddons.module.publishmq</groupId>
+                <artifactId>isis-module-publishmq-dom-mq</artifactId>
+                <version>${incode-platform.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.isisaddons.module.publishmq</groupId>
+                <artifactId>isis-module-publishmq-dom-mq</artifactId>
+                <version>${incode-platform.version}</version>
+                <type>test-jar</type>
+                <scope>test</scope>
+            </dependency>
             <dependency>
                 <groupId>org.isisaddons.module.publishmq</groupId>
                 <artifactId>isis-module-publishmq-dom-camel</artifactId>
@@ -1215,6 +1227,25 @@
 
     <profiles>
 
+        <profile>
+            <id>publishmq</id>
+            <activation>
+                <property>
+                    <name>publishmq</name>
+                </property>
+            </activation>
+            <modules>
+
+                <module>lib/base/impl</module>
+                <module>lib/fakedata/impl</module>
+
+                <module>spi/publishmq/fixture</module>
+                <module>spi/publishmq/impl</module>
+                <module>spi/publishmq/integtests</module>
+
+            </modules>
+        </profile>
+
         <profile>
             <id>default-modules</id>
             <activation>

diff --git a/modules/spi/audit/fixture/pom.xml b/modules/spi/audit/fixture/pom.xml
@@ -172,6 +172,10 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/modules/spi/audit/integtests/pom.xml b/modules/spi/audit/integtests/pom.xml
@@ -112,6 +112,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-camel</artifactId>

diff --git a/modules/spi/command/fixture/pom.xml b/modules/spi/command/fixture/pom.xml
@@ -173,6 +173,11 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>
             <artifactId>isis-module-security-dom</artifactId>

diff --git a/modules/spi/command/integtests/pom.xml b/modules/spi/command/integtests/pom.xml
@@ -112,6 +112,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-camel</artifactId>

diff --git a/modules/spi/publishmq/fixture/pom.xml b/modules/spi/publishmq/fixture/pom.xml
@@ -173,6 +173,11 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-mq</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>
             <artifactId>isis-module-security-dom</artifactId>

diff --git a/modules/spi/publishmq/impl/mq/log4j.properties b/modules/spi/publishmq/impl/mq/log4j.properties
@@ -0,0 +1,22 @@
+
+# Basic logging goes to "datanucleus.log"
+log4j.appender.A1=org.apache.log4j.FileAppender
+log4j.appender.A1.File=datanucleus.log
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%d{HH:mm:ss,SSS} (%t) %-5p [%c] - %m%n
+#log4j.appender.A1.Threshold=INFO
+
+# Categories
+# Each category can be set to a "level", and to direct to an appender
+
+# Default to DEBUG level for all DataNucleus categories
+log4j.logger.DataNucleus = DEBUG, A1
+
+log4j.category.com.mchange.v2.c3p0=INFO, A1
+log4j.category.com.mchange.v2.resourcepool=INFO, A1
+log4j.category.org.logicalcobwebs.proxool=INFO,A1
+
+
+# Hbase libs logging
+log4j.category.org.apache.hadoop=INFO,A1
+log4j.category.org.apache.zookeeper=INFO,A1