[jbpm-commits] JBoss JBPM SVN: r2080 - in jbpm3/trunk/modules/enterprise: scripts and 6 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Sep 3 06:42:24 EDT 2008


Author: alex.guizar at jboss.com
Date: 2008-09-03 06:42:24 -0400 (Wed, 03 Sep 2008)
New Revision: 2080

Added:
   jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml
   jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml
   jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml
   jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml
   jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml
   jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml
   jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml
   jbpm3/trunk/modules/enterprise/src/test/resources/WEB-INF/
Removed:
   jbpm3/trunk/modules/enterprise/src/test/resources/webapp/
Modified:
   jbpm3/trunk/modules/enterprise/pom.xml
   jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
   jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml
   jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java
   jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java
   jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
Log:
rehabilitated enterprise tests - work in progress
[JBPM-1708] EjbSchedulerTest: sporadic assertion failures in testSchedulePast and testScheduleMultiple, due to reliance on Thread.sleep
AsyncProcessingTest: testBulkJobs fails due to persisting stale state exceptions
[JBPM-1709] JtaDbPersistenceTest is back to work, see notes in Jira

Modified: jbpm3/trunk/modules/enterprise/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/pom.xml	2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/pom.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -24,7 +24,22 @@
     <artifactId>jbpm</artifactId>
     <version>3.3.0-SNAPSHOT</version>
   </parent>
-  
+
+  <!-- Profiles -->
+  <profiles>
+  	<profile>
+  		<id>no-database</id>
+  		<activation>
+  			<property>
+  				<name>!database</name>
+  			</property>
+  		</activation>
+  		<properties>
+        <database>hsqldb</database>
+      </properties>
+  	</profile>
+  </profiles>
+
   <!-- Dependencies -->
   <dependencies>
     <!-- jBPM Dependencies -->
@@ -60,7 +75,14 @@
     <dependency>
       <groupId>org.apache.cactus</groupId>
       <artifactId>cactus.core.framework.wrapper.javaEE.14</artifactId>
+      <version>1.8.0</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>org.mortbay.jetty</artifactId>
+          <groupId>org.mortbay.jetty</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.jboss.client</groupId>
@@ -72,7 +94,14 @@
     <dependency>
       <groupId>org.apache.cactus</groupId>
       <artifactId>cactus.integration.shared.api</artifactId>
+      <version>1.8.0</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>org.mortbay.jetty</artifactId>
+          <groupId>org.mortbay.jetty</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -93,6 +122,7 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
+            <id>build-test-jars</id>
             <phase>test-compile</phase>
             <goals>
               <goal>run</goal>
@@ -105,6 +135,19 @@
               </tasks>
             </configuration>
           </execution>
+          <execution>
+            <id>concat-hibernate-config</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>run</goal>
+            </goals>
+            <configuration>
+              <tasks>
+                <property name="database" value="${database}" />
+                <ant antfile="scripts/antrun-jbpm-config.xml" target="concat" />
+              </tasks>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -151,6 +194,7 @@
         <configuration>
           <excludes>
             <exclude>jbpm.cfg.xml</exclude>
+            <exclude>hibernate.*</exclude>
           </excludes>
         </configuration>
       </plugin>
@@ -161,8 +205,6 @@
             <!-- https://jira.jboss.org/jira/browse/JBPM-1708 -->
             <exclude>org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java</exclude>
             <exclude>org/jbpm/msg/jms/AsyncProcessingTest.java</exclude>
-            <!-- https://jira.jboss.org/jira/browse/JBPM-1709 -->
-            <exclude>org/jbpm/persistence/jta/JtaDbPersistenceTest.java</exclude>
           </excludes>
         </configuration>
       </plugin>

