[jbpm-commits] JBoss JBPM SVN: r3789 - in jbpm4/trunk: modules/distro and 8 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Fri Feb 6 08:47:20 EST 2009


Author: heiko.braun at jboss.com
Date: 2009-02-06 08:47:20 -0500 (Fri, 06 Feb 2009)
New Revision: 3789

Added:
   jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml
   jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml
   jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
Modified:
   jbpm4/trunk/modules/distro/pom.xml
   jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml
   jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
   jbpm4/trunk/modules/enterprise/pom.xml
   jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml
   jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
   jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
   jbpm4/trunk/pom.xml
Log:
Fix enterprise tests and update excludes

Modified: jbpm4/trunk/modules/distro/pom.xml
===================================================================
--- jbpm4/trunk/modules/distro/pom.xml	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/distro/pom.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -60,6 +60,17 @@
     </dependency>
     <dependency>
       <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-enterprise</artifactId>      
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
+      <artifactId>jbpm-enterprise</artifactId>
+      <classifier>config</classifier>
+      <version>${version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.jbpm.jbpm4</groupId>
       <artifactId>jbpm-task</artifactId>
       <version>${version}</version>
     </dependency>
@@ -155,8 +166,4 @@
     </plugins>
   </build>
 
-  <!-- Reporting -->
-  <reporting>
-  </reporting>
-
 </project>

Modified: jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml
===================================================================
--- jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/distro/scripts/assembly-deploy-artifacts.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -50,14 +50,14 @@
     </includes>
     <unpack>true</unpack>
   </dependencySet>
-  <!--dependencySet>
+  <dependencySet>
     <outputDirectory>resources/jbpm-enterprise-config</outputDirectory>
     <useStrictFiltering>true</useStrictFiltering>
     <includes>
       <include>*:jbpm-enterprise:jar:config</include>
     </includes>
     <unpack>true</unpack>
-  </dependencySet-->
+  </dependencySet>
 
   </dependencySets>
 

Modified: jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/distro/src/main/resources/installer/install-definition.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -24,7 +24,7 @@
   <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" />
   <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" />
 
-  <!-- Setup the Ant Action Listener -->  
+  <!-- Setup the Ant Action Listener -->
   <listeners>
     <listener installer="AntActionInstallerListener" />
   </listeners>
@@ -65,7 +65,7 @@
       <name>jbossSelection</name>
       <value>jboss500</value>
     </condition>
-    
+
     <!-- Target Database Conditions -->
     <condition type="variable" id="isHypersonic">
       <name>dbSelection</name>
@@ -100,7 +100,7 @@
 
   <!-- Packs -->
   <packs>
-  
+
     <!-- 
     ********************************
     *                              *  
@@ -108,7 +108,7 @@
     *                              *
     ********************************
     -->
-    
+
     <pack name="jBPM4 Standalone" required="yes" preselected="yes">
       <description>The jBPM4 Standalone Components</description>
 
@@ -120,8 +120,8 @@
         jbpm4/config
       -->
       <file src="@{deploy.artifacts.dir}/lib/jbpm-jpdl-config.jar" targetdir="$INSTALL_PATH/config"
-        unpack="true" override="true" />
-      
+            unpack="true" override="true" />
+
       <!-- 
         jbpm4/docs
       -->
@@ -132,8 +132,8 @@
         jbpm4/lib
       -->
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" override="true">
-        <include name="*.jar" />        
-      </fileset>      
+        <include name="*.jar" />
+      </fileset>
     </pack>
 
     <!-- 
@@ -145,26 +145,36 @@
     -->
 
     <pack name="jBPM4 JBoss Integration" required="no" preselected="yes">
-    
+
       <description>The jBPM4 JBoss Integration</description>
- 
+
       <!-- jbpm/jbpm-service.sar -->
       <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
-        <include name="hibernate.properties"/>      
-        <include name="jbpm.cfg.xml"/>
+        <include name="hibernate.properties"/>        
         <include name="logging.properties"/>
       </fileset>
+
+      <!-- jbpm/jbpm-service.sar , enterprise config-->
+      <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
+        <include name="jbpm.cfg.xml"/>        
+      </fileset>
+
+      <!-- jbpm/, enterprise config-->
+      <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-enterprise-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/" override="true">
+        <include name="jbpm-destinations-service.xml"/>
+      </fileset>
+
       <!--fileset dir="@{deploy.artifacts.dir}/resources/jbpm-integration-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
         <include name="bpm-process-deployer.xml" />
       </fileset-->
-      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">        
+      <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true">
         <include name="jbpm-log.jar" />
         <include name="jbpm-api.jar" />
         <include name="jbpm-pvm.jar" />
         <include name="jbpm-jpdl.jar" />
-        <include name="jbpm-task.jar" />        
+        <include name="jbpm-task.jar" />
       </fileset>
-      
+
       <!-- jbpm/jbpm-enterprise.jar -->
       <!--file src="@{deploy.artifacts.dir}/lib/jbpm-enterprise.jar" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-enterprise.jar"
         unpack="true" override="true" /-->
@@ -173,10 +183,10 @@
       <!-- jbpm/jbpm-userguide.war -->
       <!--file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.jdocbook" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
         unpack="true" override="true" /-->
-        
+
       <!-- jbpm-destinations-service -->
       <!--file src="@{resources.dir}/destination/jbpm-destinations-service.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" /-->
-      
+
       <!-- Database configs to docs/examples/jbpm -->
       <fileset dir="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config" targetdir="${jbossInstallPath}/docs/examples/jbpm" override="true">
         <include name="hibernate.cfg.hsqldb.xml"/>
@@ -188,23 +198,23 @@
         <include name="jbpm-postgresql-ds.xml"/>
         <include name="jbpm-sybase-ds.xml"/>
       </fileset>
-      
+
       <!-- Database Hypsersonic -->
       <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-hsqldb-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isHypersonic"/>
-      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic" 
-        target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.hsqldb.xml" condition="isHypersonic"
+                  target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
       <!--fileset dir="@{resources.dir}/database" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data" condition="isHypersonic">
         <include name="hypersonic/jbpmDB.*" />
       </fileset-->
-        
+
       <!-- Database MySQL -->
       <file src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/jbpm-mysql-ds.xml" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" condition="isMySQL"/>
-      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml" condition="isMySQL" 
-        target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
+      <singlefile src="@{deploy.artifacts.dir}/resources/jbpm-jpdl-config/hibernate.cfg.mysql.xml" condition="isMySQL"
+                  target="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
       <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar" override="true" condition="isMySQL">
         <include name="mysql-connector-java.jar" />
-      </fileset> 
-      
+      </fileset>
+
     </pack>
 
     <!-- 
@@ -214,7 +224,7 @@
     *                              *
     ********************************
     -->
-    
+
     <!--pack name="GWT-Console" parent="jbpm4 JBoss Integration" required="no" preselected="yes">
       <description>GWT-Console</description>
       <file src="@{deploy.artifacts.dir}/lib/gwt-console.war" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/jbpm" unpack="false" override="true" />
@@ -223,7 +233,7 @@
       <file src="@{deploy.artifacts.dir}/lib/gwt-console-server-report.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" />
       <file src="@{deploy.artifacts.dir}/lib/report-engine.zip" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/data/birt/" unpack="true" override="true" />
     </pack-->
-    
+
     <!-- 
     ********************************
     *                              *  
@@ -231,7 +241,7 @@
     *                              *
     ********************************
     -->
-    
+
     <pack name="Optional Components" required="no" preselected="no">
       <description>Optional jBPM4 Components</description>
     </pack>

Modified: jbpm4/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/pom.xml	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/enterprise/pom.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -18,7 +18,7 @@
   <name>jBPM 4 - Enterprise</name>
   <groupId>org.jbpm.jbpm4</groupId>
   <artifactId>jbpm-enterprise</artifactId>
-  <packaging>ejb</packaging>
+  <packaging>jar</packaging>
 
   <!-- Parent -->
   <parent>
@@ -56,24 +56,37 @@
 
   <!-- Plugins -->
   <build>
+
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+    
     <testResources>
       <testResource>
+        <directory>src/test/resources</directory>
         <filtering>true</filtering>
-        <directory>src/test/resources</directory>
       </testResource>
     </testResources>
 
     <plugins>
+
       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
+        <artifactId>maven-jar-plugin</artifactId>
         <configuration>
-          <showDeprecation>false</showDeprecation>
+          <excludes>
+            <exclude>jbpm.cfg.xml</exclude>
+            <exclude>jbpm-destinations-service.xml</exclude>
+          </excludes>
         </configuration>
       </plugin>
 
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
+
           <execution>
             <id>assembly-test-dependencies</id>
             <phase>generate-test-resources</phase>
@@ -88,7 +101,23 @@
                 <descriptor>scripts/assembly-test-dependencies.xml</descriptor>
               </descriptors>
             </configuration>
-          </execution>         
+          </execution>
+
+          <execution>
+            <id>enterprise-config</id>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+            <configuration>
+              <finalName>${project.build.finalName}</finalName>
+              <appendAssemblyId>true</appendAssemblyId>
+              <descriptors>
+                <descriptor>scripts/assembly-config.xml</descriptor>
+              </descriptors>
+            </configuration>
+          </execution>
+
         </executions>
       </plugin>
 
@@ -112,6 +141,16 @@
           </execution>
         </executions>
       </plugin>
+
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>org/jbpm/enterprise/internal/ejb/TimerTest.java</exclude>
+            <exclude>org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -134,7 +173,7 @@
         </plugins>
       </build>
     </profile>
-    
+
   </profiles>
 
 </project>
\ No newline at end of file

Added: jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml	                        (rev 0)
+++ jbpm4/trunk/modules/enterprise/scripts/assembly-config.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+  <id>config</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${project.build.outputDirectory}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>jbpm.cfg.xml</include>
+        <include>jbpm-destinations-service.xml</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+</assembly>
\ No newline at end of file

Modified: jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jboss.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -43,7 +43,7 @@
 
     <message-destination>
       <message-destination-name>CommandQueue</message-destination-name>
-      <jndi-name>queue/tSestQueue</jndi-name>
+      <jndi-name>queue/JbpmCommandQueue</jndi-name>
     </message-destination>
 
   </assembly-descriptor>

Modified: jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/META-INF/jbosscmp-jdbc.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -3,7 +3,7 @@
 
 <jbosscmp-jdbc>
   <defaults>
-    <datasource>java:DefaultDS</datasource>
+    <datasource>java:/JbpmDS</datasource>
     <create-table>false</create-table>
     <remove-table>false</remove-table>
     <pk-constraint>false</pk-constraint>

Added: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml	                        (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm-destinations-service.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: jbossmq-destinations-service.xml 25907 2004-11-16 04:32:39Z ejort $ -->
+
+<!--
+  This file defines the default Queues and Topics that jBPM ships with.  
+  You can add other destinations to this file, or you can create other
+  *-service.xml files to contain your application's destinations.
+ -->
+
+<server>
+  <!--
+    Destinations without a configured SecurityManager or without a
+    SecurityConf will default to role guest with read=true, write=true,
+    create=false.
+  -->
+
+  <mbean code="org.jboss.mq.server.jmx.Queue"
+	 name="jboss.mq.destination:service=Queue,name=JbpmCommandQueue">
+    <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
+  </mbean>
+
+</server>

Added: jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml	                        (rev 0)
+++ jbpm4/trunk/modules/enterprise/src/main/resources/jbpm.cfg.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+    <!--
+      jBPM4 enterprise configuration.
+      Uses different command service and environment config.
+      (i.e. skips the TX interceptor)
+      
+    -->
+
+<jbpm-configuration xmlns="http://jbpm.org/xsd/cfg">
+
+  <process-engine>
+
+    <deployer-manager>
+      <check-process />
+      <check-problems />
+      <save />
+    </deployer-manager>
+
+    <process-service />
+    <execution-service />
+    <management-service />
+    <ejb-local-command-service />
+
+    <hibernate-configuration resource="hibernate.cfg.xml"/>
+
+    <hibernate-session-factory />
+
+    <id-generator />
+    <types resource="jbpm.pvm.types.xml" />
+
+    <business-calendar>
+      <monday    hours="9:00-12:00 and 12:30-17:00"/>
+      <tuesday   hours="9:00-12:00 and 12:30-17:00"/>
+      <wednesday hours="9:00-12:00 and 12:30-17:00"/>
+      <thursday  hours="9:00-12:00 and 12:30-17:00"/>
+      <friday    hours="9:00-12:00 and 12:30-17:00"/>
+      <holiday period="01/07/2008 - 31/08/2008"/>
+    </business-calendar>
+
+  </process-engine>
+
+  <environment>
+    <hibernate-session current="true" />
+    <pvm-db-session />
+    <job-db-session />
+    <ejb-timer-session />
+  </environment>
+
+</jbpm-configuration>

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/HappyListener.java	2009-02-06 13:47:20 UTC (rev 3789)
@@ -59,7 +59,7 @@
     }
     catch (InterruptedException e) {
       log.info("wait interrupted");
-    }
+    }    
     return executionDate;
   }
 }

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/custom/NoisyListener.java	2009-02-06 13:47:20 UTC (rev 3789)
@@ -59,7 +59,7 @@
     }
     catch (InterruptedException e) {
       log.info("wait interrupted");
-    }
+    }    
     return executionDate;
   }
 }

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/EjbTimerSessionTest.java	2009-02-06 13:47:20 UTC (rev 3789)
@@ -145,7 +145,7 @@
     environment.get(ExecutionService.class).startExecutionById(processDefinitionId);
 
     // wait past the due date, ensure activity did not execute
