Author: chris.laprun(a)jboss.com Date: 2008-06-24 10:21:15 -0400 (Tue, 24 Jun 2008) New Revision: 11129 Modified: branches/JBoss_Portal_Branch_2_7/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/jbpm-hibernate.cfg.xml branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7/workflow/src/resources/test/conf/hibernate.cfg.xml Log: - More jBPM upgrade (should fix Portal deployment, though more tests are needed): + Updated Hibernate mappings for jBPM. + Added tx service to jBPM configuration. + Updated namespace in process definitions to use jBPM 3.2 URN. - Note that in the upgrade to jBPM 3.2.2, we currently have lost the possibility to change the scheduling interval... Modified: branches/JBoss_Portal_Branch_2_7/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml 2008-06-24 13:15:07 UTC (rev 11128) +++ branches/JBoss_Portal_Branch_2_7/cms/src/resources/portal-cms-jar/org/jboss/portal/cms/jboss-beans-workflow.xml 2008-06-24 14:21:15 UTC (rev 11129) @@ -64,96 +64,95 @@ <property name="mappings"> <list elementClass="java.lang.String"> <value>domain.hbm.xml</value> - <value>domain-identity.hbm.xml</value> - <value>org/jbpm/graph/action/Script.hbm.xml</value> - <value>org/jbpm/identity/User.hbm.xml</value> - <value>org/jbpm/identity/Group.hbm.xml</value> - <value>org/jbpm/identity/Membership.hbm.xml</value> - <value>org/jbpm/db/hibernate.queries.hbm.xml</value> - <value>org/jbpm/graph/def/ProcessDefinition.hbm.xml</value> - <value>org/jbpm/graph/def/Node.hbm.xml</value> - <value>org/jbpm/graph/def/Transition.hbm.xml</value> - <value>org/jbpm/graph/def/Event.hbm.xml</value> - <value>org/jbpm/graph/def/Action.hbm.xml</value> - <value>org/jbpm/graph/def/SuperState.hbm.xml</value> - <value>org/jbpm/graph/def/ExceptionHandler.hbm.xml</value> - <value>org/jbpm/instantiation/Delegation.hbm.xml</value> - <value>org/jbpm/graph/node/StartState.hbm.xml</value> - <value>org/jbpm/graph/node/EndState.hbm.xml</value> - <value>org/jbpm/graph/node/ProcessState.hbm.xml</value> - <value>org/jbpm/graph/node/Decision.hbm.xml</value> - <value>org/jbpm/graph/node/Fork.hbm.xml</value> - <value>org/jbpm/graph/node/Join.hbm.xml</value> - <value>org/jbpm/graph/node/State.hbm.xml</value> - <value>org/jbpm/graph/node/TaskNode.hbm.xml</value> - <value>org/jbpm/context/def/ContextDefinition.hbm.xml</value> - <value>org/jbpm/context/def/VariableAccess.hbm.xml</value> - <value>org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml</value> - <value>org/jbpm/taskmgmt/def/Swimlane.hbm.xml</value> - <value>org/jbpm/taskmgmt/def/Task.hbm.xml</value> - <value>org/jbpm/taskmgmt/def/TaskController.hbm.xml</value> - <value>org/jbpm/module/def/ModuleDefinition.hbm.xml</value> - <value>org/jbpm/bytes/ByteArray.hbm.xml</value> - <value>org/jbpm/file/def/FileDefinition.hbm.xml</value> - <value>org/jbpm/scheduler/def/CreateTimerAction.hbm.xml</value> - <value>org/jbpm/scheduler/def/CancelTimerAction.hbm.xml</value> - <value>org/jbpm/graph/exe/Comment.hbm.xml</value> - <value>org/jbpm/graph/exe/ProcessInstance.hbm.xml</value> - <value>org/jbpm/graph/exe/Token.hbm.xml</value> - <value>org/jbpm/graph/exe/RuntimeAction.hbm.xml</value> - <value>org/jbpm/module/exe/ModuleInstance.hbm.xml</value> - <value>org/jbpm/context/exe/ContextInstance.hbm.xml</value> - <value>org/jbpm/context/exe/TokenVariableMap.hbm.xml</value> - <value>org/jbpm/context/exe/VariableInstance.hbm.xml</value> - <value>org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml</value> - <value>org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml</value> - <value>org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml</value> - <value>org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml</value> - <value>org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml</value> - <value>org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml</value> - <value>org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml</value> - <value>org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml</value> - <value>org/jbpm/msg/Message.hbm.xml</value> - <value>org/jbpm/msg/db/TextMessage.hbm.xml</value> - <value>org/jbpm/command/ExecuteActionCommand.hbm.xml</value> - <value>org/jbpm/command/ExecuteNodeCommand.hbm.xml</value> - <value>org/jbpm/command/SignalCommand.hbm.xml</value> - <value>org/jbpm/command/TaskInstanceEndCommand.hbm.xml</value> - <value>org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml</value> - <value>org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml</value> - <value>org/jbpm/taskmgmt/exe/PooledActor.hbm.xml</value> - <value>org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml</value> - <value>org/jbpm/scheduler/exe/Timer.hbm.xml</value> - <value>org/jbpm/logging/log/ProcessLog.hbm.xml</value> - <value>org/jbpm/logging/log/MessageLog.hbm.xml</value> - <value>org/jbpm/logging/log/CompositeLog.hbm.xml</value> - <value>org/jbpm/graph/log/ActionLog.hbm.xml</value> - <value>org/jbpm/graph/log/NodeLog.hbm.xml</value> - <value>org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml</value> - <value>org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml</value> - <value>org/jbpm/graph/log/ProcessStateLog.hbm.xml</value> - <value>org/jbpm/graph/log/SignalLog.hbm.xml</value> - <value>org/jbpm/graph/log/TokenCreateLog.hbm.xml</value> - <value>org/jbpm/graph/log/TokenEndLog.hbm.xml</value> - <value>org/jbpm/graph/log/TransitionLog.hbm.xml</value> - <value>org/jbpm/context/log/VariableLog.hbm.xml</value> - <value>org/jbpm/context/log/VariableCreateLog.hbm.xml</value> - <value>org/jbpm/context/log/VariableDeleteLog.hbm.xml</value> - <value>org/jbpm/context/log/VariableUpdateLog.hbm.xml</value> - <value>org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml</value> - <value>org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml</value> - <value>org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml</value> - <value>org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml</value> - <value>org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml</value> - <value>org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml</value> - <value>org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml</value> - <value>org/jbpm/taskmgmt/log/TaskLog.hbm.xml</value> - <value>org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml</value> - <value>org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml</value> - <value>org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml</value> - <value>org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml</value> - <value>org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml</value> - <value>org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml</value> + <value>domain-identity.hbm.xml</value> + <value>org/jbpm/graph/action/Script.hbm.xml</value> + <value>org/jbpm/identity/User.hbm.xml</value> + <value>org/jbpm/identity/Group.hbm.xml</value> + <value>org/jbpm/identity/Membership.hbm.xml</value> + <value>org/jbpm/db/hibernate.queries.hbm.xml</value> + <value>org/jbpm/graph/action/MailAction.hbm.xml</value> + <value>org/jbpm/graph/def/ProcessDefinition.hbm.xml</value> + <value>org/jbpm/graph/def/Node.hbm.xml</value> + <value>org/jbpm/graph/def/Transition.hbm.xml</value> + <value>org/jbpm/graph/def/Event.hbm.xml</value> + <value>org/jbpm/graph/def/Action.hbm.xml</value> + <value>org/jbpm/graph/def/SuperState.hbm.xml</value> + <value>org/jbpm/graph/def/ExceptionHandler.hbm.xml</value> + <value>org/jbpm/instantiation/Delegation.hbm.xml</value> + <value>org/jbpm/graph/node/StartState.hbm.xml</value> + <value>org/jbpm/graph/node/EndState.hbm.xml</value> + <value>org/jbpm/graph/node/ProcessState.hbm.xml</value> + <value>org/jbpm/graph/node/Decision.hbm.xml</value> + <value>org/jbpm/graph/node/Fork.hbm.xml</value> + <value>org/jbpm/graph/node/Join.hbm.xml</value> + <value>org/jbpm/graph/node/MailNode.hbm.xml</value> + <value>org/jbpm/graph/node/State.hbm.xml</value> + <value>org/jbpm/graph/node/TaskNode.hbm.xml</value> + <value>org/jbpm/context/def/ContextDefinition.hbm.xml</value> + <value>org/jbpm/context/def/VariableAccess.hbm.xml</value> + <value>org/jbpm/taskmgmt/def/TaskMgmtDefinition.hbm.xml</value> + <value>org/jbpm/taskmgmt/def/Swimlane.hbm.xml</value> + <value>org/jbpm/taskmgmt/def/Task.hbm.xml</value> + <value>org/jbpm/taskmgmt/def/TaskController.hbm.xml</value> + <value>org/jbpm/module/def/ModuleDefinition.hbm.xml</value> + <value>org/jbpm/bytes/ByteArray.hbm.xml</value> + <value>org/jbpm/file/def/FileDefinition.hbm.xml</value> + <value>org/jbpm/scheduler/def/CreateTimerAction.hbm.xml</value> + <value>org/jbpm/scheduler/def/CancelTimerAction.hbm.xml</value> + <value>org/jbpm/graph/exe/Comment.hbm.xml</value> + <value>org/jbpm/graph/exe/ProcessInstance.hbm.xml</value> + <value>org/jbpm/graph/exe/Token.hbm.xml</value> + <value>org/jbpm/graph/exe/RuntimeAction.hbm.xml</value> + <value>org/jbpm/module/exe/ModuleInstance.hbm.xml</value> + <value>org/jbpm/context/exe/ContextInstance.hbm.xml</value> + <value>org/jbpm/context/exe/TokenVariableMap.hbm.xml</value> + <value>org/jbpm/context/exe/VariableInstance.hbm.xml</value> + <value>org/jbpm/context/exe/variableinstance/ByteArrayInstance.hbm.xml</value> + <value>org/jbpm/context/exe/variableinstance/DateInstance.hbm.xml</value> + <value>org/jbpm/context/exe/variableinstance/DoubleInstance.hbm.xml</value> + <value>org/jbpm/context/exe/variableinstance/HibernateLongInstance.hbm.xml</value> + <value>org/jbpm/context/exe/variableinstance/HibernateStringInstance.hbm.xml</value> + <value>org/jbpm/context/exe/variableinstance/LongInstance.hbm.xml</value> + <value>org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml</value> + <value>org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml</value> + <value>org/jbpm/job/Job.hbm.xml</value> + <value>org/jbpm/job/Timer.hbm.xml</value> + <value>org/jbpm/job/ExecuteNodeJob.hbm.xml</value> + <value>org/jbpm/job/ExecuteActionJob.hbm.xml</value> + <value>org/jbpm/taskmgmt/exe/TaskMgmtInstance.hbm.xml</value> + <value>org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml</value> + <value>org/jbpm/taskmgmt/exe/PooledActor.hbm.xml</value> + <value>org/jbpm/taskmgmt/exe/SwimlaneInstance.hbm.xml</value> + <value>org/jbpm/logging/log/ProcessLog.hbm.xml</value> + <value>org/jbpm/logging/log/MessageLog.hbm.xml</value> + <value>org/jbpm/logging/log/CompositeLog.hbm.xml</value> + <value>org/jbpm/graph/log/ActionLog.hbm.xml</value> + <value>org/jbpm/graph/log/NodeLog.hbm.xml</value> + <value>org/jbpm/graph/log/ProcessInstanceCreateLog.hbm.xml</value> + <value>org/jbpm/graph/log/ProcessInstanceEndLog.hbm.xml</value> + <value>org/jbpm/graph/log/ProcessStateLog.hbm.xml</value> + <value>org/jbpm/graph/log/SignalLog.hbm.xml</value> + <value>org/jbpm/graph/log/TokenCreateLog.hbm.xml</value> + <value>org/jbpm/graph/log/TokenEndLog.hbm.xml</value> + <value>org/jbpm/graph/log/TransitionLog.hbm.xml</value> + <value>org/jbpm/context/log/VariableLog.hbm.xml</value> + <value>org/jbpm/context/log/VariableCreateLog.hbm.xml</value> + <value>org/jbpm/context/log/VariableDeleteLog.hbm.xml</value> + <value>org/jbpm/context/log/VariableUpdateLog.hbm.xml</value> + <value>org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml</value> + <value>org/jbpm/context/log/variableinstance/DateUpdateLog.hbm.xml</value> + <value>org/jbpm/context/log/variableinstance/DoubleUpdateLog.hbm.xml</value> + <value>org/jbpm/context/log/variableinstance/HibernateLongUpdateLog.hbm.xml</value> + <value>org/jbpm/context/log/variableinstance/HibernateStringUpdateLog.hbm.xml</value> + <value>org/jbpm/context/log/variableinstance/LongUpdateLog.hbm.xml</value> + <value>org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml</value> + <value>org/jbpm/taskmgmt/log/TaskLog.hbm.xml</value> + <value>org/jbpm/taskmgmt/log/TaskCreateLog.hbm.xml</value> + <value>org/jbpm/taskmgmt/log/TaskAssignLog.hbm.xml</value> + <value>org/jbpm/taskmgmt/log/TaskEndLog.hbm.xml</value> + <value>org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml</value> + <value>org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml</value> + <value>org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml</value> </list> </property> </bean> @@ -167,21 +166,22 @@ <!-- setup for cms workflow testing --> <bean name="WorkflowService" class="org.jboss.portal.workflow.service.WorkflowServiceImpl"> - <property name="jbpmConfigurationXml"> - <![CDATA[ - <jbpm-configuration> - <jbpm-context> - <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/> - </jbpm-context> - <string name="resource.hibernate.cfg.xml" value="jbpm-hibernate.cfg.xml"/> - <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/> - <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties"/> - <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties"/> - <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/> - <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/> - <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/> - </jbpm-configuration> - ]]> + <property name="jbpmConfigurationXml"> + <![CDATA[ + <jbpm-configuration> + <jbpm-context> + <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory"/> + <service name="tx" factory="org.jbpm.tx.TxServiceFactory"/> + </jbpm-context> + <string name="resource.hibernate.cfg.xml" value="jbpm-hibernate.cfg.xml"/> + <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/> + <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties"/> + <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties"/> + <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/> + <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/> + <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/> + </jbpm-configuration> + ]]> </property> </bean> Modified: branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/jbpm-hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/jbpm-hibernate.cfg.xml 2008-06-24 13:15:07 UTC (rev 11128) +++ branches/JBoss_Portal_Branch_2_7/cms/src/resources/test/jbpm-hibernate.cfg.xml 2008-06-24 14:21:15 UTC (rev 11129) @@ -5,165 +5,174 @@ "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd"> <hibernate-configuration> - <session-factory> - <!-- jdbc connection properties --> - <property name="connection.datasource">java:/DefaultDS</property> + <session-factory> + <!-- jdbc connection properties --> + <property name="connection.datasource">java:/DefaultDS</property> - <!-- other hibernate properties --> - <property name="show_sql">false</property> - <property name="hibernate.format_sql">true</property> - <property name="hibernate.use_sql_comments">true</property> + <!-- other hibernate properties --> + <property name="show_sql">false</property> + <property name="hibernate.format_sql">true</property> + <property name="hibernate.use_sql_comments">true</property> - <!-- caching properties --> - <property name="cache.use_second_level_cache">true</property> - <property name="cache.use_query_cache">true</property> - <property name="cache.provider_configuration_file_resource_path">jbpm-ehcache.xml</property> - <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> + <!-- caching properties --> + <property name="cache.use_second_level_cache">true</property> + <property name="cache.use_query_cache">true</property> + <property name="cache.provider_configuration_file_resource_path">jbpm-ehcache.xml</property> + <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> - <!-- managed environment transaction configuration --> - <property - name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup</property> - <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> + <!-- managed environment transaction configuration --> + <property + name="hibernate.transaction.manager_lookup_class">org.hibernate.transaction.JBossTransactionManagerLookup + </property> + <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> - <!-- ############################################ --> - <!-- # mapping files with external dependencies # --> - <!-- ############################################ --> + <!-- ############################################ --> + <!-- # 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 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-{version}.jar', mapping files --> - <!-- of the pluggable jbpm identity component. --> - <!-- comment out the following 3 lines if you don't--> - <!-- want to use the default jBPM identity mgmgt --> - <!-- component --> - <mapping resource="org/jbpm/identity/User.hbm.xml"/> - <mapping resource="org/jbpm/identity/Group.hbm.xml"/> - <mapping resource="org/jbpm/identity/Membership.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) --> - <!-- ###################### --> - <!-- # jbpm mapping files # --> - <!-- ###################### --> + <!-- 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) --> - <!-- hql queries and type defs --> - <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml"/> + <!-- ###################### --> + <!-- # jbpm mapping files # --> + <!-- ###################### --> - <!-- 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"/> + <!-- hql queries and type defs --> + <mapping resource="org/jbpm/db/hibernate.queries.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.action mapping files --> + <mapping resource="org/jbpm/graph/action/MailAction.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.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"/> - <!-- 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"/> + <!-- 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"/> - <!-- 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"/> + <!-- bytes mapping files --> + <mapping resource="org/jbpm/bytes/ByteArray.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"/> + <!-- file.def mapping files --> + <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> - <!-- module.exe mapping files --> - <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> + <!-- scheduler.def mapping files --> + <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> + <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.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"/> - <!-- msg.db mapping files --> - <mapping resource="org/jbpm/msg/Message.hbm.xml"/> - <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> - <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> - <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> - <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> - <mapping resource="org/jbpm/command/TaskInstanceEndCommand.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"/> - <!-- scheduler.exe mapping files --> - <mapping resource="org/jbpm/scheduler/exe/Timer.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"/> - <!-- 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"/> - </session-factory> + <!-- 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"/> + </session-factory> </hibernate-configuration> Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2008-06-24 13:15:07 UTC (rev 11128) +++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2008-06-24 14:21:15 UTC (rev 11129) @@ -26,35 +26,47 @@ <property name="hibernate.transaction.factory_class">org.hibernate.transaction.JTATransactionFactory</property> <!-- ############################################ --> - <!-- # mapping files with external dependencies # --> - <!-- ############################################ --> + <!-- # 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 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-{version}.jar', mapping files --> - <!-- of the pluggable jbpm identity component. --> - <!-- comment out the following 3 lines if you don't--> - <!-- want to use the default jBPM identity mgmgt --> - <!-- component --> - <mapping resource="org/jbpm/identity/User.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) --> - <!-- ###################### --> - <!-- # jbpm mapping files # --> - <!-- ###################### --> + <!-- 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) --> - <!-- 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"/> + <!-- ###################### --> + <!-- # jbpm mapping files # --> + <!-- ###################### --> + + <!-- 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.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"/> @@ -63,50 +75,51 @@ <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"/> + <!-- 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"/> + <!-- context.def mapping files --> + <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> - <!-- taskmgmt.def mapping files --> - <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.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.def mapping files --> - <mapping resource="org/jbpm/module/def/ModuleDefinition.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"/> - <!-- 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"/> + <!-- 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"/> + <!-- 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"/> + <!-- 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"/> + <!-- 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"/> @@ -118,25 +131,20 @@ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> - <!-- msg.db mapping files --> - <mapping resource="org/jbpm/msg/Message.hbm.xml"/> - <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> - <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> - <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> - <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> - <mapping resource="org/jbpm/command/TaskInstanceEndCommand.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"/> + <!-- 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"/> - <!-- scheduler.exe mapping files --> - <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> - - <!-- logging mapping files --> - <mapping resource="org/jbpm/logging/log/ProcessLog.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"/> Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2008-06-24 13:15:07 UTC (rev 11128) +++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-sar/conf/processes/custom.xml 2008-06-24 14:21:15 UTC (rev 11129) @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<process-definition name="custom" - xmlns="urn:jbpm.org:jpdl-3.1"> - <start-state> - <transition to="end"> - <action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/> - </transition> - </start-state> +<process-definition name="custom" xmlns="urn:jbpm.org:jpdl-3.2"> + <start-state> + <transition to="end"> + <action class="org.jboss.portal.core.identity.services.workflow.impl.CreateUserAction"/> + </transition> + </start-state> - <end-state name="end"/> + <end-state name="end"/> </process-definition> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-24 13:15:07 UTC (rev 11128) +++ branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-24 14:21:15 UTC (rev 11129) @@ -56,6 +56,7 @@ <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" /> <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" /> <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" /> + <service name="tx" factory="org.jbpm.tx.TxServiceFactory"/> </jbpm-context> <string name="resource.hibernate.cfg.xml" value="conf/hibernate/workflow/hibernate.cfg.xml"/> <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/> Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/resources/test/conf/hibernate.cfg.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/workflow/src/resources/test/conf/hibernate.cfg.xml 2008-06-24 13:15:07 UTC (rev 11128) +++ branches/JBoss_Portal_Branch_2_7/workflow/src/resources/test/conf/hibernate.cfg.xml 2008-06-24 14:21:15 UTC (rev 11129) @@ -21,35 +21,47 @@ <property name="hibernate.use_sql_comments">true</property> <!-- ############################################ --> - <!-- # mapping files with external dependencies # --> - <!-- ############################################ --> + <!-- # 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 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-{version}.jar', mapping files --> - <!-- of the pluggable jbpm identity component. --> - <!-- comment out the following 3 lines if you don't--> - <!-- want to use the default jBPM identity mgmgt --> - <!-- component --> - <mapping resource="org/jbpm/identity/User.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) --> - <!-- ###################### --> - <!-- # jbpm mapping files # --> - <!-- ###################### --> + <!-- 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) --> - <!-- 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"/> + <!-- ###################### --> + <!-- # jbpm mapping files # --> + <!-- ###################### --> + + <!-- 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.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"/> @@ -58,50 +70,51 @@ <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"/> + <!-- 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"/> + <!-- context.def mapping files --> + <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> - <!-- taskmgmt.def mapping files --> - <mapping resource="org/jbpm/taskmgmt/def/TaskMgmtDefinition.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.def mapping files --> - <mapping resource="org/jbpm/module/def/ModuleDefinition.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"/> - <!-- 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"/> + <!-- 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"/> + <!-- 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"/> + <!-- 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"/> + <!-- 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"/> @@ -113,25 +126,20 @@ <mapping resource="org/jbpm/context/exe/variableinstance/NullInstance.hbm.xml"/> <mapping resource="org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml"/> - <!-- msg.db mapping files --> - <mapping resource="org/jbpm/msg/Message.hbm.xml"/> - <mapping resource="org/jbpm/msg/db/TextMessage.hbm.xml"/> - <mapping resource="org/jbpm/command/ExecuteActionCommand.hbm.xml"/> - <mapping resource="org/jbpm/command/ExecuteNodeCommand.hbm.xml"/> - <mapping resource="org/jbpm/command/SignalCommand.hbm.xml"/> - <mapping resource="org/jbpm/command/TaskInstanceEndCommand.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"/> + <!-- 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"/> - <!-- scheduler.exe mapping files --> - <mapping resource="org/jbpm/scheduler/exe/Timer.hbm.xml"/> - - <!-- logging mapping files --> - <mapping resource="org/jbpm/logging/log/ProcessLog.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"/>