Added: jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/scripts/antrun-jbpm-config.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ====================================================================== -->
+<!--                                                                        -->
+<!--  JBoss, the OpenSource J2EE webOS                                      -->
+<!--                                                                        -->
+<!--  Distributable under LGPL license.                                     -->
+<!--  See terms of license at http://www.gnu.org.                           -->
+<!--                                                                        -->
+<!-- ====================================================================== -->
+
+<!-- $Id: antrun-jbpm-config.xml 2069 2008-09-02 12:30:53Z thomas.diesler at jboss.com $ -->
+
+<project default="concat">
+
+  <property name="project.build.directory" value="${basedir}/target"/>
+  <property name="project.resources.directory" value="${basedir}/src/main/resources"/>
+
+  <macrodef name="macro-database-cfg">
+    <attribute name="database" />
+    <sequential>
+
+      <available property="database.properties.available" file="${project.resources.directory}/hibernate.properties.@{database}.xml"/>
+      <fail message="hibernate.properties.@{database}.xml not available" unless="database.properties.available"/>
+      
+      <echo message="Concat hibernate.cfg.@{database}.xml using hibernate.properties.@{database}.xml" />
+      
+      <!-- Concat hibernate.cfg.xml -->
+      <concat destfile="${project.build.directory}/classes/hibernate.cfg.@{database}.xml">
+        <header trimleading="yes"><![CDATA[<?xml version='1.0' encoding='utf-8'?>
+  
+        <!DOCTYPE hibernate-configuration PUBLIC 
+          "-//Hibernate/Hibernate Configuration DTD 3.0//EN" 
+          "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
+  
+        <hibernate-configuration>
+          <session-factory>
+        ]]></header>
+        <fileset file="${project.resources.directory}/hibernate.common.xml" />
+        <fileset file="${project.resources.directory}/hibernate.properties.@{database}.xml" />
+        <fileset file="${project.resources.directory}/hibernate.mapping.xml" />
+        <fileset file="${project.resources.directory}/hibernate.cache.xml" />
+        <footer trimleading="yes"><![CDATA[
+          </session-factory>
+        </hibernate-configuration>
+        ]]></footer>
+      </concat>
+    </sequential>
+  </macrodef>
+
+  <target name="concat">
+  
+    <macro-database-cfg database="hsqldb"/>
+    <macro-database-cfg database="mysql"/>
+    <macro-database-cfg database="postgresql"/>
+    
+    <echo message="Copy hibernate.cfg.${database}.xml to hibernate.cfg.xml" />
+    <copy file="${project.build.directory}/classes/hibernate.cfg.${database}.xml" tofile="${project.build.directory}/classes/hibernate.cfg.xml"/>
+  </target>
+</project>
\ No newline at end of file

Modified: jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml	2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/scripts/antrun-test-jars.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -21,18 +21,27 @@
     <mkdir dir="${tests.output.dir}/test-libs"/>
     
     <!-- enterprise-test -->
-    <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/webapp/WEB-INF/web.xml">
-      <classes dir="${tests.output.dir}/test-classes"/>
+    <war warfile="${tests.output.dir}/test-libs/enterprise-test.war" webxml="${tests.resources.dir}/WEB-INF/web.xml">
+      <classes dir="${tests.output.dir}/test-classes">
+        <include name="org/jbpm/**" />
+        <exclude name="org/jbpm/enterprise/test/**" />
+      </classes>
       <lib dir="${tests.output.dir}/test-dependencies">
         <include name="aspectjrt*.jar"/>
         <include name="cactus*.jar"/>
         <include name="junit*.jar"/>
       </lib>
-      <webinf dir="${tests.resources.dir}/webapp/WEB-INF">
-        <include name="jboss-web.xml"/>
+      <webinf dir="${tests.resources.dir}/WEB-INF">
+        <exclude name="web.xml"/>
       </webinf>
     </war>
-    
+
+    <jar destfile="${tests.output.dir}/test-libs/enterprise-test.jar">
+      <fileset dir="${tests.output.dir}/test-classes">
+        <include name="org/jbpm/enterprise/test/**" />
+      </fileset>
+    </jar>
+
     <!-- Please add alphabetically -->
     
   </target>

