The BPMN, CMMN and App Spring Engines should use the SpringEventRegis…

…tryConfigurator
filiphr · Feb 16, 2020 · 35f751d · 35f751d
1 parent b960d6a
commit 35f751d
Show file tree

Hide file tree

Showing 20 changed files with 53 additions and 115 deletions.
diff --git a/modules/flowable-app-engine-spring/pom.xml b/modules/flowable-app-engine-spring/pom.xml
@@ -97,6 +97,10 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-spring-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-event-registry-spring-configurator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>

diff --git a/...app-engine-spring/src/main/java/org/flowable/app/spring/SpringAppEngineConfiguration.java b/...app-engine-spring/src/main/java/org/flowable/app/spring/SpringAppEngineConfiguration.java
@@ -24,12 +24,14 @@
 import org.flowable.app.engine.AppEngines;
 import org.flowable.app.spring.autodeployment.DefaultAutoDeploymentStrategy;
 import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.impl.EngineConfigurator;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
 import org.flowable.common.engine.impl.interceptor.CommandInterceptor;
 import org.flowable.common.spring.AutoDeploymentStrategy;
 import org.flowable.common.spring.SpringEngineConfiguration;
 import org.flowable.common.spring.SpringTransactionContextFactory;
 import org.flowable.common.spring.SpringTransactionInterceptor;
+import org.flowable.eventregistry.spring.configurator.SpringEventRegistryConfigurator;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.Resource;
@@ -66,6 +68,10 @@ public AppEngine buildAppEngine() {
         return appEngine;
     }
 
+    protected EngineConfigurator createDefaultEventRegistryEngineConfigurator() {
+        return new SpringEventRegistryConfigurator();
+    }
+
     public void setTransactionSynchronizationAdapterOrder(Integer transactionSynchronizationAdapterOrder) {
         this.transactionSynchronizationAdapterOrder = transactionSynchronizationAdapterOrder;
     }

diff --git a/...les/flowable-app-engine/src/main/java/org/flowable/app/engine/AppEngineConfiguration.java b/...les/flowable-app-engine/src/main/java/org/flowable/app/engine/AppEngineConfiguration.java
@@ -491,7 +491,7 @@ protected List<EngineConfigurator> getEngineSpecificEngineConfigurators() {
                 if (eventRegistryConfigurator != null) {
                     specificConfigurators.add(eventRegistryConfigurator);
                 } else {
-                    specificConfigurators.add(new EventRegistryEngineConfigurator());
+                    specificConfigurators.add(createDefaultEventRegistryEngineConfigurator());
                 }
             }
 
@@ -500,6 +500,10 @@ protected List<EngineConfigurator> getEngineSpecificEngineConfigurators() {
         return Collections.emptyList();
     }
 
