[jboss-svn-commits] JBL Code SVN: r24702 - in labs/jbossesb/trunk/product/services/jbpm: lib/ext and 2 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jan 14 07:41:27 EST 2009


Author: beve
Date: 2009-01-14 07:41:26 -0500 (Wed, 14 Jan 2009)
New Revision: 24702

Added:
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jsf-console.war
   labs/jbossesb/trunk/product/services/jbpm/upgrade-jbpm.txt
Removed:
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-console.war
Modified:
   labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-identity.jar
   labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-jpdl.jar
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/hibernate.cfg.xml
   labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-service.xml
   labs/jbossesb/trunk/product/services/jbpm/src/test/resources/hibernate.cfg.xml
Log:
Work for https://jira.jboss.org/jira/browse/JBESB-2235 "Upgrade jBPM to version 3.3.0"


Modified: labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-identity.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/services/jbpm/lib/ext/jbpm-jpdl.jar
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/hibernate.cfg.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/hibernate.cfg.xml	2009-01-14 12:09:24 UTC (rev 24701)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/hibernate.cfg.xml	2009-01-14 12:41:26 UTC (rev 24702)
@@ -1,196 +1,268 @@
 <?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">
+<!DOCTYPE hibernate-configuration PUBLIC 
+"-//Hibernate/Hibernate Configuration DTD 3.0//EN" 
+"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 
 <hibernate-configuration>
-  <session-factory>
+<session-factory>
 
     <!-- hibernate dialect -->
     <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
 
-    <!-- JDBC connection properties (begin) 
+    <!-- JDBC connection properties (begin)--> 
+	<!--
     <property name="hibernate.connection.driver_class">org.hsqldb.jdbcDriver</property>
     <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbpm</property>
     <property name="hibernate.connection.username">sa</property>
     <property name="hibernate.connection.password"></property>
-     JDBC connection properties (end) -->
-    
-    
+	-->
     <!-- JDBC connection properties (end) -->
-    
-    <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-    
-    <!-- DataSource properties (begin) === -->
-    <property name="hibernate.connection.datasource">java:/JbpmDS</property>
-    <!--  ==== DataSource properties (end) -->
-    
+
+	<property name="jta.UserTransaction">UserTransaction</property>
+
+	<property name="hibernate.current_session_context_class">jta</property>
+
+    <!-- DataSource properties (begin) ===
+    ==== DataSource properties (end) -->
+	<property name="hibernate.connection.datasource">java:/JbpmDS</property>
+
     <!-- JTA transaction properties (begin) ===
     ==== JTA transaction properties (end) -->
     <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 (begin) ===
     <property name="hibernate.transaction.factory_class">org.hibernate.transaction.CMTTransactionFactory</property>
     <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
-	==== CMT transaction properties (end) -->
-	
-    <!-- logging properties (begin) ===
-    <property name="hibernate.show_sql">true</property>
+    ==== CMT transaction properties (end) -->
+
+    <!-- ################################### -->
+    <!-- # common settings                 # -->
+    <!-- ################################### -->
+
+    <!-- Automatic schema creation (begin) -->
+    <property name="hibernate.hbm2ddl.auto">create</property>
+    <!-- Automatic schema creation (end) -->
+
+    <!-- Simple memory-only cache -->
+    <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+    <!-- logging properties --> 
     <property name="hibernate.format_sql">true</property>
     <property name="hibernate.use_sql_comments">true</property>
-    ==== logging properties (end) -->
-    
+
     <!-- ############################################ -->
     <!-- # mapping files with external dependencies # -->
     <!-- ############################################ -->
 
-    <!-- following mapping file has a dependendy 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   -->
-    <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
-
-    <!-- following mapping files have a dependendy on  -->
-    <!-- 'jbpm-identity.jar', mapping files            -->
-    <!-- of the pluggable jbpm identity component.     -->
-    <!-- Uncomment the following 3 lines if you        -->
-    <!-- want to use the jBPM identity mgmgt           -->
-    <!-- component.                                    -->
-    <!-- identity mappings (begin) -->
-    <mapping resource="org/jbpm/identity/User.hbm.xml"/>
-    <mapping resource="org/jbpm/identity/Group.hbm.xml"/>
-    <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
-    <!-- identity mappings (end) -->
+    <!-- Additional mappings defined per module go here -->
+    <mapping resource="hibernate.extra.hbm.xml" />
+    <mapping resource="hibernate.identity.hbm.xml" />
     
