[DROOLS-1582] split kie-ci (#878)

kiegroup · Jun 9, 2017 · 40bdea0 · 40bdea0
1 parent d23a5c1
commit 40bdea0
Show file tree

Hide file tree

Showing 47 changed files with 270 additions and 388 deletions.
diff --git a/...ase-mgmt-impl/src/test/java/org/jbpm/casemgmt/impl/util/AbstractCaseServicesBaseTest.java b/...ase-mgmt-impl/src/test/java/org/jbpm/casemgmt/impl/util/AbstractCaseServicesBaseTest.java
@@ -99,13 +99,13 @@
 import org.kie.internal.runtime.conf.NamedObjectModel;
 import org.kie.internal.runtime.conf.ObjectModel;
 import org.kie.internal.runtime.conf.RuntimeStrategy;
-import org.kie.scanner.MavenRepository;
+import org.kie.scanner.KieMavenRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static java.util.stream.Collectors.toMap;
 import static org.assertj.core.api.Assertions.*;
-import static org.kie.scanner.MavenRepository.getMavenRepository;
+import static org.kie.scanner.KieMavenRepository.getKieMavenRepository;
 
 public abstract class AbstractCaseServicesBaseTest {
 
@@ -172,7 +172,7 @@ public void setUp() throws Exception {
         fs.write(getPom(releaseId).getBytes());
         fs.close();
 
-        MavenRepository repository = getMavenRepository();
+        KieMavenRepository repository = getKieMavenRepository();
         repository.deployArtifact(releaseId, kJar1, pom);
         // use user name who is part of the case roles assignment
         // so (s)he will be authorized to access case instance

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
@@ -22,13 +22,8 @@
 import java.util.List;
 import java.util.Map;
 
+import org.appformer.maven.integration.embedder.MavenSettings;
 import org.drools.compiler.kie.builder.impl.InternalKieModule;
-import org.jbpm.test.container.AbstractEJBServicesTest;
-import org.jbpm.test.container.AbstractRuntimeEJBServicesTest;
-import org.jbpm.test.container.JbpmContainerTest;
-import org.jbpm.test.container.listeners.TrackingAgendaEventListener;
-import org.jbpm.test.container.webspherefix.WebSphereFixedJtaPlatform;
-import org.jbpm.test.container.tools.IntegrationMavenResolver;
 import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
@@ -38,6 +33,12 @@
 import org.jbpm.services.api.DeploymentService;
 import org.jbpm.services.api.ProcessService;
 import org.jbpm.services.api.model.DeploymentUnit;
+import org.jbpm.test.container.AbstractEJBServicesTest;
+import org.jbpm.test.container.AbstractRuntimeEJBServicesTest;
+import org.jbpm.test.container.JbpmContainerTest;
+import org.jbpm.test.container.listeners.TrackingAgendaEventListener;
+import org.jbpm.test.container.tools.IntegrationMavenResolver;
+import org.jbpm.test.container.webspherefix.WebSphereFixedJtaPlatform;
 import org.kie.api.KieServices;
 import org.kie.api.builder.KieBuilder;
 import org.kie.api.builder.KieFileSystem;
@@ -51,8 +52,7 @@
 import org.kie.api.io.Resource;
 import org.kie.api.runtime.conf.ClockTypeOption;
 import org.kie.internal.io.ResourceFactory;
-import org.kie.scanner.MavenRepository;
-import org.kie.scanner.embedder.MavenSettings;
+import org.kie.scanner.KieMavenRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -293,8 +293,8 @@ private void deployKieJar(KieServices ks, ReleaseId releaseId, List<String> asse
             kJar1 = createKieJar(ks, releaseId, assets, extraResources);
         }
 
-        MavenRepository repository = MavenRepository.getMavenRepository();
-        System.out.println("Local repo is: " + MavenSettings.getSettings().getLocalRepository());
+        KieMavenRepository repository = KieMavenRepository.getKieMavenRepository();
+        System.out.println( "Local repo is: " + MavenSettings.getSettings().getLocalRepository() );
         repository.installArtifact(releaseId, kJar1, pom);
     }
 

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,7 +18,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
 import javax.persistence.EntityManagerFactory;
 
 import org.drools.compiler.kie.builder.impl.InternalKieModule;
@@ -53,7 +52,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.scanner.MavenRepository;
+import org.kie.scanner.KieMavenRepository;
 
 /**
  * A builder implementation that follows the fluent approach to build <code>RuntimeEnvironments</code>.
@@ -192,7 +191,7 @@ public static RuntimeEnvironmentBuilder getDefault(ReleaseId releaseId) {
      * @see DefaultRuntimeEnvironment
      */
     public static RuntimeEnvironmentBuilder getDefault(ReleaseId releaseId, String kbaseName, String ksessionName) {
-    	MavenRepository repository = MavenRepository.getMavenRepository();
+    	KieMavenRepository repository = KieMavenRepository.getKieMavenRepository();
         repository.resolveArtifact(releaseId.toExternalForm());
     	KieServices ks = KieServices.Factory.get();
     	KieContainer kieContainer = ks.newKieContainer(releaseId);

diff --git a/...ntime-manager/src/test/java/org/jbpm/runtime/manager/impl/KjarRuntimeEnvironmentTest.java b/...ntime-manager/src/test/java/org/jbpm/runtime/manager/impl/KjarRuntimeEnvironmentTest.java
@@ -15,12 +15,6 @@
 
 package org.jbpm.runtime.manager.impl;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.fail;
-import static org.kie.scanner.MavenRepository.getMavenRepository;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.lang.reflect.Field;
@@ -30,6 +24,7 @@
 import java.util.Map;
 import java.util.Properties;
 
+import bitronix.tm.resource.jdbc.PoolingDataSource;
 import org.drools.compiler.kie.builder.impl.InternalKieModule;
 import org.jbpm.runtime.manager.util.TestUtil;
 import org.jbpm.services.task.identity.JBossUserGroupCallbackImpl;
@@ -63,9 +58,10 @@
 import org.kie.internal.io.ResourceFactory;
 import org.kie.internal.runtime.manager.context.EmptyContext;
 import org.kie.internal.runtime.manager.context.ProcessInstanceIdContext;
-import org.kie.scanner.MavenRepository;
+import org.kie.scanner.KieMavenRepository;
 
-import bitronix.tm.resource.jdbc.PoolingDataSource;
+import static org.junit.Assert.*;
+import static org.kie.scanner.KieMavenRepository.getKieMavenRepository;
 
 public class KjarRuntimeEnvironmentTest extends AbstractBaseTest {
 
@@ -97,7 +93,7 @@ public void setup() {
         } catch (Exception e) {
 
         }
-        MavenRepository repository = getMavenRepository();
+        KieMavenRepository repository = getKieMavenRepository();
         repository.installArtifact(releaseId, kJar1, pom);
 
         Properties properties= new Properties();
@@ -367,7 +363,7 @@ public void testXStreamUnmarshalCustomObject() {
         ReleaseId releaseId = ks.newReleaseId(GROUP_ID, "xstream-test", VERSION);
         File kjar = new File("src/test/resources/kjar/jbpm-module.jar");
         File pom = new File("src/test/resources/kjar/pom.xml");
-        MavenRepository repository = getMavenRepository();
+        KieMavenRepository repository = getKieMavenRepository();
         repository.installArtifact(releaseId, kjar, pom);
 
         RuntimeEnvironment environment = RuntimeEnvironmentBuilder.Factory.get()

diff --git a/.../src/test/java/org/jbpm/runtime/manager/impl/deploy/AbstractDeploymentDescriptorTest.java b/.../src/test/java/org/jbpm/runtime/manager/impl/deploy/AbstractDeploymentDescriptorTest.java
@@ -15,8 +15,6 @@
 
 package org.jbpm.runtime.manager.impl.deploy;
 
-import static org.kie.scanner.MavenRepository.getMavenRepository;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Map;
@@ -36,7 +34,9 @@
 import org.kie.api.conf.EventProcessingOption;
 import org.kie.api.runtime.conf.ClockTypeOption;
 import org.kie.internal.io.ResourceFactory;
-import org.kie.scanner.MavenRepository;
+import org.kie.scanner.KieMavenRepository;
+
+import static org.kie.scanner.KieMavenRepository.getKieMavenRepository;
 
 public abstract class AbstractDeploymentDescriptorTest extends AbstractBaseTest {
 
@@ -59,7 +59,7 @@ protected void installKjar(ReleaseId releaseId, InternalKieModule kJar1) {
 		} catch (Exception e) {
 
 		}
-		MavenRepository repository = getMavenRepository();
+		KieMavenRepository repository = getKieMavenRepository();
 		repository.installArtifact(releaseId, kJar1, pom);
 	}
 

diff --git a/jbpm-services/jbpm-kie-services/pom.xml b/jbpm-services/jbpm-kie-services/pom.xml
@@ -93,7 +93,11 @@
         </exclusion>
       </exclusions>
     </dependency>  
-
+    <dependency>
+      <groupId>org.uberfire</groupId>
+      <artifactId>uberfire-maven-support</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>org.hibernate.javax.persistence</groupId>
       <artifactId>hibernate-jpa-2.1-api</artifactId>

diff --git a/.../jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/KModuleDeploymentService.java b/.../jbpm-kie-services/src/main/java/org/jbpm/kie/services/impl/KModuleDeploymentService.java
@@ -16,8 +16,6 @@
 
 package org.jbpm.kie.services.impl;
 
-import static org.kie.scanner.MavenRepository.getMavenRepository;
-
 import java.io.StringReader;
 import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Annotation;
@@ -29,7 +27,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
 import javax.persistence.EntityManagerFactory;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -41,7 +38,7 @@
 import org.apache.commons.codec.binary.Base64;
 import org.drools.compiler.kie.builder.impl.InternalKieModule;
 import org.drools.compiler.kie.builder.impl.KieContainerImpl;
-import org.drools.compiler.kproject.xml.DependencyFilter;
+import org.appformer.maven.support.DependencyFilter;
 import org.drools.core.common.ProjectClassLoader;
 import org.drools.core.marshalling.impl.ClassObjectMarshallingStrategyAcceptor;
 import org.drools.core.marshalling.impl.SerializablePlaceholderResolverStrategy;
@@ -77,13 +74,15 @@
 import org.kie.internal.runtime.conf.ObjectModelResolverProvider;
 import org.kie.internal.runtime.conf.PersistenceMode;
 import org.kie.internal.runtime.manager.InternalRuntimeManager;
-import org.kie.scanner.MavenRepository;
+import org.kie.scanner.KieMavenRepository;
 import org.reflections.Reflections;
 import org.reflections.util.ConfigurationBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.xml.sax.InputSource;
 
+import static org.kie.scanner.KieMavenRepository.getKieMavenRepository;
+
 
 public class KModuleDeploymentService extends AbstractDeploymentService {
 
@@ -131,7 +130,7 @@ public void deploy(DeploymentUnit unit) {
 
 	            releaseId = ks.newReleaseId(kmoduleUnit.getGroupId(), kmoduleUnit.getArtifactId(), kmoduleUnit.getVersion());
 
-	            MavenRepository repository = getMavenRepository();
+	            KieMavenRepository repository = getKieMavenRepository();
 	            repository.resolveArtifact(releaseId.toExternalForm());
 
 	            kieContainer = ks.newKieContainer(releaseId);

diff --git a/...s/src/test/java/org/jbpm/kie/services/impl/admin/ProcessInstanceAdminServiceImplTest.java b/...s/src/test/java/org/jbpm/kie/services/impl/admin/ProcessInstanceAdminServiceImplTest.java
@@ -16,13 +16,6 @@
 
 package org.jbpm.kie.services.impl.admin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-import static org.kie.scanner.MavenRepository.getMavenRepository;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
@@ -55,10 +48,13 @@
 import org.kie.internal.query.QueryFilter;
 import org.kie.internal.runtime.conf.ObjectModel;
 import org.kie.internal.runtime.error.ExecutionError;
-import org.kie.scanner.MavenRepository;
+import org.kie.scanner.KieMavenRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.Assert.*;
+import static org.kie.scanner.KieMavenRepository.getKieMavenRepository;
+
 public class ProcessInstanceAdminServiceImplTest extends AbstractKieServicesBaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(KModuleDeploymentServiceTest.class);
@@ -97,7 +93,7 @@ public void prepare() {
         } catch (Exception e) {
 
         }
-        MavenRepository repository = getMavenRepository();
+        KieMavenRepository repository = getKieMavenRepository();
         repository.installArtifact(releaseId, kJar1, pom);
 
         processAdminService = new ProcessInstanceAdminServiceImpl();

diff --git a/...c/test/java/org/jbpm/kie/services/impl/admin/ProcessInstanceMigrationServiceImplTest.java b/...c/test/java/org/jbpm/kie/services/impl/admin/ProcessInstanceMigrationServiceImplTest.java
@@ -16,11 +16,6 @@
 
 package org.jbpm.kie.services.impl.admin;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.kie.scanner.MavenRepository.getMavenRepository;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
@@ -47,10 +42,13 @@
 import org.kie.api.task.model.Status;
 import org.kie.api.task.model.TaskSummary;
 import org.kie.internal.query.QueryFilter;
-import org.kie.scanner.MavenRepository;
+import org.kie.scanner.KieMavenRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.junit.Assert.*;
+import static org.kie.scanner.KieMavenRepository.getKieMavenRepository;
+
 public class ProcessInstanceMigrationServiceImplTest extends AbstractKieServicesBaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(KModuleDeploymentServiceTest.class);
@@ -88,7 +86,7 @@ public void prepare() {
         } catch (Exception e) {
 
         }
-        MavenRepository repository = getMavenRepository();
+        KieMavenRepository repository = getKieMavenRepository();
         repository.installArtifact(releaseId, kJar1, pom);
 
         // version 2 of kjar
@@ -106,7 +104,7 @@ public void prepare() {
         } catch (Exception e) {
 
         }
-        repository = getMavenRepository();
+        repository = getKieMavenRepository();
         repository.installArtifact(releaseId2, kJar2, pom2);
 
         migrationService = new ProcessInstanceMigrationServiceImpl();

diff --git a/...services/src/test/java/org/jbpm/kie/services/impl/admin/UserTaskAdminServiceImplTest.java b/...services/src/test/java/org/jbpm/kie/services/impl/admin/UserTaskAdminServiceImplTest.java
@@ -16,17 +16,15 @@
 
 package org.jbpm.kie.services.impl.admin;
 
-import static org.kie.scanner.MavenRepository.getMavenRepository;
-
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Arrays;
 
 import org.assertj.core.api.Assertions;
 import org.drools.compiler.kie.builder.impl.InternalKieModule;
@@ -47,17 +45,19 @@
 import org.kie.api.builder.ReleaseId;
 import org.kie.api.runtime.process.ProcessInstance;
 import org.kie.api.task.model.OrganizationalEntity;
-import org.kie.api.task.model.TaskSummary;
 import org.kie.api.task.model.Status;
+import org.kie.api.task.model.TaskSummary;
 import org.kie.internal.query.QueryFilter;
 import org.kie.internal.runtime.conf.ObjectModel;
 import org.kie.internal.task.api.TaskModelFactory;
 import org.kie.internal.task.api.TaskModelProvider;
 import org.kie.internal.task.api.model.EmailNotification;
-import org.kie.scanner.MavenRepository;
+import org.kie.scanner.KieMavenRepository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.kie.scanner.KieMavenRepository.getKieMavenRepository;
+
 public class UserTaskAdminServiceImplTest extends AbstractKieServicesBaseTest {
 
     private static final Logger logger = LoggerFactory.getLogger(KModuleDeploymentServiceTest.class);
@@ -95,7 +95,7 @@ public void prepare() {
         } catch (Exception e) {
 
         }
-        MavenRepository repository = getMavenRepository();
+        KieMavenRepository repository = getKieMavenRepository();
         repository.installArtifact(releaseId, kJar1, pom);
 
         userTaskAdminService = new UserTaskAdminServiceImpl();