+    protected EngineConfigurator createDefaultEventRegistryEngineConfigurator() {
+        return new EventRegistryEngineConfigurator();
+    }
+
     @Override
     public String getEngineName() {
         return appEngineName;

diff --git a/.../flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java b/.../flowable-cmmn-engine/src/main/java/org/flowable/cmmn/engine/CmmnEngineConfiguration.java
@@ -1935,6 +1935,10 @@ protected List<EngineConfigurator> getEngineSpecificEngineConfigurators() {
         return Collections.emptyList();
     }
 
+    protected EngineConfigurator createDefaultEventRegistryEngineConfigurator() {
+        return new EventRegistryEngineConfigurator();
+    }
+
     @Override
     public String getEngineName() {
         return cmmnEngineName;

diff --git a/modules/flowable-cmmn-spring/pom.xml b/modules/flowable-cmmn-spring/pom.xml
@@ -101,6 +101,10 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-job-spring-service</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-event-registry-spring-configurator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>

diff --git a/...ble-cmmn-spring/src/main/java/org/flowable/cmmn/spring/SpringCmmnEngineConfiguration.java b/...ble-cmmn-spring/src/main/java/org/flowable/cmmn/spring/SpringCmmnEngineConfiguration.java
@@ -26,12 +26,14 @@
 import org.flowable.cmmn.spring.autodeployment.ResourceParentFolderAutoDeploymentStrategy;
 import org.flowable.cmmn.spring.autodeployment.SingleResourceAutoDeploymentStrategy;
 import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.impl.EngineConfigurator;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
 import org.flowable.common.engine.impl.interceptor.CommandInterceptor;
 import org.flowable.common.spring.AutoDeploymentStrategy;
 import org.flowable.common.spring.SpringEngineConfiguration;
 import org.flowable.common.spring.SpringTransactionContextFactory;
 import org.flowable.common.spring.SpringTransactionInterceptor;
+import org.flowable.eventregistry.spring.configurator.SpringEventRegistryConfigurator;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.io.Resource;
@@ -72,6 +74,10 @@ public CmmnEngine buildCmmnEngine() {
         return cmmnEngine;
     }
 
+    protected EngineConfigurator createDefaultEventRegistryEngineConfigurator() {
+        return new SpringEventRegistryConfigurator();
+    }
+
     public void setTransactionSynchronizationAdapterOrder(Integer transactionSynchronizationAdapterOrder) {
         this.transactionSynchronizationAdapterOrder = transactionSynchronizationAdapterOrder;
     }

diff --git a/...ble-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java b/...ble-engine/src/main/java/org/flowable/engine/impl/cfg/ProcessEngineConfigurationImpl.java
@@ -2659,6 +2659,10 @@ protected List<EngineConfigurator> getEngineSpecificEngineConfigurators() {
         return Collections.emptyList();
     }
 
+    protected EngineConfigurator createDefaultEventRegistryEngineConfigurator() {
+        return new EventRegistryEngineConfigurator();
+    }
+
     @Override
     public ProcessEngineConfigurationImpl addConfigurator(EngineConfigurator configurator) {
         super.addConfigurator(configurator);

diff --git a/...flowable-engine/src/main/java/org/flowable/engine/impl/test/AbstractFlowableTestCase.java b/...flowable-engine/src/main/java/org/flowable/engine/impl/test/AbstractFlowableTestCase.java
@@ -66,7 +66,9 @@
  */
 @EnsureCleanDb(excludeTables = {
     "ACT_GE_PROPERTY",
-    "ACT_ID_PROPERTY"
+    "ACT_ID_PROPERTY",
+    "FLW_EV_DATABASECHANGELOGLOCK",
+    "FLW_EV_DATABASECHANGELOG"
 })
 public abstract class AbstractFlowableTestCase extends AbstractTestCase {
 

diff --git a/modules/flowable-event-registry-spring-configurator/pom.xml b/modules/flowable-event-registry-spring-configurator/pom.xml
@@ -29,11 +29,6 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-event-registry-configurator</artifactId>
         </dependency>
-		<dependency>
-			<groupId>org.flowable</groupId>
-			<artifactId>flowable-spring</artifactId>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>

diff --git a/...java/org/flowable/eventregistry/spring/configurator/test/SpringEventFlowableTestCase.java b/...java/org/flowable/eventregistry/spring/configurator/test/SpringEventFlowableTestCase.java
diff --git a/modules/flowable-event-registry-spring-configurator/src/test/resources/flowable-context.xml b/modules/flowable-event-registry-spring-configurator/src/test/resources/flowable-context.xml
diff --git a/modules/flowable-event-registry-spring-configurator/src/test/resources/log4j.properties b/modules/flowable-event-registry-spring-configurator/src/test/resources/log4j.properties
diff --git a/...owable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-starter-app/pom.xml b/...owable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-starter-app/pom.xml
@@ -26,10 +26,6 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-app-engine-spring</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.flowable</groupId>
-            <artifactId>flowable-event-registry-spring-configurator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>

diff --git a/...wable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-starter-cmmn/pom.xml b/...wable-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-starter-cmmn/pom.xml
@@ -26,10 +26,6 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-cmmn-spring</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.flowable</groupId>
-            <artifactId>flowable-event-registry-spring-configurator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>

diff --git a/...le-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-starter-process/pom.xml b/...le-spring-boot/flowable-spring-boot-starters/flowable-spring-boot-starter-process/pom.xml
@@ -26,10 +26,6 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-spring</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.flowable</groupId>
-            <artifactId>flowable-event-registry-spring-configurator</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-jdbc</artifactId>

diff --git a/modules/flowable-spring/pom.xml b/modules/flowable-spring/pom.xml
@@ -101,6 +101,10 @@
             <groupId>org.flowable</groupId>
             <artifactId>flowable-job-spring-service</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.flowable</groupId>
+            <artifactId>flowable-event-registry-spring-configurator</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>

diff --git a/...s/flowable-spring/src/main/java/org/flowable/spring/SpringProcessEngineConfiguration.java b/...s/flowable-spring/src/main/java/org/flowable/spring/SpringProcessEngineConfiguration.java
@@ -20,6 +20,7 @@
 import javax.sql.DataSource;
 
 import org.flowable.common.engine.api.FlowableException;
+import org.flowable.common.engine.impl.EngineConfigurator;
 import org.flowable.common.engine.impl.interceptor.CommandConfig;
 import org.flowable.common.engine.impl.interceptor.CommandInterceptor;
 import org.flowable.common.spring.AutoDeploymentStrategy;
@@ -31,6 +32,7 @@
 import org.flowable.engine.ProcessEngines;
 import org.flowable.engine.impl.cfg.ProcessEngineConfigurationImpl;
 import org.flowable.engine.impl.cfg.StandaloneProcessEngineConfiguration;
+import org.flowable.eventregistry.spring.configurator.SpringEventRegistryConfigurator;
 import org.flowable.spring.configurator.DefaultAutoDeploymentStrategy;
 import org.flowable.spring.configurator.ResourceParentFolderAutoDeploymentStrategy;
 import org.flowable.spring.configurator.SingleResourceAutoDeploymentStrategy;
@@ -76,6 +78,10 @@ public ProcessEngine buildProcessEngine() {
         return processEngine;
     }
 
+    protected EngineConfigurator createDefaultEventRegistryEngineConfigurator() {
+        return new SpringEventRegistryConfigurator();
+    }
+
     public void setTransactionSynchronizationAdapterOrder(Integer transactionSynchronizationAdapterOrder) {
         this.transactionSynchronizationAdapterOrder = transactionSynchronizationAdapterOrder;
     }

diff --git a/...gurator/test/EventWithSpringBeanTest.java → ...ventregistry/EventWithSpringBeanTest.java b/...gurator/test/EventWithSpringBeanTest.java → ...ventregistry/EventWithSpringBeanTest.java
@@ -10,7 +10,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.flowable.eventregistry.spring.configurator.test;
+package org.flowable.spring.test.eventregistry;
 
 import java.util.List;
 import java.util.Random;
@@ -26,6 +26,7 @@
 import org.flowable.eventregistry.impl.EventRegistryEngineConfiguration;
 import org.flowable.eventregistry.model.InboundChannelModel;
 import org.flowable.eventsubscription.api.EventSubscription;
+import org.flowable.spring.impl.test.SpringFlowableTestCase;
 import org.flowable.task.api.Task;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -40,7 +41,7 @@
  * @author Tijs Rademakers
  */
 @ContextConfiguration("classpath:flowable-context.xml")
-public class EventWithSpringBeanTest extends SpringEventFlowableTestCase {
+public class EventWithSpringBeanTest extends SpringFlowableTestCase {
 
     protected TestInboundEventChannelAdapter inboundEventChannelAdapter;
 
@@ -84,8 +85,8 @@ protected TestInboundEventChannelAdapter setupTestChannel() {
     }
 
     @Test
-    @Deployment(resources = { "org/flowable/eventregistry/spring/configurator/test/taskWithEventProcess.bpmn20.xml",
-        "org/flowable/eventregistry/spring/configurator/test/simpleEvent.event" })
+    @Deployment(resources = { "org/flowable/spring/test/eventregistry/taskWithEventProcess.bpmn20.xml",
+        "org/flowable/spring/test/eventregistry/simpleEvent.event" })
     public void testEventOnUserTask() {
 
         EventRegistryEngineConfiguration eventEngineConfiguration = (EventRegistryEngineConfiguration) processEngineConfiguration.getEngineConfigurations()
@@ -116,14 +117,14 @@ public void testEventOnUserTask() {
     }
 
     @Test
-    @Deployment(resources = { "org/flowable/eventregistry/spring/configurator/test/taskWithEventProcess.bpmn20.xml"})
+    @Deployment(resources = { "org/flowable/spring/test/eventregistry/taskWithEventProcess.bpmn20.xml"})
     public void testEventOnUserTaskWithoutVariablesSeparateDeployments() {
 
         EventRegistryEngineConfiguration eventEngineConfiguration = (EventRegistryEngineConfiguration) processEngineConfiguration.getEngineConfigurations()
                         .get(EngineConfigurationConstants.KEY_EVENT_REGISTRY_CONFIG);
 
         EventRepositoryService eventRepositoryService = eventEngineConfiguration.getEventRepositoryService();
-        EventDeployment eventDeployment = eventRepositoryService.createDeployment().addClasspathResource("org/flowable/eventregistry/spring/configurator/test/simpleEvent.event").deploy();
+        EventDeployment eventDeployment = eventRepositoryService.createDeployment().addClasspathResource("org/flowable/spring/test/eventregistry/simpleEvent.event").deploy();
 
         try {
             ProcessInstance processInstance = runtimeService.startProcessInstanceByKey("taskWithEventProcess");

diff --git a/...pring/configurator/test/simpleEvent.event → ...ring/test/eventregistry/simpleEvent.event b/...pring/configurator/test/simpleEvent.event → ...ring/test/eventregistry/simpleEvent.event
diff --git a/...ator/test/taskWithEventProcess.bpmn20.xml → ...tregistry/taskWithEventProcess.bpmn20.xml b/...ator/test/taskWithEventProcess.bpmn20.xml → ...tregistry/taskWithEventProcess.bpmn20.xml