Modified: jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml	2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/scripts/assembly-config.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -7,10 +7,14 @@
   <includeBaseDirectory>false</includeBaseDirectory>
   <fileSets>
     <fileSet>
-      <directory>src/main/resources</directory>
+      <directory>${project.build.outputDirectory}</directory>
       <outputDirectory>/</outputDirectory>
       <includes>
+        <include>hibernate.cfg.xml</include>
+        <include>hibernate.cfg.*.xml</include>
         <include>jbpm.cfg.xml</include>
+        <include>jbpm.mail.templates.xml</include>
+        <include>tree.cache.xml</include>
       </includes>
     </fileSet>
   </fileSets>

Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.cache.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,67 @@
+
+    <!-- ################################### -->
+    <!-- # cache settings                  # -->
+    <!-- # strategy="nonstrict-read-write" # -->
+    <!-- # can be used with hibernate.cache.provider_class=org.hibernate.cache.HashtableCacheProvider # -->
+    <!-- ################################### -->
+
+    <class-cache	class="org.jbpm.context.def.VariableAccess" usage="nonstrict-read-write" />
+
+    <collection-cache collection="org.jbpm.file.def.FileDefinition.processFiles" usage="nonstrict-read-write" />
+
+    <collection-cache collection="org.jbpm.graph.action.Script.variableAccesses" usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.graph.def.Action"	usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.graph.def.Event"	usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.Event.actions" usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.graph.def.ExceptionHandler"	usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.ExceptionHandler.actions" usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.graph.def.Node" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.Node.events" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.Node.exceptionHandlers" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.Node.leavingTransitions" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.Node.arrivingTransitions" usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.graph.def.ProcessDefinition"	usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.events" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.exceptionHandlers" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.nodes" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.actions" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.ProcessDefinition.definitions" usage="nonstrict-read-write" />
+
+    <collection-cache collection="org.jbpm.graph.def.SuperState.nodes" usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.graph.def.Transition"	usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.Transition.events" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.graph.def.Transition.exceptionHandlers" usage="nonstrict-read-write" />
+
+    <collection-cache collection="org.jbpm.graph.node.Decision.decisionConditions" usage="nonstrict-read-write" />
+
+    <collection-cache collection="org.jbpm.graph.node.ProcessState.variableAccesses" usage="nonstrict-read-write" />
+
+    <collection-cache collection="org.jbpm.graph.node.TaskNode.tasks" usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.instantiation.Delegation"	usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.module.def.ModuleDefinition"	usage="nonstrict-read-write" />
+
+    <collection-cache collection="org.jbpm.taskmgmt.def.Swimlane.tasks" usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.taskmgmt.def.TaskController"	usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.taskmgmt.def.TaskController.variableAccesses" usage="nonstrict-read-write" />
+
+    <class-cache 	class="org.jbpm.taskmgmt.def.Task"	usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.taskmgmt.def.Task.events" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.taskmgmt.def.Task.exceptionHandlers" usage="nonstrict-read-write" />
+
+    <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.swimlanes" usage="nonstrict-read-write" />
+    <collection-cache collection="org.jbpm.taskmgmt.def.TaskMgmtDefinition.tasks" usage="nonstrict-read-write" />
+
+  <!--
+     ==================================================================================
+     END org.jboss.jbpm:jbpm-jpdl-core hibernate.cfg.xml
+     ==================================================================================
+  -->

Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.common.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,24 @@
+
+    <!-- ################################### -->
+    <!-- # common settings                 # -->
+    <!-- ################################### -->
+
+    <!-- Simple memory-only cache -->
+    <property name="cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+    <!-- DataSource properties -->
+    <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
+
+    <!-- JTA transaction properties -->
+    <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+    <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+
+    <!-- CMT transaction properties
+    <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
+    <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+    -->
+
+    <!-- logging properties -->
+    <property name="hibernate.format_sql">true</property>
+    <property name="hibernate.use_sql_comments">true</property>
+    
\ No newline at end of file

Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.mapping.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,149 @@
+
+   <!-- ############################################ -->
+   <!-- # mapping files with external dependencies # -->
+   <!-- ############################################ -->
+
+   <!-- following mapping files have a dependency on the JCR API -->
+   <!-- 
+   <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
+   -->
+
+   <!-- ###################### -->
+   <!-- # jbpm mapping files # -->
+   <!-- ###################### -->
+
+   <!-- hql queries and type defs -->
+   <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
+   <!-- hql queries used in simulation for querying historical data
+        uncomment if you want to use the GetSimulationInputCommand
+        or maybe you also want to use the queries yourself
+        be patient: the queries need the stddev function to be enabled in your dialect
+        more information on this can be found here: http://www.camunda.com/business_process_simulation_news/mysql_and_stddev.html -->
+   <!--
+   <mapping resource="org/jbpm/sim/bam/hibernate.queries.hbm.xml" />
+   -->
+
+   <!-- graph.action mapping files -->
+   <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/>
+
+   <!-- graph.def mapping files -->
+   <mapping resource="org/jbpm/graph/def/ProcessDefinition.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/def/Node.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/def/Transition.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/def/Event.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/def/Action.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/def/SuperState.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/def/ExceptionHandler.hbm.xml"/>
+   <mapping resource="org/jbpm/instantiation/Delegation.hbm.xml"/>
+
+   <!-- ############################################ -->
+   <!-- # another mapping file with external dependencies # -->
+   <!-- ############################################ -->
+   <!-- following mapping file has a dependency on   -->
+   <!-- 'bsh-{version}.jar'.                         -->
+   <!-- uncomment this if you don't have bsh on your -->
+   <!-- classpath.  you won't be able to use the     -->
+   <!-- script element in process definition files   -->
+   <!-- has to be defined below org/jbpm/graph/def/Action.hbm.xml -->
+   <!-- due to the inline collection-cache elements below -->
+   <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
+
+   <!-- graph.node mapping files -->
+   <mapping resource="org/jbpm/graph/node/StartState.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/node/EndState.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/node/ProcessState.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/node/Decision.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/node/Fork.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/node/Join.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/node/MailNode.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/node/State.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/node/TaskNode.hbm.xml"/>
+
+   <!-- context.def mapping files -->
+   <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+   <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
+
+   <!-- bytes mapping files -->
+   <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
+
+   <!-- module.def mapping files -->
+   <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+
+   <!-- file.def mapping files -->
+   <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+
+   <!-- taskmgmt.def mapping files -->
+   <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/def/Swimlane.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/def/Task.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/def/TaskController.hbm.xml"/>
+
+   <!-- scheduler.def mapping files -->
+   <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+   <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
+
+   <!-- graph.exe mapping files -->
+   <mapping resource="org/jbpm/graph/exe/Comment.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/exe/ProcessInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/exe/Token.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/exe/RuntimeAction.hbm.xml"/>
+
+   <!-- module.exe mapping files -->
+   <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/>
+
+   <!-- context.exe mapping files -->
+   <mapping resource="org/jbpm/context/exe/ContextInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/TokenVariableMap.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/VariableInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/>
+
+   <!-- job mapping files -->
+   <mapping resource="org/jbpm/job/Job.hbm.xml"/>
+   <mapping resource="org/jbpm/job/Timer.hbm.xml"/>
+   <mapping resource="org/jbpm/job/ExecuteNodeJob.hbm.xml"/>
+   <mapping resource="org/jbpm/job/ExecuteActionJob.hbm.xml"/>
+
+   <!-- taskmgmt.exe mapping files -->
+   <mapping resource="org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/exe/PooledActor.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml"/>
+
+   <!-- logging mapping files -->
+   <mapping resource="org/jbpm/logging/log/ProcessLog.hbm.xml"/>
+   <mapping resource="org/jbpm/logging/log/MessageLog.hbm.xml"/>
+   <mapping resource="org/jbpm/logging/log/CompositeLog.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/log/ActionLog.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/log/NodeLog.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/log/ProcessStateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/log/SignalLog.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/log/TokenCreateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/log/TokenEndLog.hbm.xml"/>
+   <mapping resource="org/jbpm/graph/log/TransitionLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/VariableLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/VariableCreateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/VariableDeleteLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/VariableUpdateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/log/TaskLog.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/>
+   <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/>

Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.hsqldb.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,3 @@
+
+    <!-- hibernate dialect -->
+    <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>

Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.mysql.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,3 @@
+
+    <!-- hibernate dialect -->
+    <property name="hibernate.dialect">org.hibernate.dialect.MySQLInnoDBDialect</property>

