[JBPM-5215] Reuse deployment descriptor classes from common jBPM modu…

…le (#1372) removing the common classes provided by kie internal and refactor imports in other classes
kiegroup · Dec 19, 2018 · 4d4daaa · 4d4daaa
1 parent e2758e3
commit 4d4daaa
Show file tree

Hide file tree

Showing 46 changed files with 251 additions and 1,658 deletions.
diff --git a/...-mgmt-impl/src/main/java/org/jbpm/casemgmt/impl/utils/DefaultCaseServiceConfigurator.java b/...-mgmt-impl/src/main/java/org/jbpm/casemgmt/impl/utils/DefaultCaseServiceConfigurator.java
@@ -41,7 +41,6 @@
 import org.jbpm.kie.services.impl.query.QueryServiceImpl;
 import org.jbpm.kie.services.impl.security.DeploymentRolesManager;
 import org.jbpm.runtime.manager.impl.RuntimeManagerFactoryImpl;
-import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorImpl;
 import org.jbpm.runtime.manager.impl.jpa.EntityManagerFactoryManager;
 import org.jbpm.services.api.DefinitionService;
 import org.jbpm.services.api.DeploymentService;
@@ -59,6 +58,7 @@
 import org.kie.internal.runtime.conf.DeploymentDescriptor;
 import org.kie.internal.runtime.conf.NamedObjectModel;
 import org.kie.internal.runtime.conf.RuntimeStrategy;
+import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorImpl;
 
 public class DefaultCaseServiceConfigurator implements CaseServiceConfigurator {
 

diff --git a/...jbpm-case-mgmt-impl/src/test/java/org/jbpm/casemgmt/impl/CaseCommentNotificationTest.java b/...jbpm-case-mgmt-impl/src/test/java/org/jbpm/casemgmt/impl/CaseCommentNotificationTest.java
@@ -16,11 +16,6 @@
 
 package org.jbpm.casemgmt.impl;
 
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -35,7 +30,6 @@
 import org.jbpm.casemgmt.impl.util.CommentNotificationEventListenerFactory;
 import org.jbpm.casemgmt.impl.util.TestNotificationPublisher;
 import org.jbpm.kie.services.impl.KModuleDeploymentUnit;
-import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorImpl;
 import org.jbpm.services.api.model.DeploymentUnit;
 import org.jbpm.services.task.impl.model.UserImpl;
 import org.junit.After;
@@ -44,9 +38,15 @@
 import org.kie.api.task.model.OrganizationalEntity;
 import org.kie.internal.runtime.conf.DeploymentDescriptor;
 import org.kie.internal.runtime.conf.ObjectModel;
+import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 public class CaseCommentNotificationTest extends AbstractCaseServicesBaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(CaseCommentNotificationTest.class);

diff --git a/...se-mgmt/jbpm-case-mgmt-impl/src/test/java/org/jbpm/casemgmt/impl/CaseWithJPADataTest.java b/...se-mgmt/jbpm-case-mgmt-impl/src/test/java/org/jbpm/casemgmt/impl/CaseWithJPADataTest.java
@@ -16,11 +16,6 @@
 
 package org.jbpm.casemgmt.impl;
 
-import static java.util.stream.Collectors.toMap;
-import static org.assertj.core.api.Assertions.fail;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -35,17 +30,22 @@
 import org.jbpm.casemgmt.impl.marshalling.CaseMarshallerFactory;
 import org.jbpm.casemgmt.impl.objects.Patient;
 import org.jbpm.casemgmt.impl.util.AbstractCaseServicesBaseTest;
-import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorImpl;
 import org.junit.Test;
 import org.kie.api.runtime.query.QueryContext;
 import org.kie.internal.runtime.conf.DeploymentDescriptor;
 import org.kie.internal.runtime.conf.DeploymentDescriptorBuilder;
 import org.kie.internal.runtime.conf.NamedObjectModel;
 import org.kie.internal.runtime.conf.ObjectModel;
 import org.kie.internal.runtime.conf.RuntimeStrategy;
+import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static java.util.stream.Collectors.toMap;
+import static org.assertj.core.api.Assertions.fail;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
 public class CaseWithJPADataTest extends AbstractCaseServicesBaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(CaseWithJPADataTest.class);

diff --git a/...t/jbpm-container-test-suite/src/test/java/org/jbpm/test/container/archive/EJBService.java b/...t/jbpm-container-test-suite/src/test/java/org/jbpm/test/container/archive/EJBService.java
@@ -31,7 +31,6 @@
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStage;
 import org.jbpm.kie.services.impl.KModuleDeploymentUnit;
-import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorImpl;
 import org.jbpm.services.api.DeploymentService;
 import org.jbpm.services.api.ProcessService;
 import org.jbpm.services.api.model.DeploymentUnit;
@@ -58,6 +57,7 @@
 import org.kie.internal.runtime.conf.DeploymentDescriptor;
 import org.kie.internal.runtime.conf.NamedObjectModel;
 import org.kie.internal.runtime.conf.RuntimeStrategy;
+import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorImpl;
 import org.kie.scanner.KieMavenRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/jbpm-runtime-manager/pom.xml b/jbpm-runtime-manager/pom.xml
@@ -379,6 +379,7 @@
               org.kie.internal.runtime.manager,
               org.kie.internal.runtime.manager.cdi.qualifier,
               org.kie.internal.runtime.manager.context,
+              org.kie.internal.runtime.manager.deploy,
               org.kie.internal.task.api,
               org.kie.internal.task.api.model,
               org.kie.internal.task.query,

diff --git a/jbpm-runtime-manager/src/main/java/org/jbpm/runtime/manager/impl/AbstractRuntimeManager.java b/jbpm-runtime-manager/src/main/java/org/jbpm/runtime/manager/impl/AbstractRuntimeManager.java
@@ -32,7 +32,6 @@
 import org.jbpm.process.core.timer.TimerServiceRegistry;
 import org.jbpm.process.core.timer.impl.GlobalTimerService;
 import org.jbpm.runtime.manager.api.SchedulerProvider;
-import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorManager;
 import org.jbpm.runtime.manager.impl.error.DefaultExecutionErrorStorage;
 import org.jbpm.runtime.manager.impl.error.ExecutionErrorManagerImpl;
 import org.jbpm.runtime.manager.impl.tx.NoOpTransactionManager;
@@ -65,6 +64,7 @@
 import org.kie.internal.runtime.manager.SessionNotFoundException;
 import org.kie.internal.runtime.manager.TaskServiceFactory;
 import org.kie.internal.runtime.manager.context.ProcessInstanceIdContext;
+import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorManager;
 import org.kie.internal.task.api.EventService;
 import org.kie.internal.task.api.InternalTaskService;
 import org.slf4j.Logger;

diff --git a/...untime-manager/src/main/java/org/jbpm/runtime/manager/impl/RuntimeEnvironmentBuilder.java b/...untime-manager/src/main/java/org/jbpm/runtime/manager/impl/RuntimeEnvironmentBuilder.java
@@ -18,6 +18,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.persistence.EntityManagerFactory;
 
 import org.drools.compiler.kie.builder.impl.InternalKieModule;
@@ -28,7 +29,7 @@
 import org.jbpm.process.core.timer.GlobalSchedulerService;
 import org.jbpm.process.instance.event.DefaultSignalManagerFactory;
 import org.jbpm.process.instance.impl.DefaultProcessInstanceManagerFactory;
-import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorManager;
+import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorManagerUtil;
 import org.jbpm.runtime.manager.impl.deploy.DeploymentDescriptorMerger;
 import org.jbpm.runtime.manager.impl.jpa.EntityManagerFactoryManager;
 import org.kie.api.KieBase;
@@ -53,6 +54,7 @@
 import org.kie.internal.runtime.conf.PersistenceMode;
 import org.kie.internal.runtime.manager.Mapper;
 import org.kie.internal.runtime.manager.RuntimeEnvironment;
+import org.kie.internal.runtime.manager.deploy.DeploymentDescriptorManager;
 import org.kie.scanner.KieMavenRepository;
 
 /**
@@ -198,7 +200,7 @@ public static RuntimeEnvironmentBuilder getDefault(ReleaseId releaseId, String k
     	KieContainer kieContainer = ks.newKieContainer(releaseId);
 
     	DeploymentDescriptorManager descriptorManager = new DeploymentDescriptorManager();
-    	List<DeploymentDescriptor> descriptorHierarchy = descriptorManager.getDeploymentDescriptorHierarchy(kieContainer);
+        List<DeploymentDescriptor> descriptorHierarchy = DeploymentDescriptorManagerUtil.getDeploymentDescriptorHierarchy(descriptorManager, kieContainer);
     	DeploymentDescriptorMerger merger = new DeploymentDescriptorMerger();
 		DeploymentDescriptor descriptor = merger.merge(descriptorHierarchy, MergeMode.MERGE_COLLECTIONS);
 

diff --git a/...me-manager/src/main/java/org/jbpm/runtime/manager/impl/deploy/DeploymentDescriptorIO.java b/...me-manager/src/main/java/org/jbpm/runtime/manager/impl/deploy/DeploymentDescriptorIO.java