Revert "[BAQE-439] Introducing Narayana and tomcat-dbcp into engine t…

…ests (#1360)" (#1364)

This reverts commit b0f4678.

jbpm-audit/src/test/filtered-resources/META-INF/persistence.xml

@@ -29,7 +29,6 @@
       <!-- BZ 841786: AS7/EAP 6/Hib 4 uses new (sequence) generators which seem to cause problems -->
       <property name="hibernate.id.new_generator_mappings" value="false" />
       <property name="hibernate.transaction.jta.platform" value="org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform" />
-      <property name="hibernate.connection.release_mode" value="after_transaction"/>
     </properties>
   </persistence-unit>
 
@@ -50,7 +49,6 @@
       <!-- BZ 841786: AS7/EAP 6/Hib 4 uses new (sequence) generators which seem to cause problems -->
       <property name="hibernate.id.new_generator_mappings" value="false" />
       <property name="hibernate.transaction.jta.platform" value="org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform" />
-      <property name="hibernate.connection.release_mode" value="after_transaction"/>
     </properties>
   </persistence-unit>
 

jbpm-bpmn2/src/test/filtered-resources/META-INF/persistence.xml

@@ -25,12 +25,16 @@
       <property name="hibernate.hbm2ddl.auto" value="create"/>
       <property name="hibernate.show_sql" value="false"/>
       <property name="hibernate.dialect" value="${maven.hibernate.dialect}"/>
+
+      <property name="hibernate.connection.driver_class" value="${maven.jdbc.driver.class}"/>
+      <property name="hibernate.connection.url" value="${maven.jdbc.url}"/>
+      <property name="hibernate.connection.username" value="${maven.jdbc.username}"/>
+      <property name="hibernate.connection.password" value="${maven.jdbc.password}"/>
       <property name="hibernate.default_schema" value="${maven.jdbc.schema}"/>
 
       <!-- BZ 841786: AS7/EAP 6/Hib 4 uses new (sequence) generators which seem to cause problems -->
       <property name="hibernate.id.new_generator_mappings" value="false"/>
       <property name="hibernate.transaction.jta.platform" value="org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform"/>
-      <property name="hibernate.connection.release_mode" value="after_transaction"/>
     </properties>
   </persistence-unit>
 </persistence>

jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/JbpmBpmn2TestCase.java

@@ -73,7 +73,7 @@
 import org.jbpm.process.instance.impl.DefaultProcessInstanceManagerFactory;
 import org.jbpm.ruleflow.core.RuleFlowProcess;
 import org.jbpm.test.util.AbstractBaseTest;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.jbpm.workflow.instance.impl.WorkflowProcessInstanceImpl;
 import org.junit.After;
 import org.junit.AfterClass;
@@ -138,7 +138,7 @@ public abstract class JbpmBpmn2TestCase extends AbstractBaseTest {
     protected AuditLogService logService;
 
     protected static EntityManagerFactory emf;
-    private static PoolingDataSourceWrapper ds;
+    private static PoolingDataSource ds;
 
     private RequireLocking testReqLocking;
     private RequirePersistence testReqPersistence;
@@ -185,9 +185,18 @@ public JbpmBpmn2TestCase(boolean sessionPersistance, boolean locking) {
         this.pessimisticLocking = locking;
     }
 
-    public static PoolingDataSourceWrapper setupPoolingDataSource() {
+    public static PoolingDataSource setupPoolingDataSource() {
         Properties dsProps = PersistenceUtil.getDatasourceProperties();
-        return PersistenceUtil.setupPoolingDataSource(dsProps, "jdbc/testDS1");
+        String jdbcUrl = dsProps.getProperty("url");
+        String driverClass = dsProps.getProperty("driverClassName");
+
+        // Setup the datasource
+        PoolingDataSource ds1 = PersistenceUtil.setupPoolingDataSource(dsProps, "jdbc/testDS1", false);
+        if( driverClass.startsWith("org.h2") ) { 
+            ds1.getDriverProperties().setProperty("url", jdbcUrl);
+        }
+        ds1.init();
+        return ds1;
     }
 
     public void setPersistence(boolean sessionPersistence) {
@@ -202,7 +211,7 @@ public void setEntityManagerFactory(EntityManagerFactory emf) {
         JbpmBpmn2TestCase.emf = emf;
     }
 
-    public void setPoolingDataSource(PoolingDataSourceWrapper ds) {
+    public void setPoolingDataSource(PoolingDataSource ds) {
         JbpmBpmn2TestCase.ds = ds;
     }
 

jbpm-case-mgmt/jbpm-case-mgmt-impl/src/test/java/org/jbpm/casemgmt/impl/util/AbstractCaseServicesBaseTest.java

@@ -31,7 +31,7 @@
 import org.jbpm.runtime.manager.impl.jpa.EntityManagerFactoryManager;
 import org.jbpm.services.api.model.DeploymentUnit;
 import org.jbpm.test.services.AbstractCaseServicesTest;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.kie.api.task.model.Status;
 import org.kie.api.task.model.TaskSummary;
 
@@ -41,7 +41,7 @@ public abstract class AbstractCaseServicesBaseTest extends AbstractCaseServicesT
     protected static final String GROUP_ID = "org.jbpm.cases";
     protected static final String VERSION = "1.0.0";
 
-    protected PoolingDataSourceWrapper ds;
+    protected PoolingDataSource ds;    
 
     protected static final String EMPTY_CASE_P_ID = "EmptyCase";
     protected static final String USER_TASK_STAGE_CASE_P_ID = "UserTaskWithStageCase";

jbpm-case-mgmt/jbpm-case-mgmt-impl/src/test/resources/META-INF/persistence.xml

@@ -90,7 +90,6 @@
 
       <!-- BZ 841786: AS7/EAP 6/Hib 4 uses new (sequence) generators which seem to cause problems -->      
       <property name="hibernate.id.new_generator_mappings" value="false" />
-      <property name="hibernate.connection.release_mode" value="after_transaction"/>
     </properties>
   </persistence-unit>
 

jbpm-examples/pom.xml

@@ -98,14 +98,10 @@
       <groupId>org.jbpm</groupId>
       <artifactId>jbpm-test</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jbpm</groupId>
-      <artifactId>jbpm-test-util</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.kie</groupId>
-      <artifactId>kie-test-util</artifactId>
-    </dependency>
+      <dependency>
+          <groupId>org.jbpm</groupId>
+          <artifactId>jbpm-test-util</artifactId>
+      </dependency>
     <dependency>
     	<groupId>org.subethamail</groupId>
     	<artifactId>subethasmtp-wiser</artifactId>

jbpm-examples/src/main/resources/META-INF/persistence.xml

@@ -62,7 +62,6 @@
       <property name="hibernate.id.new_generator_mappings" value="false" />            
 
       <property name="hibernate.transaction.jta.platform" value="org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform" />
-      <property name="hibernate.connection.release_mode" value="after_transaction"/>
     </properties>        
   </persistence-unit>
 

jbpm-human-task/jbpm-human-task-audit/src/test/java/org/jbpm/services/task/assignment/AbstractTotalCompletionTimeTest.java

@@ -23,14 +23,14 @@
 import javax.persistence.EntityManagerFactory;
 
 import org.jbpm.services.task.utils.TaskFluent;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.kie.api.task.model.Task;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public abstract class AbstractTotalCompletionTimeTest extends AbstractAssignmentTest {
 
-    protected PoolingDataSourceWrapper pds;
+    protected PoolingDataSource pds;
     protected EntityManagerFactory emf;
     protected Long taskIds[];
     protected static final String DARTH_VADER = "Darth Vader";

jbpm-human-task/jbpm-human-task-audit/src/test/java/org/jbpm/services/task/audit/service/LocalTaskAuditTest.java

@@ -22,15 +22,15 @@
 import org.jbpm.services.task.HumanTaskServiceFactory;
 import org.jbpm.services.task.audit.JPATaskLifeCycleEventListener;
 import org.jbpm.services.task.lifecycle.listeners.BAMTaskEventListener;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.kie.internal.task.api.InternalTaskService;
 import org.jbpm.services.task.audit.TaskAuditServiceFactory;
 
 public class LocalTaskAuditTest extends TaskAuditBaseTest {
 
-	private PoolingDataSourceWrapper pds;
+	private PoolingDataSource pds;
 	private EntityManagerFactory emf;
 
 	@Before

jbpm-human-task/jbpm-human-task-audit/src/test/java/org/jbpm/services/task/audit/service/LocalTaskAuditWithDeadlineTest.java

@@ -39,7 +39,7 @@
 import org.jbpm.services.task.impl.factories.TaskFactory;
 import org.jbpm.services.task.lifecycle.listeners.BAMTaskEventListener;
 import org.jbpm.test.listener.task.CountDownTaskEventListener;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +53,7 @@
 
 public class LocalTaskAuditWithDeadlineTest extends HumanTaskServicesBaseTest {
 
-	private PoolingDataSourceWrapper pds;
+	private PoolingDataSource pds;
 	private EntityManagerFactory emf;
 
 	protected TaskAuditService taskAuditService;

jbpm-human-task/jbpm-human-task-audit/src/test/java/org/jbpm/services/task/audit/service/LocalWithCustomCallbackTaskAuditTest.java

@@ -31,7 +31,7 @@
 import org.jbpm.services.task.HumanTaskServicesBaseTest;
 import org.jbpm.services.task.audit.TaskAuditServiceFactory;
 import org.jbpm.services.task.utils.TaskFluent;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -44,7 +44,7 @@
 
 public class LocalWithCustomCallbackTaskAuditTest extends HumanTaskServicesBaseTest {
 
-    private PoolingDataSourceWrapper pds;
+    private PoolingDataSource pds;
     private EntityManagerFactory emf;
     private NullGroupsUserGroupCallback callback;
 

jbpm-human-task/jbpm-human-task-audit/src/test/java/org/jbpm/services/task/audit/service/TaskAuditQueryBuilderCoverageTest.java

@@ -26,7 +26,7 @@
 import org.jbpm.query.QueryBuilderCoverageTestUtil.ModuleSpecificInputFiller;
 import org.jbpm.services.task.HumanTaskServicesBaseTest;
 import org.jbpm.services.task.audit.BAMTaskSummaryQueryBuilder;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -46,7 +46,7 @@ public class TaskAuditQueryBuilderCoverageTest extends HumanTaskServicesBaseTest
 
     private static final Logger logger = LoggerFactory.getLogger(TaskAuditQueryBuilderCoverageTest.class);
 
-    private static PoolingDataSourceWrapper pds;
+    private static PoolingDataSource pds;
     private static EntityManagerFactory emf;
 
     private TaskJPAAuditService auditService;

jbpm-human-task/jbpm-human-task-audit/src/test/resources/META-INF/persistence.xml

@@ -49,9 +49,7 @@
 
       <!-- BZ 841786: AS7/EAP 6/Hib 4 uses new (sequence) generators which seem to cause problems -->      
       <property name="hibernate.id.new_generator_mappings" value="false" /> 
-      <property name="hibernate.transaction.jta.platform" value="org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform" />
-
-      <property name="hibernate.connection.release_mode" value="after_transaction"/>
+      <property name="hibernate.transaction.jta.platform" value="org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform" />           
     </properties>
   </persistence-unit>
 

jbpm-human-task/jbpm-human-task-core/pom.xml

@@ -115,11 +115,6 @@
     </dependency>
 
     <!-- TEST -->
-    <dependency>
-      <groupId>org.kie</groupId>
-      <artifactId>kie-test-util</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.jbpm</groupId>
       <artifactId>jbpm-test-util</artifactId>

jbpm-human-task/jbpm-human-task-core/src/test/filtered-resources/META-INF/persistence.xml

@@ -39,13 +39,18 @@
       <property name="hibernate.max_fetch_depth" value="3" />
       <property name="hibernate.hbm2ddl.auto" value="create-drop" />
       <property name="hibernate.show_sql" value="false" />
+	  <!--
+      <property name="hibernate.connection.driver_class" value="${maven.jdbc.driver.class}" />
+      <property name="hibernate.connection.url" value="${maven.jdbc.url}" />
+      <property name="hibernate.connection.username" value="${maven.jdbc.username}" />
+      <property name="hibernate.connection.password" value="${maven.jdbc.password}" />
+       -->
 
       <!-- BZ 841786: AS7/EAP 6/Hib 4 uses new (sequence) generators which seem to cause problems -->      
       <property name="hibernate.id.new_generator_mappings" value="false" />            
 
       <!-- needed for JTA testing  -->
       <property name="hibernate.transaction.jta.platform" value="org.hibernate.service.jta.platform.internal.JBossStandAloneJtaPlatform" />
-      <property name="hibernate.connection.release_mode" value="after_transaction"/>
 
     </properties>
   </persistence-unit>

jbpm-human-task/jbpm-human-task-core/src/test/java/org/jbpm/services/task/DeadlinesLocalTest.java

@@ -20,7 +20,7 @@
 
 import org.jbpm.services.task.deadlines.notifications.impl.MockNotificationListener;
 import org.jbpm.services.task.impl.TaskDeadlinesServiceImpl;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.kie.internal.task.api.InternalTaskService;
@@ -32,7 +32,7 @@
 
 public class DeadlinesLocalTest extends DeadlinesBaseTest {
 
-	private PoolingDataSourceWrapper pds;
+	private PoolingDataSource pds;
 	private EntityManagerFactory emf;
 
 	@Before

jbpm-human-task/jbpm-human-task-core/src/test/java/org/jbpm/services/task/EmailDeadlinesLocalTest.java

@@ -19,15 +19,15 @@
 import javax.persistence.Persistence;
 
 import org.jbpm.services.task.impl.TaskDeadlinesServiceImpl;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.kie.internal.task.api.InternalTaskService;
 
 
 public class EmailDeadlinesLocalTest extends EmailDeadlinesBaseTest {
 
-	private PoolingDataSourceWrapper pds;
+	private PoolingDataSource pds;
 	private EntityManagerFactory emf;
 
 	@Before

jbpm-human-task/jbpm-human-task-core/src/test/java/org/jbpm/services/task/HumanTaskServicesBaseTest.java

@@ -43,7 +43,7 @@
 import org.jbpm.test.listener.task.CountDownTaskEventListener;
 import org.jbpm.services.task.utils.ContentMarshallerHelper;
 import org.jbpm.services.task.utils.MVELUtils;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -185,9 +185,10 @@ protected JaxbContent xmlRoundTripContent(Content content) {
     protected static final String PASSWORD = "password";
     protected static final String JDBC_URL = "url";
 
-    protected static PoolingDataSourceWrapper setupPoolingDataSource() {
-        Properties dsProps = PersistenceUtil.getDatasourceProperties();
-        PoolingDataSourceWrapper pds = PersistenceUtil.setupPoolingDataSource(dsProps, "jdbc/jbpm-ds");
+    protected static PoolingDataSource setupPoolingDataSource() {
+        Properties dsProps = getDatasourceProperties();
+        PoolingDataSource pds = PersistenceUtil.setupPoolingDataSource(dsProps, "jdbc/jbpm-ds", false);
+        pds.init();
 
         return pds;
     }

jbpm-human-task/jbpm-human-task-core/src/test/java/org/jbpm/services/task/LifeCycleLocalCommandBasedTest.java

@@ -19,7 +19,7 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.kie.internal.task.api.InternalTaskService;
@@ -28,7 +28,7 @@
 
 public class LifeCycleLocalCommandBasedTest extends LifeCycleBaseTest {
 
-	private PoolingDataSourceWrapper pds;
+	private PoolingDataSource pds;
 	private EntityManagerFactory emf;
 
 	@Before

jbpm-human-task/jbpm-human-task-core/src/test/java/org/jbpm/services/task/LifeCycleLocalWithRuleServiceTest.java

@@ -37,7 +37,7 @@
 import org.jbpm.services.task.rule.TaskRuleService;
 import org.jbpm.services.task.rule.impl.RuleContextProviderImpl;
 import org.jbpm.services.task.utils.ContentMarshallerHelper;
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
@@ -57,7 +57,7 @@
 
 public class LifeCycleLocalWithRuleServiceTest extends HumanTaskServicesBaseTest {
 
-	private PoolingDataSourceWrapper pds;
+	private PoolingDataSource pds;
 	private EntityManagerFactory emf;
 
 	@BeforeClass

jbpm-human-task/jbpm-human-task-core/src/test/java/org/jbpm/services/task/SubTasksLocalTest.java

@@ -18,15 +18,15 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.kie.internal.task.api.InternalTaskService;
 
 
 public class SubTasksLocalTest extends SubTasksBaseTest {
 
-	private PoolingDataSourceWrapper pds;
+	private PoolingDataSource pds;
 	private EntityManagerFactory emf;
 
 	@Before

jbpm-human-task/jbpm-human-task-core/src/test/java/org/jbpm/services/task/TaskAttachmentLocalTest.java

@@ -19,15 +19,15 @@
 import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 
-import org.kie.test.util.db.PoolingDataSourceWrapper;
+import org.jbpm.test.util.PoolingDataSource;
 import org.junit.After;
 import org.junit.Before;
 import org.kie.internal.task.api.InternalTaskService;
 
 
 public class TaskAttachmentLocalTest extends TaskAttachmentBaseTest {
 
-	private PoolingDataSourceWrapper pds;
+	private PoolingDataSource pds;
 	private EntityManagerFactory emf;
 
 	@Before