-    <!-- following mapping files have a dependendy on  -->
-    <!-- the JCR API                                   -->
-    <!-- jcr mappings (begin) ===
-    <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
-    ==== jcr mappings (end) -->
 
+   <!-- ###################### -->
+   <!-- # jbpm mapping files # -->
+   <!-- ###################### -->
 
-    <!-- ###################### -->
-    <!-- # 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" />
+   -->
 
-    <!-- hql queries and type defs -->
-    <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" />
+   <!-- graph.action mapping files -->
+   <mapping resource="org/jbpm/graph/action/MailAction.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"/>
+   <!-- 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"/>
 
-    <!-- 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"/>
+   <!-- ############################################ -->
+   <!-- # 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"/>
 
-    <!-- context.def mapping files -->
-    <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
-    <mapping resource="org/jbpm/context/def/VariableAccess.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"/>
 
-    <!-- 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"/>
+   <!-- context.def mapping files -->
+   <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
+   <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/>
 
-    <!-- module.def mapping files -->
-    <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
+   <!-- bytes mapping files -->
+   <mapping resource="org/jbpm/bytes/ByteArray.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"/>
+   <!-- file.def mapping files -->
+   <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
 
-    <!-- scheduler.def mapping files -->
-    <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
-    <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.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"/>
 
-    <!-- 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"/>
+   <!-- scheduler.def mapping files -->
+   <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+   <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.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"/>
+   <!-- 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"/>
 
-    <!-- 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"/>
+   <!-- module.exe mapping files -->
+   <mapping resource="org/jbpm/module/exe/ModuleInstance.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"/>
+   <!-- 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"/>
 
-    <!-- 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"/>
-    
-  </session-factory>
+   <!-- 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"/>
+   <mapping resource="org/jbpm/job/CleanUpProcessJob.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"/>
+
+  <!-- ################################### -->
+  <!-- # 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" />
+
+
+</session-factory>
 </hibernate-configuration>

Deleted: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-console.war
===================================================================
(Binary files differ)

Modified: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-service.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-service.xml	2009-01-14 12:09:24 UTC (rev 24701)
+++ labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jbpm-service.xml	2009-01-14 12:41:26 UTC (rev 24702)
@@ -8,8 +8,7 @@
       <attribute name="Datasource">java:/JbpmDS</attribute>
       <attribute name="ExistsSql">select * from JBPM_ID_USER</attribute>
       <attribute name="SqlFiles">
-      jbpm-sql/jbpm.jpdl.hsqldb.sql,
-      jbpm-sql/import.sql
+      jbpm-sql/jbpm.jpdl.hsqldb.sql
       </attribute>
       <depends>jboss.jca:service=DataSourceBinding,name=JbpmDS</depends>
       <attribute name="UseEOL">true</attribute>

Added: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jsf-console.war
===================================================================
(Binary files differ)


Property changes on: labs/jbossesb/trunk/product/services/jbpm/src/main/resources/jsf-console.war
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: labs/jbossesb/trunk/product/services/jbpm/src/test/resources/hibernate.cfg.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/src/test/resources/hibernate.cfg.xml	2009-01-14 12:09:24 UTC (rev 24701)
+++ labs/jbossesb/trunk/product/services/jbpm/src/test/resources/hibernate.cfg.xml	2009-01-14 12:41:26 UTC (rev 24702)
@@ -1,11 +1,11 @@
 <?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">
+<!DOCTYPE hibernate-configuration PUBLIC 
+"-//Hibernate/Hibernate Configuration DTD 3.0//EN" 
+"http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
 
 <hibernate-configuration>
-  <session-factory>
+<session-factory>
 
     <!-- hibernate dialect -->
     <property name="hibernate.dialect">org.hibernate.dialect.HSQLDialect</property>
@@ -15,15 +15,13 @@
     <property name="hibernate.connection.url">jdbc:hsqldb:mem:jbpm</property>
     <property name="hibernate.connection.username">sa</property>
     <property name="hibernate.connection.password"></property>
-    <property name="hibernate.hbm2ddl.auto">create</property>
     <!-- JDBC connection properties (end) -->
-    
-    <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
-    
+
+
     <!-- DataSource properties (begin) ===