Added: jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml	                        (rev 0)
+++ jbpm3/trunk/modules/enterprise/src/main/resources/hibernate.properties.postgresql.xml	2008-09-03 10:42:24 UTC (rev 2080)
@@ -0,0 +1,3 @@
+
+    <!-- hibernate dialect -->
+    <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQLDialect</property>

Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java	2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/msg/jms/AsyncProcessingTest.java	2008-09-03 10:42:24 UTC (rev 2080)
@@ -53,9 +53,8 @@
   static int nbrOfConcurrentProcessExecutions = 20;
   static int maxWaitTime = 30000;
 
-  public static Test suite() throws Exception
-  {
-     return new IntegrationTestSetup(AsyncProcessingTest.class, "enterprise-test.war");
+  public static Test suite() throws Exception {
+     return new IntegrationTestSetup(AsyncProcessingTest.class, "enterprise-test.war, enterprise-test.jar");
   }
   
   protected void setUp() throws Exception {

Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java	2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/persistence/jta/JtaDbPersistenceTest.java	2008-09-03 10:42:24 UTC (rev 2080)
@@ -34,7 +34,6 @@
 import org.jbpm.JbpmContext;
 import org.jbpm.graph.def.ProcessDefinition;
 import org.jbpm.graph.exe.ProcessInstance;
-import org.jbpm.scheduler.ejbtimer.EjbSchedulerTest;
 
 public class JtaDbPersistenceTest extends ServletTestCase {
 
@@ -44,9 +43,8 @@
 
   private static long definitionId;
 
-  public static Test suite() throws Exception
-  {
-     return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war");
+  public static Test suite() throws Exception {
+     return new IntegrationTestSetup(JtaDbPersistenceTest.class, "enterprise-test.war");
   }
   
   protected void setUp() throws Exception {

Modified: jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java
===================================================================
--- jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java	2008-09-03 10:05:32 UTC (rev 2079)
+++ jbpm3/trunk/modules/enterprise/src/test/java/org/jbpm/scheduler/ejbtimer/EjbSchedulerTest.java	2008-09-03 10:42:24 UTC (rev 2080)
@@ -46,9 +46,8 @@
 
   private static LocalCommandServiceHome commandServiceHome;
 
-  public static Test suite() throws Exception
-  {
-     return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war");
+  public static Test suite() throws Exception {
+     return new IntegrationTestSetup(EjbSchedulerTest.class, "enterprise-test.war, enterprise-test.jar");
   }
   
   protected void setUp() throws Exception {

Copied: jbpm3/trunk/modules/enterprise/src/test/resources/WEB-INF (from rev 2059, jbpm3/trunk/modules/enterprise/src/test/resources/webapp/WEB-INF)


Property changes on: jbpm3/trunk/modules/enterprise/src/test/resources/WEB-INF
___________________________________________________________________
Name: svn:mergeinfo
   + 




More information about the jbpm-commits mailing list