#115 - factors out a new outbox module, and have 'jdo' module depend …

…upon it. Also adds implementations of InteractionExecutionRepository and PublishedObjectsRepository for OutboxEvent.
incodehq · Oct 1, 2019 · 3417c63 · 3417c63
1 parent 230cf5a
commit 3417c63
Show file tree

Hide file tree

Showing 44 changed files with 681 additions and 13 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-outbox</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+                </dependency>
                 <dependency>
                     <groupId>org.isisaddons.module.publishmq</groupId>
                     <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+                <version>${incode-platform.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.isisaddons.module.publishmq</groupId>
+                <artifactId>isis-module-publishmq-dom-outbox</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-mq</artifactId>

diff --git a/modules/spi/audit/fixture/pom.xml b/modules/spi/audit/fixture/pom.xml
@@ -172,6 +172,11 @@ 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>

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-outbox</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</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-outbox</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</artifactId>

diff --git a/modules/spi/command/integtests/pom.xml b/modules/spi/command/integtests/pom.xml
@@ -112,6 +112,11 @@
             <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>

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-outbox</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
             <artifactId>isis-module-publishmq-dom-mq</artifactId>

diff --git a/modules/spi/publishmq/impl/jdo/pom.xml b/modules/spi/publishmq/impl/jdo/pom.xml
@@ -74,8 +74,15 @@
     <dependencies>
         <dependency>
             <groupId>org.isisaddons.module.publishmq</groupId>
-            <artifactId>isis-module-publishmq-dom-servicespi</artifactId>
+            <artifactId>isis-module-publishmq-dom-outbox</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.isis.core</groupId>
+            <artifactId>isis-core-runtime</artifactId>
+            <!-- to avoid polluting the classpath of any referencing projects -->
+            <optional>true</optional>
+        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>

diff --git a/modules/spi/publishmq/impl/jdo/src/main/java/META-INF/persistence.xml b/modules/spi/publishmq/impl/jdo/src/main/java/META-INF/persistence.xml
@@ -18,6 +18,6 @@ language governing permissions and limitations under the License.
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd" version="1.0">
 
-    <persistence-unit name="org-isisaddons-module-publishmq-dom">
+    <persistence-unit name="org-isisaddons-module-publishmq-dom-jdo">
     </persistence-unit>
 </persistence>
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
@@ -1,17 +1,26 @@
 package org.isisaddons.module.publishmq.dom.jdo;
 
+import java.util.Set;
+
 import javax.xml.bind.annotation.XmlRootElement;
 
+import com.google.common.collect.Sets;
+
+import org.apache.isis.applib.Module;
 import org.apache.isis.applib.ModuleAbstract;
 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")
 public class PublishMqSpiJdoModule extends ModuleAbstract {
 
+    @Override public Set<Module> getDependencies() {
+        return Sets.newHashSet(new PublishMqSpiOutboxModule());
+    }
+
     @Override
     public FixtureScript getTeardownFixture() {
         return new TeardownFixtureAbstract() {

diff --git a/...impl/jdo/src/main/java/org/isisaddons/module/publishmq/dom/jdo/events/PublishedEvent.java b/...impl/jdo/src/main/java/org/isisaddons/module/publishmq/dom/jdo/events/PublishedEvent.java
@@ -3,7 +3,11 @@
 import org.apache.isis.applib.annotation.DomainObject;
 import org.apache.isis.applib.annotation.DomainObjectLayout;
 import org.apache.isis.applib.annotation.Editing;
+import org.isisaddons.module.publishmq.dom.outbox.events.PublishedEventAbstract;
 
+/**
+ * This entity is in the "incorrect" module because it shares a superclass with OutboxEvent.
+ */
 @javax.jdo.annotations.PersistenceCapable(
         schema = "isispublishmq",
         table="PublishedEvent")

diff --git a/...n/java/org/isisaddons/module/publishmq/dom/jdo/spi/InteractionExecutionRepositoryJdo.java b/...n/java/org/isisaddons/module/publishmq/dom/jdo/spi/InteractionExecutionRepositoryJdo.java
@@ -16,9 +16,8 @@
 import org.apache.isis.schema.common.v1.InteractionType;
 import org.apache.isis.schema.ixn.v1.InteractionDto;
 import org.apache.isis.schema.utils.InteractionDtoUtils;
-
 import org.isisaddons.module.publishmq.dom.jdo.events.PublishedEvent;
-import org.isisaddons.module.publishmq.dom.jdo.events.PublishedEventType;
+import org.isisaddons.module.publishmq.dom.outbox.events.PublishedEventType;
 import org.isisaddons.module.publishmq.dom.servicespi.InteractionExecutionRepository;
 
 @DomainService(

diff --git a/.../main/java/org/isisaddons/module/publishmq/dom/jdo/spi/PublishedObjectsRepositoryJdo.java b/.../main/java/org/isisaddons/module/publishmq/dom/jdo/spi/PublishedObjectsRepositoryJdo.java
@@ -10,9 +10,8 @@
 import org.apache.isis.applib.services.title.TitleService;
 import org.apache.isis.schema.chg.v1.ChangesDto;
 import org.apache.isis.schema.utils.ChangesDtoUtils;
-
 import org.isisaddons.module.publishmq.dom.jdo.events.PublishedEvent;
-import org.isisaddons.module.publishmq.dom.jdo.events.PublishedEventType;
+import org.isisaddons.module.publishmq.dom.outbox.events.PublishedEventType;
 import org.isisaddons.module.publishmq.dom.servicespi.PublishedObjectsRepository;
 
 @DomainService(

diff --git a/...mq/impl/mq/src/main/java/org/isisaddons/module/publishmq/dom/mq/PublishMqSpiMqModule.java b/...mq/impl/mq/src/main/java/org/isisaddons/module/publishmq/dom/mq/PublishMqSpiMqModule.java
@@ -0,0 +1,21 @@
+package org.isisaddons.module.publishmq.dom.mq;
+
+import java.util.Set;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import com.google.common.collect.Sets;
+
+import org.apache.isis.applib.Module;
+import org.apache.isis.applib.ModuleAbstract;
+import org.isisaddons.module.publishmq.dom.servicespi.PublishMqSpiServicesModule;
+
+@XmlRootElement(name = "module")
+public class PublishMqSpiMqModule extends ModuleAbstract {
+
+    @Override public Set<Module> getDependencies() {
+        return Sets.newHashSet(new PublishMqSpiServicesModule());
+    }
+
+
+}
diff --git a/modules/spi/publishmq/impl/outbox/logging-dn-enhance.properties b/modules/spi/publishmq/impl/outbox/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