-    <property name="hibernate.connection.datasource">java:/JbpmDS</property>
+    <property name="hibernate.connection.datasource">java:comp/env/jdbc/JbpmDataSource</property>
     ==== DataSource properties (end) -->
-    
+
     <!-- JTA transaction properties (begin) ===
     <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
     <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
@@ -34,157 +32,232 @@
     <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
     ==== CMT transaction properties (end) -->
 
-    <!-- logging properties (begin) ===
-    <property name="hibernate.show_sql">true</property>
+    <!-- ################################### -->
+    <!-- # common settings                 # -->
+    <!-- ################################### -->
+
+    <!-- Automatic schema creation (begin) -->
+    <property name="hibernate.hbm2ddl.auto">create</property>
+    <!-- Automatic schema creation (end) -->
+
+    <!-- Simple memory-only cache -->
+    <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property>
+
+    <!-- logging properties --> 
     <property name="hibernate.format_sql">true</property>
     <property name="hibernate.use_sql_comments">true</property>
-    ==== logging properties (end) -->
-    
+
     <!-- ############################################ -->
     <!-- # mapping files with external dependencies # -->
     <!-- ############################################ -->
 
-    <!-- following mapping file has a dependendy 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   -->
-    <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/>
-
-    <!-- following mapping files have a dependendy on  -->
-    <!-- 'jbpm-identity.jar', mapping files            -->
-    <!-- of the pluggable jbpm identity component.     -->
-    <!-- Uncomment the following 3 lines if you        -->
-    <!-- want to use the jBPM identity mgmgt           -->
-    <!-- component.                                    -->
-    <!-- identity mappings (begin) -->
-    <mapping resource="org/jbpm/identity/User.hbm.xml"/>
-    <mapping resource="org/jbpm/identity/Group.hbm.xml"/>
-    <mapping resource="org/jbpm/identity/Membership.hbm.xml"/>
-    <!-- identity mappings (end) -->
+    <!-- Additional mappings defined per module go here -->
+    <mapping resource="hibernate.extra.hbm.xml" />
+    <mapping resource="hibernate.identity.hbm.xml" />
     
-    <!-- following mapping files have a dependendy on  -->
-    <!-- the JCR API                                   -->
-    <!-- jcr mappings (begin) ===
-    <mapping resource="org/jbpm/context/exe/variableinstance/JcrNodeInstance.hbm.xml"/>
-    ==== jcr mappings (end) -->
 
+   <!-- ###################### -->
+   <!-- # jbpm mapping files # -->
+   <!-- ###################### -->
 
-    <!-- ###################### -->
-    <!-- # 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" />
+   -->
 
-    <!-- hql queries and type defs -->
-    <mapping resource="org/jbpm/db/hibernate.queries.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"/>
+   <!-- graph.action mapping files -->
+   <mapping resource="org/jbpm/graph/action/MailAction.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/State.hbm.xml"/>
-    <mapping resource="org/jbpm/graph/node/TaskNode.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"/>
 
-    <!-- context.def mapping files -->
-    <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/>
-    <mapping resource="org/jbpm/context/def/VariableAccess.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"/>
 
-    <!-- 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"/>
+   <!-- 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"/>
 
-    <!-- module.def mapping files -->
-    <mapping resource="org/jbpm/module/def/ModuleDefinition.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"/>
+   <!-- bytes mapping files -->
+   <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/>
 
-    <!-- file.def mapping files -->
-    <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/>
+   <!-- module.def mapping files -->
+   <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/>
 
-    <!-- scheduler.def mapping files -->
-    <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
-    <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/>
+   <!-- file.def mapping files -->
+   <mapping resource="org/jbpm/file/def/FileDefinition.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"/>
+   <!-- 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"/>
 
-    <!-- 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"/>
+   <!-- scheduler.def mapping files -->
+   <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/>
+   <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.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"/>
+   <!-- 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"/>
 
-    <!-- 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"/>
+   <!-- module.exe mapping files -->
+   <mapping resource="org/jbpm/module/exe/ModuleInstance.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"/>
-    
-  </session-factory>
+   <!-- 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"/>
+   <mapping resource="org/jbpm/job/CleanUpProcessJob.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"/>
+
+  <!-- ################################### -->
+  <!-- # 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" />
+
+
+</session-factory>
 </hibernate-configuration>

