[jbpm-commits] JBoss JBPM SVN: r4281 - in jbpm4/trunk/modules: test-base/src/main/java/org/jbpm/test and 1 other directory.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-03-18 09:58:29 -0400 (Wed, 18 Mar 2009)
New Revision: 4281

Modified:
   jbpm4/trunk/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.sar.xml
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
Log:
test suite fixes

Modified: jbpm4/trunk/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.sar.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.sar.xml	2009-03-18 13:36:18 UTC (rev 4280)
+++ jbpm4/trunk/modules/distro/src/main/resources/config-tool/jbpm/wire.bindings/deployment.type.sar.xml	2009-03-18 13:58:29 UTC (rev 4281)
@@ -1,5 +0,0 @@
-
-  <!-- enterprise bindings -->
-  <binding class="org.jbpm.enterprise.internal.wire.binding.EjbTimerSessionBinding" />
-  <binding class="org.jbpm.enterprise.internal.wire.binding.EjbLocalCommandServiceBinding" />
-  <binding class="org.jbpm.enterprise.internal.wire.binding.EjbRemoteCommandServiceBinding" />

Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java	2009-03-18 13:36:18 UTC (rev 4280)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/Db.java	2009-03-18 13:58:29 UTC (rev 4281)
@@ -60,6 +60,12 @@
 
   public static void clean(EnvironmentFactory environmentFactory) {
     SessionFactory sessionFactory = environmentFactory.get(SessionFactory.class);
+    // when running this with a remote ejb invocation configuration, there is no
+    // session factory and no cleanup needs to be done
+    if (sessionFactory==null) {
+      return;
+    }
+    
     String[] cleanSql = (String[]) environmentFactory.get(CLEAN_SQL_KEY);
 
     if (cleanSql == null) {
@@ -135,6 +141,12 @@
 
   public static void verifyClean(EnvironmentFactory environmentFactory) {
     SessionFactory sessionFactory = environmentFactory.get(SessionFactory.class);
+    // when running this with a remote ejb invocation configuration, there is no
+    // session factory and no cleanup needs to be done
+    if (sessionFactory==null) {
+      return;
+    }
+    
     String[] tableNames = (String[]) environmentFactory.get(TABLE_NAMES_KEY);
 
     if (tableNames == null) {