-    Date executionDate = HappyListener.waitFor(2 * TIMEOUT);
+    Date executionDate = HappyListener.waitFor(2 * TIMEOUT);    
     assertNull(executionDate);
   }
 

Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/internal/ejb/TimerTest.java	2009-02-06 13:47:20 UTC (rev 3789)
@@ -143,6 +143,7 @@
     environment.get(CommandService.class).execute(new CreateTimerCmd(timer));
 
     Date executionDate = HappyListener.waitFor();
+    assertNotNull(executionDate);
     assertTrue(dueDate.compareTo(executionDate) <= 0);
   }
 
@@ -186,6 +187,7 @@
     commandService.execute(new CreateTimerCmd(timer));
 
     Date executionDate = NoisyListener.waitFor();
+    assertNotNull(executionDate);
     assertTrue(dueDate.compareTo(executionDate) <= 0);
 
     Object variableValue = executionService.getVariable(execution.getId(), "executionDate");

Modified: jbpm4/trunk/pom.xml
===================================================================
--- jbpm4/trunk/pom.xml	2009-02-06 09:53:33 UTC (rev 3788)
+++ jbpm4/trunk/pom.xml	2009-02-06 13:47:20 UTC (rev 3789)
@@ -37,7 +37,7 @@
     <module>modules/examples</module>
     <module>modules/jpdl</module>
     <module>modules/task</module>
-    <!-- >module>modules/enterprise</module  -->
+    <module>modules/enterprise</module>
     <module>modules/test-base</module>
     <module>modules/test-db</module>
     <module>modules/test-pojo</module>




More information about the jbpm-commits mailing list