#115 - moves publishmq/jdo's status out to its own submodule

incodehq · Oct 3, 2019 · 44724d3 · 44724d3
1 parent f89be08
commit 44724d3
Show file tree

Hide file tree

Showing 37 changed files with 385 additions and 58 deletions.
diff --git a/archetype/app/quickstart/appdefn/pom.xml b/archetype/app/quickstart/appdefn/pom.xml
@@ -190,6 +190,10 @@
             <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-status</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
@@ -219,6 +219,10 @@
                     <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-status</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
@@ -172,16 +172,18 @@ 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-outbox</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-status</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/modules/lib/docx/fixture/pom.xml b/modules/lib/docx/fixture/pom.xml
@@ -172,16 +172,18 @@ 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-outbox</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-status</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/modules/lib/excel/fixture/pom.xml b/modules/lib/excel/fixture/pom.xml
@@ -172,16 +172,18 @@ 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-outbox</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-status</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/modules/lib/fakedata/fixture/pom.xml b/modules/lib/fakedata/fixture/pom.xml
@@ -172,16 +172,18 @@ 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-outbox</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-status</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/modules/lib/poly/fixture/pom.xml b/modules/lib/poly/fixture/pom.xml
@@ -172,16 +172,18 @@ 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-outbox</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-status</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/modules/lib/servletapi/fixture/pom.xml b/modules/lib/servletapi/fixture/pom.xml
@@ -172,16 +172,18 @@ 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-outbox</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-status</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/modules/lib/stringinterpolator/fixture/pom.xml b/modules/lib/stringinterpolator/fixture/pom.xml
@@ -172,16 +172,18 @@ 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-outbox</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-status</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/modules/pom.xml b/modules/pom.xml
@@ -719,6 +719,23 @@
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.isisaddons.module.publishmq</groupId>
+                <artifactId>isis-module-publishmq-dom-jdo</artifactId>
+                <version>${incode-platform.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.isisaddons.module.publishmq</groupId>
+                <artifactId>isis-module-publishmq-dom-status</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-status</artifactId>
+                <version>${incode-platform.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.isisaddons.module.publishmq</groupId>
                 <artifactId>isis-module-publishmq-dom-camel</artifactId>

diff --git a/modules/spi/audit/fixture/pom.xml b/modules/spi/audit/fixture/pom.xml
@@ -172,15 +172,18 @@ TODO: to reinstate, think that FixturesManifest needs some attention.
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
         </dependency>
-
-        <dependency>
+                <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-outbox</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-status</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
@@ -105,25 +105,26 @@
             <artifactId>isis-module-publishmq-dom-servicespi</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-outbox</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.isisaddons.module.publishmq</groupId>
+            <artifactId>isis-module-publishmq-dom-status</artifactId>
+            <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
@@ -172,16 +172,18 @@ 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-outbox</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-status</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/modules/spi/command/integtests/pom.xml b/modules/spi/command/integtests/pom.xml
@@ -111,17 +111,20 @@
             <artifactId>isis-module-publishmq-dom-jdo</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-outbox</artifactId>
         </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-status</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>

diff --git a/modules/spi/publishmq/fixture/pom.xml b/modules/spi/publishmq/fixture/pom.xml
@@ -172,16 +172,18 @@ 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-outbox</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-status</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.isisaddons.module.security</groupId>

diff --git a/...impl/jdo/src/main/java/org/isisaddons/module/publishmq/dom/jdo/PublishMqSpiJdoModule.java b/...impl/jdo/src/main/java/org/isisaddons/module/publishmq/dom/jdo/PublishMqSpiJdoModule.java
@@ -11,7 +11,6 @@
 import org.apache.isis.applib.fixturescripts.FixtureScript;
 import org.apache.isis.applib.fixturescripts.teardown.TeardownFixtureAbstract;
 import org.isisaddons.module.publishmq.dom.jdo.events.PublishedEvent;
-import org.isisaddons.module.publishmq.dom.jdo.status.StatusMessage;
 import org.isisaddons.module.publishmq.dom.outbox.PublishMqSpiOutboxModule;
 
 @XmlRootElement(name = "module")
@@ -26,7 +25,6 @@ public FixtureScript getTeardownFixture() {
         return new TeardownFixtureAbstract() {
             @Override
             protected void execute(final ExecutionContext executionContext) {
-                deleteFrom(StatusMessage.class);
                 deleteFrom(PublishedEvent.class);
             }
         };

diff --git a/modules/spi/publishmq/impl/pom.xml b/modules/spi/publishmq/impl/pom.xml
@@ -35,6 +35,7 @@
         <module>outbox</module>
         <module>jdo</module>
         <module>mq</module>
+        <module>status</module>
         <module>camel</module>
         <module>statusclient</module>
     </modules>

diff --git a/modules/spi/publishmq/impl/status/logging-dn-enhance.properties b/modules/spi/publishmq/impl/status/logging-dn-enhance.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