Added: labs/jbossesb/trunk/product/services/jbpm/upgrade-jbpm.txt
===================================================================
--- labs/jbossesb/trunk/product/services/jbpm/upgrade-jbpm.txt	                        (rev 0)
+++ labs/jbossesb/trunk/product/services/jbpm/upgrade-jbpm.txt	2009-01-14 12:41:26 UTC (rev 24702)
@@ -0,0 +1,106 @@
+######################################################################################
+This document describes the step that need to be performed to upgrade jbpm in JBossESB
+######################################################################################
+
+1. Download the target version of jbpm.
+For example:
+Download http://www.jboss.org/downloading/?projectId=jbossjbpm&url=http://downloads.sourceforge.net/jbpm/jbpm-installer-3.3.0.GA.jar and install into a directory.
+
+2. Copy jars from the above installation directory
+Copy lib/jbpm-jpdl.jar and lib/jbpm-identity.jar to product/services/jbpm/lib/ext
+
+ a) update org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml in jbpm-jpdl.jar:
+   <subclass name="org.jbpm.context.exe.variableinstance.StringInstance"
+            extends="org.jbpm.context.exe.VariableInstance"
+            discriminator-value="S">
+    <property name="value" type="text" column="STRINGVALUE_" length="4000"/>
+   </subclass>
+   Add the the length attribute as shown above.
+
+ b) Update org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml in jbpm-jpdl.jar: 
+   <subclass name="org.jbpm.context.exe.variableinstance.HibernateStringInstance"
+            extends="org.jbpm.context.exe.VariableInstance"
+            discriminator-value="I">
+    <any name="value" id-type="string" cascade="save-update">
+      <column name="STRINGIDCLASS_" />
+      <column name="STRINGVALUE_" length="4000"/>
+    </any>
+   </subclass>
+   Add the the length attribute as shown above.
+
+Note: that if the upgrade requires changes to the database scripts in src/main/resouces/jbpm-sql then make
+sure that you diff the files and apply the changes manually. 
+This is needed as we have modified these scripts to allow larger values for varchar fields and is related to the two changes above. 
+Just performing one of these will lead to errors when trying to insert values that are larger then 255.
+See https://jira.jboss.org/jira/browse/JBESB-1435 for more details on this.
+
+3. Copy hibernate config
+Copy config/hibernate.cfg.hsqldb.xml to product/services/jbpm/src/main/resource/hibernate.cfg.xml
+
+ a) Comment out the JDBC connection properties.
+
+ b) Uncommnet the DataSource property and change the Datasource name to:
+    <property name="hibernate.connection.datasource">java:/JbpmDS</property>
+
+ c) Uncomment the JTA transaction properties section:
+   <!-- JTA transaction properties (begin) ===
+   ==== JTA transaction properties (end) -->
+   <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property>
+   <property name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property>
+
+ d) Add the following properties:
+   <property name="jta.UserTransaction">UserTransaction</property>
+   <property name="hibernate.current_session_context_class">jta</property>
+
+4. Remove jbpm-console.war
+Delete product/service/jbpm/src/main/resouces/jbpm-console.war.
+
+5. Copy jsf-console.war
+Copy lib/jsf-console.war to product/services/jbpm/src/main/resources
+
+ a) Comment out the following from WEB-INF/web.xml:
+ <!--
+    <ejb-local-ref>
+        <description>
+            Link to the local entity bean that implements the scheduler service. Required for
+            processes that contain timers.
+        </description>
+        <ejb-ref-name>ejb/TimerEntityBean</ejb-ref-name>
+        <ejb-ref-type>Entity</ejb-ref-type>
+        <local-home>org.jbpm.ejb.LocalTimerEntityHome</local-home>
+        <local>org.jbpm.ejb.LocalTimerEntity</local>
+        <ejb-link>TimerEntityBean</ejb-link>
+    </ejb-local-ref>
+ -->
+
+6. Update src/test/resources/hibernate.cfg.xml
+Copy config/hibernate.cfg.hsqldb.xml to product/services/jbpm/src/test/resource/hibernate.cfg.xml. 
+
+
+7. Run through the integration tests
+From the root directory in the jbossesb project:
+ant -f integration-build.xml integration
+
+
+8. Going through and runing the bpm_orchestration quickstart is also recommened.
+ant deploy
+ant deployProcess
+ant startProcess
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+




More information about the jboss-svn-commits mailing list