June 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r5166 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources: org/jbpm/context/log and 4 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-06-30 10:40:56 -0400 (Tue, 30 Jun 2009) New Revision: 5166 Removed: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.oracle.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.oracle.hbm.xml Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.hbm.xml Log: JBPM-2115: jBPM testsuite hangs when executed with DB2 (CODING IN PROGRESS) Revert r5108 to prevent deadlocks in DB2 Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.oracle.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.oracle.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.oracle.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,142 +0,0 @@ -  -  -  - -  - <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> - -  - <mapping resource="org/jbpm/db/hibernate.types.hbm.xml" /> - -  -  - -  - <mapping resource="org/jbpm/graph/action/MailAction.hbm.xml"/> - -  - <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"/> - -  -  -  -  - <mapping resource="org/jbpm/graph/action/Script.hbm.xml"/> - -  - <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"/> - -  - <mapping resource="org/jbpm/context/def/ContextDefinition.hbm.xml"/> - <mapping resource="org/jbpm/context/def/VariableAccess.hbm.xml"/> - -  - <mapping resource="org/jbpm/bytes/ByteArray.hbm.xml"/> - -  - <mapping resource="org/jbpm/module/def/ModuleDefinition.hbm.xml"/> - -  - <mapping resource="org/jbpm/file/def/FileDefinition.hbm.xml"/> - -  - <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"/> - -  - <mapping resource="org/jbpm/scheduler/def/CreateTimerAction.hbm.xml"/> - <mapping resource="org/jbpm/scheduler/def/CancelTimerAction.hbm.xml"/> - -  - <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"/> - -  - <mapping resource="org/jbpm/module/exe/ModuleInstance.hbm.xml"/> - -  - <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"/> - -  - <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"/> - -  - <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"/> - -  - <mapping resource="org/jbpm/logging/log/ProcessLog.oracle.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.oracle.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/NodeLog.oracle.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.oracle.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TokenCreateLog.oracle.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TokenEndLog.oracle.hbm.xml"/> - <mapping resource="org/jbpm/graph/log/TransitionLog.oracle.hbm.xml"/> - <mapping resource="org/jbpm/context/log/VariableLog.oracle.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.oracle.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.oracle.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.oracle.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneCreateLog.hbm.xml"/> - <mapping resource="org/jbpm/taskmgmt/log/SwimlaneAssignLog.hbm.xml"/> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -12,7 +12,8 @@ <many-to-one name="variableInstance" column="VARIABLEINSTANCE_" - foreign-key="FK_LOG_VARINST" /> + foreign-key="FK_LOG_VARINST" + index="IDX_LOG_VARINST" /> </subclass> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/VariableLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,20 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.context.log.VariableLog" - extends="org.jbpm.logging.log.ProcessLog" - discriminator-value="V"> - - <many-to-one name="variableInstance" - column="VARIABLEINSTANCE_" - foreign-key="FK_LOG_VARINST" - index="IDX_LOG_VARINST" /> - - </subclass> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -14,12 +14,14 @@ class="org.jbpm.bytes.ByteArray" column="OLDBYTEARRAY_" cascade="all" - foreign-key="FK_LOG_OLDBYTES" /> + foreign-key="FK_LOG_OLDBYTES" + index="IDX_LOG_OLDBYTES" /> <many-to-one name="newValue" class="org.jbpm.bytes.ByteArray" column="NEWBYTEARRAY_" cascade="all" - foreign-key="FK_LOG_NEWBYTES" /> + foreign-key="FK_LOG_NEWBYTES" + index="IDX_LOG_NEWBYTES" /> </subclass> </hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/ByteArrayUpdateLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,27 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.context.log.variableinstance.ByteArrayUpdateLog" - extends="org.jbpm.context.log.VariableUpdateLog" - discriminator-value="B"> - - <many-to-one name="oldValue" - class="org.jbpm.bytes.ByteArray" - column="OLDBYTEARRAY_" - cascade="all" - foreign-key="FK_LOG_OLDBYTES" - index="IDX_LOG_OLDBYTES" /> - <many-to-one name="newValue" - class="org.jbpm.bytes.ByteArray" - column="NEWBYTEARRAY_" - cascade="all" - foreign-key="FK_LOG_NEWBYTES" - index="IDX_LOG_NEWBYTES" /> - </subclass> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -14,7 +14,8 @@ <many-to-one name="action" column="ACTION_" - foreign-key="FK_LOG_ACTION" /> + foreign-key="FK_LOG_ACTION" + index="IDX_LOG_ACTION" /> </subclass> </hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,21 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.graph.log.ActionLog" - extends="org.jbpm.logging.log.CompositeLog" - discriminator-value="A"> - - <property name="exception" column="EXCEPTION_" type="longstring" length="4000"/> - - <many-to-one name="action" - column="ACTION_" - foreign-key="FK_LOG_ACTION" - index="IDX_LOG_ACTION" /> - </subclass> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.sybase.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -14,7 +14,8 @@ <many-to-one name="action" column="ACTION_" - foreign-key="FK_LOG_ACTION" /> + foreign-key="FK_LOG_ACTION" + index="IDX_LOG_ACTION" /> </subclass> </hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -12,7 +12,8 @@ <many-to-one name="node" column="NODE_" - foreign-key="FK_LOG_NODE" /> + foreign-key="FK_LOG_NODE" + index="IDX_LOG_NODE" /> <property name="enter" column="ENTER_" /> <property name="leave" Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/NodeLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,26 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.graph.log.NodeLog" - extends="org.jbpm.logging.log.ProcessLog" - discriminator-value="N"> - - <many-to-one name="node" - column="NODE_" - foreign-key="FK_LOG_NODE" - index="IDX_LOG_NODE" /> - <property name="enter" - column="ENTER_" /> - <property name="leave" - column="LEAVE_" /> - <property name="duration" - column="DURATION_" /> - - </subclass> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -12,7 +12,8 @@ <many-to-one name="transition" column="TRANSITION_" - foreign-key="FK_LOG_TRANSITION" /> + foreign-key="FK_LOG_TRANSITION" + index="IDX_LOG_TRANSITION" /> </subclass> </hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/SignalLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,19 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.graph.log.SignalLog" - extends="org.jbpm.logging.log.CompositeLog" - discriminator-value="S"> - - <many-to-one name="transition" - column="TRANSITION_" - foreign-key="FK_LOG_TRANSITION" - index="IDX_LOG_TRANSITION" /> - </subclass> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -12,7 +12,8 @@ <many-to-one name="child" column="CHILD_" - foreign-key="FK_LOG_CHILDTOKEN" /> + foreign-key="FK_LOG_CHILDTOKEN" + index="IDX_LOG_CHILDTOKEN" /> </subclass> </hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenCreateLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,19 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.graph.log.TokenCreateLog" - extends="org.jbpm.logging.log.ProcessLog" - discriminator-value="O"> - - <many-to-one name="child" - column="CHILD_" - foreign-key="FK_LOG_CHILDTOKEN" - index="IDX_LOG_CHILDTOKEN" /> - </subclass> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -12,7 +12,8 @@ <many-to-one name="child" column="CHILD_" - foreign-key="FK_LOG_CHILDTOKEN" /> + foreign-key="FK_LOG_CHILDTOKEN" + index="IDX_LOG_CHILDTOKEN" /> </subclass> </hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TokenEndLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,19 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.graph.log.TokenEndLog" - extends="org.jbpm.logging.log.ProcessLog" - discriminator-value="Y"> - - <many-to-one name="child" - column="CHILD_" - foreign-key="FK_LOG_CHILDTOKEN" - index="IDX_LOG_CHILDTOKEN" /> - </subclass> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -12,13 +12,16 @@ <many-to-one name="transition" column="TRANSITION_" - foreign-key="FK_LOG_TRANSITION" /> + foreign-key="FK_LOG_TRANSITION" + index="IDX_LOG_TRANSITION" /> <many-to-one name="sourceNode" column="SOURCENODE_" - foreign-key="FK_LOG_SOURCENODE" /> + foreign-key="FK_LOG_SOURCENODE" + index="IDX_LOG_SOURCENODE" /> <many-to-one name="destinationNode" column="DESTINATIONNODE_" - foreign-key="FK_LOG_DESTNODE" /> + foreign-key="FK_LOG_DESTNODE" + index="IDX_LOG_DESTNODE" /> </subclass> </hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/TransitionLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,27 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.graph.log.TransitionLog" - extends="org.jbpm.logging.log.CompositeLog" - discriminator-value="T"> - - <many-to-one name="transition" - column="TRANSITION_" - foreign-key="FK_LOG_TRANSITION" - index="IDX_LOG_TRANSITION" /> - <many-to-one name="sourceNode" - column="SOURCENODE_" - foreign-key="FK_LOG_SOURCENODE" - index="IDX_LOG_SOURCENODE" /> - <many-to-one name="destinationNode" - column="DESTINATIONNODE_" - foreign-key="FK_LOG_DESTNODE" - index="IDX_LOG_DESTNODE" /> - </subclass> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -48,10 +48,12 @@ <property name="date" column="DATE_" /> <many-to-one name="token" column="TOKEN_" - foreign-key="FK_LOG_TOKEN" /> + foreign-key="FK_LOG_TOKEN" + index="IDX_LOG_TOKEN" /> <many-to-one name="parent" column="PARENT_" - foreign-key="FK_LOG_PARENT" /> + foreign-key="FK_LOG_PARENT" + index="IDX_LOG_PARENT" /> </class> </hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/ProcessLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,59 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <class name="org.jbpm.logging.log.ProcessLog" - table="JBPM_LOG" - discriminator-value="P" - lazy="false"> - <id name="id" column="ID_"><generator class="native" /></id> -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  -  - - <discriminator type="char" column="CLASS_"/> - - <property name="index" column="INDEX_" /> - <property name="date" column="DATE_" /> - <many-to-one name="token" - column="TOKEN_" - foreign-key="FK_LOG_TOKEN" - index="IDX_LOG_TOKEN" /> - <many-to-one name="parent" - column="PARENT_" - foreign-key="FK_LOG_PARENT" - index="IDX_LOG_PARENT" /> - </class> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -12,7 +12,8 @@ <many-to-one name="swimlaneInstance" column="SWIMLANEINSTANCE_" - foreign-key="FK_LOG_SWIMINST" /> + foreign-key="FK_LOG_SWIMINST" + index="IDX_LOG_SWIMINST" /> </subclass> </hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/SwimlaneLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,19 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.taskmgmt.log.SwimlaneLog" - extends="org.jbpm.logging.log.ProcessLog" - discriminator-value="4"> - - <many-to-one name="swimlaneInstance" - column="SWIMLANEINSTANCE_" - foreign-key="FK_LOG_SWIMINST" - index="IDX_LOG_SWIMINST" /> - </subclass> - -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -12,7 +12,8 @@ <many-to-one name="taskInstance" column="TASKINSTANCE_" - foreign-key="FK_LOG_TASKINST" /> + foreign-key="FK_LOG_TASKINST" + index="IDX_LOG_TASKINST" /> </subclass> </hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.oracle.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/log/TaskLog.oracle.hbm.xml 2009-06-30 14:40:56 UTC (rev 5166) @@ -1,19 +0,0 @@ -<?xml version="1.0"?> - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping auto-import="false" default-access="field"> - - <subclass name="org.jbpm.taskmgmt.log.TaskLog" - extends="org.jbpm.logging.log.ProcessLog" - discriminator-value="0"> - - <many-to-one name="taskInstance" - column="TASKINSTANCE_" - foreign-key="FK_LOG_TASKINST" - index="IDX_LOG_TASKINST" /> - </subclass> - -</hibernate-mapping>

14 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r5165 - in jbpm4/trunk/modules/pvm/src: main/resources and 1 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-06-30 09:58:20 -0400 (Tue, 30 Jun 2009) New Revision: 5165 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/TextVariable.java Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml jbpm4/trunk/modules/pvm/src/main/resources/jbpm.variable.types.xml jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java Log: schema review updates: changed some hibernate strings to text and pruned unused lob field mappings Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/TextVariable.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/TextVariable.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/TextVariable.java 2009-06-30 13:58:20 UTC (rev 5165) @@ -0,0 +1,52 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.type.variable; + +import org.jbpm.pvm.internal.type.Variable; + + +public class TextVariable extends Variable { + + private static final long serialVersionUID = 1L; + + protected String text = null; + + public boolean isStorable(Object value) { + if (value==null) return true; + return (char[].class==value.getClass()); + } + + public Object getObject() { + if (text==null) { + return null; + } + return text.toCharArray(); + } + + public void setObject(Object value) { + if (value!=null) { + this.text = new String((char[])value); + } else { + this.text = null; + } + } +} Property changes on: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/variable/TextVariable.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-06-30 13:53:27 UTC (rev 5164) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) @@ -113,7 +113,7 @@ <property name="userId" column="USERID_" /> <property name="time" column="TIME_" /> - <property name="message" column="MESSAGE_" /> + <property name="message" column="MESSAGE_" type="text" /> <list name="comments" cascade="all-delete-orphan" @@ -154,34 +154,38 @@ index="IDX_VAR_PROCINST"/> </class> - <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="T"> + <subclass name="org.jbpm.pvm.internal.type.variable.DateVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="date"> <property name="date" column="DATE_VALUE_" type="timestamp"/> </subclass> - <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="D"> + <subclass name="org.jbpm.pvm.internal.type.variable.DoubleVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="double"> <property name="d" column="DOUBLE_VALUE_" type="double"/> </subclass> - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="l"> + <subclass name="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="hib-long"> <property name="hibernatable" column="LONG_VALUE_" type="long"/> </subclass> - <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="L"> + <subclass name="org.jbpm.pvm.internal.type.variable.LongVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="long"> <property name="l" column="LONG_VALUE_" type="long"/> </subclass> - <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="s"> + <subclass name="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="hib-string"> <property name="hibernatable" column="STRING_VALUE_" type="string"/> </subclass> - <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="S"> + <subclass name="org.jbpm.pvm.internal.type.variable.StringVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="string"> <property name="string" column="STRING_VALUE_" type="string"/> </subclass> - <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="N"> + <subclass name="org.jbpm.pvm.internal.type.variable.TextVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="text"> + <property name="text" column="TEXT_VALUE_" type="text"/> </subclass> - <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="B"> + <subclass name="org.jbpm.pvm.internal.type.variable.NullVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="null"> + </subclass> + + <subclass name="org.jbpm.pvm.internal.type.variable.BlobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="blob"> <many-to-one name="lob" column="LOB_" cascade="all" @@ -189,14 +193,6 @@ foreign-key="FK_VAR_LOB" index="IDX_VAR_LOB" /> </subclass> - - <subclass name="org.jbpm.pvm.internal.type.variable.ClobVariable" extends="org.jbpm.pvm.internal.type.Variable" discriminator-value="C"> - <many-to-one name="lob" - column="LOB_" - cascade="all" - class="org.jbpm.pvm.internal.lob.Lob" - foreign-key="none"/> - </subclass>  <class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM4_LOB"> @@ -205,9 +201,12 @@ </id> <version name="dbversion" column="DBVERSION_" /> <property name="blob" type="blob"><column name="BLOB_VALUE_" /></property> +  </class> <class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM4_JOB" discriminator-value="Job"> Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-06-30 13:53:27 UTC (rev 5164) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-06-30 13:58:20 UTC (rev 5165) @@ -15,7 +15,7 @@ <version name="dbversion" column="DBVERSION_" /> <property name="name" column="NAME_"/> - <property name="description" column="DESCR_"/> + <property name="description" column="DESCR_" type="text"/> <property name="state" column="STATE_"/> <property name="suspendHistoryState" column="SUSPHISTSTATE_" /> <property name="assignee" column="ASSIGNEE_"/> Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.variable.types.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.variable.types.xml 2009-06-30 13:53:27 UTC (rev 5164) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.variable.types.xml 2009-06-30 13:58:20 UTC (rev 5165) @@ -20,7 +20,7 @@  <type name="byte[]" class="[B" variable-class="org.jbpm.pvm.internal.type.variable.BlobVariable" /> - <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.ClobVariable" /> + <type name="char[]" class="[C" variable-class="org.jbpm.pvm.internal.type.variable.TextVariable" /> <type name="hibernate-long-id" class="hibernate" id-type="long" variable-class="org.jbpm.pvm.internal.type.variable.HibernateLongVariable" /> <type name="hibernate-string-id" class="hibernate" id-type="string" variable-class="org.jbpm.pvm.internal.type.variable.HibernateStringVariable" /> Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2009-06-30 13:53:27 UTC (rev 5164) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/type/VariableAutoTypeResolutionTest.java 2009-06-30 13:58:20 UTC (rev 5165) @@ -37,6 +37,7 @@ import org.jbpm.pvm.internal.type.variable.DoubleVariable; import org.jbpm.pvm.internal.type.variable.LongVariable; import org.jbpm.pvm.internal.type.variable.StringVariable; +import org.jbpm.pvm.internal.type.variable.TextVariable; import org.jbpm.pvm.test.EnvironmentTestCase; /** @@ -218,10 +219,11 @@ ExecutionImpl execution = startProcessInstance(); char[] chars = generateChars("a lot of bytes ", 500); + assertTrue(chars.length>4500); execution.setVariable("v", chars); Variable variable = execution.getVariableObject("v"); - assertEquals(ClobVariable.class, variable.getClass()); + assertEquals(TextVariable.class, variable.getClass()); assertTrue(Arrays.equals(chars, (char[]) execution.getVariable("v"))); }

14 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r5164 - jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-06-30 09:53:27 -0400 (Tue, 30 Jun 2009) New Revision: 5164 Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java Log: JBPM-2365 fixed form attribute on task Modified: jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java =================================================================== --- jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-06-30 13:02:00 UTC (rev 5163) +++ jbpm4/trunk/modules/jpdl/src/main/java/org/jbpm/jpdl/internal/xml/JpdlParser.java 2009-06-30 13:53:27 UTC (rev 5164) @@ -457,7 +457,7 @@ String taskName = XmlUtil.attribute(element, "name"); taskDefinition.setName(taskName); - String form = XmlUtil.attribute(element, "formResourceName"); + String form = XmlUtil.attribute(element, "form"); taskDefinition.setFormResourceName(form); ProcessDefinitionImpl processDefinition = parse.findObject(ProcessDefinitionImpl.class);

14 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r5163 - in jbpm3/branches/jbpm-3.2-soa/modules/core/src: main/java/org/jbpm/command and 16 other directories.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-06-30 09:02:00 -0400 (Tue, 30 Jun 2009) New Revision: 5163 Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.hbm.xml Removed: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.default.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.oracle.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.oracle.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/module/def/ModuleDefinition.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java Log: JBPM-2369: Allow easy switching between VARCHAR(4000) and TEXT/CLOB (OPEN) Introduce 'longstring' typedef that can be easily switched between StringType and TextType Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/bytes/ByteArray.java 2009-06-30 13:02:00 UTC (rev 5163) @@ -44,9 +44,9 @@ private static final long serialVersionUID = 1L; - long id = 0; - protected String name = null; - protected List byteBlocks = null; + long id; + protected String name; + protected List byteBlocks; private static final Log log = LogFactory.getLog(ByteArray.class); @@ -60,15 +60,6 @@ public ByteArray(String name, byte[] bytes) { this(bytes); this.name = name; - - /* - if (log.isDebugEnabled()) { - if (byteBlocks!=null) { - logBlocks("chopping "); - } - } - - */ } void logBlocks(String msg) { @@ -87,13 +78,6 @@ } public byte[] getBytes() { - /* - if (log.isDebugEnabled()) { - if (byteBlocks!=null) { - logBlocks("glueing "); - } - } - */ return ByteBlockChopper.glueChopsBackTogether(byteBlocks); } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/command/ChangeProcessInstanceVersionCommand.java 2009-06-30 13:02:00 UTC (rev 5163) @@ -8,6 +8,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.Query; +import org.hibernate.Session; import org.jbpm.JbpmException; import org.jbpm.graph.def.GraphElement; @@ -71,7 +72,6 @@ } public ChangeProcessInstanceVersionCommand(long processId, int newVersion) { - super(); super.setProcessInstanceId(processId); this.newVersion = newVersion; } @@ -92,27 +92,27 @@ ProcessDefinition newDef = loadNewProcessDefinition(oldDef.getName()); if (newDef == null) { - throw new JbpmException("Process definition " - + oldDef.getName() - + " in version " - + newVersion - + " not found."); + throw new JbpmException("Process definition " + + oldDef.getName() + + " in version " + + newVersion + + " not found."); } - log.debug("Start changing process id " - + pi.getId() - + " from version " - + pi.getProcessDefinition().getVersion() - + " to new version " - + newDef.getVersion()); + log.debug("Start changing process id " + + pi.getId() + + " from version " + + pi.getProcessDefinition().getVersion() + + " to new version " + + newDef.getVersion()); pi.setProcessDefinition(newDef); changeTokenVersion(pi.getRootToken()); - log.debug("process id " - + pi.getId() - + " changed to version " - + pi.getProcessDefinition().getVersion()); + log.debug("process id " + + pi.getId() + + " changed to version " + + pi.getProcessDefinition().getVersion()); return pi; } @@ -136,8 +136,9 @@ adjustTaskInstancesForToken(token); // change children recursively - if (token.getChildren() != null) { - for (Iterator i = token.getChildren().values().iterator(); i.hasNext();) { + Map children = token.getChildren(); + if (children != null) { + for (Iterator i = children.values().iterator(); i.hasNext();) { changeTokenVersion((Token) i.next()); } } @@ -199,19 +200,18 @@ String replacementTaskName = getReplacementTaskName(oldTask); Node newTaskNode = findReplacementNode(newDef, oldNode); - Query q = getJbpmContext().getSession().getNamedQuery("TaskMgmtSession.findTaskForNode"); - q.setString("taskName", replacementTaskName); - q.setLong("taskNodeId", newTaskNode.getId()); + Session session = getJbpmContext().getSession(); + Long newTaskId = (Long) session.getNamedQuery("TaskMgmtSession.findTaskForNode").setString( + "taskName", replacementTaskName).setLong("taskNodeId", newTaskNode.getId()).uniqueResult(); - Task newTask = (Task) q.uniqueResult(); - if (newTask == null) { - throw new JbpmException("Task '" - + replacementTaskName - + "' for node '" - + newTaskNode.getName() - + "' not found in new process definition"); + if (newTaskId == null) { + throw new JbpmException("Task '" + + replacementTaskName + + "' for node '" + + newTaskNode.getName() + + "' not found in new process definition"); } - return newTask; + return (Task) session.load(Task.class, newTaskId); } /** @@ -220,8 +220,8 @@ * node name) */ private String getReplacementNodeName(GraphElement oldNode) { - String oldName = (oldNode instanceof Node ? ((Node) oldNode).getFullyQualifiedName() - : oldNode.getName()); + String oldName = oldNode instanceof Node ? ((Node) oldNode).getFullyQualifiedName() + : oldNode.getName(); if (nodeNameMapping.containsKey(oldName)) { return (String) nodeNameMapping.get(oldName); } Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/db/hibernate/TextType.java 2009-06-30 13:02:00 UTC (rev 5163) @@ -55,8 +55,8 @@ public class TextType implements EnhancedUserType, Serializable { private transient Log log; - private static final boolean IS_VALUE_TRACING_ENABLED = LogFactory.getLog(StringHelper.qualifier(Type.class.getName())) - .isTraceEnabled(); + private static final boolean IS_VALUE_TRACING_ENABLED = + LogFactory.getLog(StringHelper.qualifier(Type.class.getName())).isTraceEnabled(); private static final long serialVersionUID = 1L; @@ -68,12 +68,7 @@ } public Object assemble(Serializable cached, Object owner) throws HibernateException { - if (cached == null) { - return null; - } - else { - return deepCopy(cached); - } + return cached != null ? deepCopy(cached) : null; } public Object deepCopy(Object value) throws HibernateException { @@ -81,12 +76,7 @@ } public Serializable disassemble(Object value) throws HibernateException { - if (value == null) { - return null; - } - else { - return (Serializable) deepCopy(value); - } + return value != null ? (Serializable) deepCopy(value) : null; } public boolean equals(Object x, Object y) throws HibernateException { @@ -234,7 +224,7 @@ } public Object fromXMLString(String xml) { - return xml == null || xml.length() == 0 ? null : fromStringValue(xml); + return xml != null && xml.length() > 0 ? fromStringValue(xml) : null; } public String toXMLString(Object value) { @@ -242,11 +232,11 @@ } public String nullSafeToString(Object value) throws HibernateException { - return value == null ? null : toString(value); + return value != null ? toString(value) : null; } - public String toString(Object val) { - return (String) val; + public String toString(Object value) { + return (String) value; } public Object fromStringValue(String xml) { Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.common.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -19,8 +19,9 @@  <property name="hibernate.hbm2ddl.auto">create</property> + <property name="connection.pool_size">5</property>  - +  <property name="hibernate.cache.provider_class">org.hibernate.cache.HashtableCacheProvider</property> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.db2.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -5,6 +5,9 @@  <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> +  + <mapping resource="org/jbpm/db/hibernate.types.db2.hbm.xml" /> +  <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> +  + <mapping resource="org/jbpm/db/hibernate.types.hbm.xml" /> +  <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> +  + <mapping resource="org/jbpm/db/hibernate.types.hbm.xml" /> +  - <any name="value" id-type="org.jbpm.db.hibernate.TextType" cascade="save-update"> - <column name="STRINGIDCLASS_" /> - <column name="STRINGVALUE_" length="4000"/> - </any> - </subclass> -</hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/StringInstance.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -8,6 +8,6 @@ <subclass name="org.jbpm.context.exe.variableinstance.StringInstance" extends="org.jbpm.context.exe.VariableInstance" discriminator-value="S"> - <property name="value" column="STRINGVALUE_" type="string" length="4000"/> + <property name="value" column="STRINGVALUE_" type="longstring" length="4000"/> </subclass> </hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/log/variableinstance/StringUpdateLog.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -9,8 +9,8 @@ <subclass name="org.jbpm.context.log.variableinstance.StringUpdateLog" extends="org.jbpm.context.log.VariableUpdateLog" discriminator-value="U"> - <property name="oldValue" column="OLDSTRINGVALUE_" type="string" length="4000"/> - <property name="newValue" column="NEWSTRINGVALUE_" type="string" length="4000"/> + <property name="oldValue" column="OLDSTRINGVALUE_" type="longstring" length="4000"/> + <property name="newValue" column="NEWSTRINGVALUE_" type="longstring" length="4000"/> </subclass> </hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.queries.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -475,10 +475,10 @@ <query name="TaskMgmtSession.findTaskForNode"> <![CDATA[ - select distinct task - from org.jbpm.taskmgmt.def.Task task - where task.name = :taskName - and task.taskNode.id = :taskNodeId + select distinct t.id + from org.jbpm.taskmgmt.def.Task t + where t.name = :taskName + and t.taskNode.id = :taskNodeId ]]> </query> Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.db2.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + <typedef name="longstring" class="org.hibernate.type.TextType" /> +</hibernate-mapping> \ No newline at end of file Added: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -0,0 +1,8 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + <typedef name="longstring" class="org.hibernate.type.StringType" /> +</hibernate-mapping> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/db/hibernate.types.sybase.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -4,5 +4,6 @@ "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> <hibernate-mapping> + <typedef name="longstring" class="org.hibernate.type.StringType" /> <typedef name="text" class="org.jbpm.db.hibernate.TextType" /> </hibernate-mapping> \ No newline at end of file Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/action/Script.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -7,7 +7,7 @@ <subclass name="org.jbpm.graph.action.Script" discriminator-value="S" extends="org.jbpm.graph.def.Action"> - <property name="expression" column="EXPRESSION_" type="string" length="4000" /> + <property name="expression" column="EXPRESSION_" type="longstring" length="4000" /> <set name="variableAccesses" cascade="all"> <key column="SCRIPT_" foreign-key="FK_VARACC_SCRIPT"/> <one-to-many class="org.jbpm.context.def.VariableAccess" /> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/ExceptionHandler.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -8,7 +8,7 @@ table="JBPM_EXCEPTIONHANDLER"> <id name="id" column="ID_"><generator class="native" /></id> - <property name="exceptionClassName" column="EXCEPTIONCLASSNAME_" type="string" length="4000" /> + <property name="exceptionClassName" column="EXCEPTIONCLASSNAME_" type="longstring" length="4000" /> <any name="graphElement" id-type="long" meta-type="char"> <meta-value value="A" class="org.jbpm.taskmgmt.def.Task"/> @@ -27,11 +27,11 @@ <column name="TYPE_"/> <column name="GRAPHELEMENT_"/> </any> + <list name="actions" cascade="all"> <key column="EXCEPTIONHANDLER_" foreign-key="FK_ACTION_EXPTHDL" /> <list-index column="EXCEPTIONHANDLERINDEX_" /> <one-to-many class="org.jbpm.graph.def.Action" /> </list> - </class> </hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -25,7 +25,7 @@  <property name="name" column="NAME_"/> - <property name="description" column="DESCRIPTION_" type="string" length="4000"/> + <property name="description" column="DESCRIPTION_" type="longstring" length="4000"/> <many-to-one name="processDefinition" column="PROCESSDEFINITION_" foreign-key="FK_NODE_PROCDEF" Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -13,7 +13,7 @@   <property name="name" column="NAME_" /> - <property name="description" column="DESCRIPTION_" type="string" length="4000"/> + <property name="description" column="DESCRIPTION_" type="longstring" length="4000"/> <map name="events" cascade="all"> <key column="PROCESSDEFINITION_" foreign-key="FK_EVENT_PROCDEF" /> <index column="EVENTTYPE_" type="string"/> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -10,7 +10,7 @@  <property name="name" column="NAME_"/> - <property name="description" column="DESCRIPTION_" type="string" length="4000"/> + <property name="description" column="DESCRIPTION_" type="longstring" length="4000"/> <many-to-one name="processDefinition" column="PROCESSDEFINITION_" foreign-key="FK_TRANS_PROCDEF" Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -11,7 +11,7 @@ <property name="actorId" column="ACTORID_"/> <property name="time" column="TIME_"/> - <property name="message" column="MESSAGE_" type="string" length="4000"/> + <property name="message" column="MESSAGE_" type="longstring" length="4000"/> <many-to-one name="token" column="TOKEN_" foreign-key="FK_COMMENT_TOKEN" Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -10,7 +10,7 @@ extends="org.jbpm.logging.log.CompositeLog" discriminator-value="A"> - <property name="exception" column="EXCEPTION_" type="string" length="4000"/> + <property name="exception" column="EXCEPTION_" type="longstring" length="4000"/> <many-to-one name="action" column="ACTION_" Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.oracle.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.oracle.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/graph/log/ActionLog.oracle.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -10,7 +10,7 @@ extends="org.jbpm.logging.log.CompositeLog" discriminator-value="A"> - <property name="exception" column="EXCEPTION_" type="string" length="4000"/> + <property name="exception" column="EXCEPTION_" type="longstring" length="4000"/> <many-to-one name="action" column="ACTION_" Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/instantiation/Delegation.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -8,8 +8,8 @@ table="JBPM_DELEGATION"> <id name="id" column="ID_"><generator class="native" /></id> - <property name="className" column="CLASSNAME_" type="string" length="4000" /> - <property name="configuration" column="CONFIGURATION_" type="string" length="4000" /> + <property name="className" column="CLASSNAME_" /> + <property name="configuration" column="CONFIGURATION_" type="longstring" length="4000" /> <property name="configType" column="CONFIGTYPE_"/> <many-to-one name="processDefinition" Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/job/Job.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -32,7 +32,7 @@ <property name="isExclusive" column="ISEXCLUSIVE_" /> <property name="lockOwner" column="LOCKOWNER_" /> <property name="lockTime" column="LOCKTIME_" /> - <property name="exception" column="EXCEPTION_" type="string" length="4000" /> + <property name="exception" column="EXCEPTION_" type="longstring" length="4000" /> <property name="retries" column="RETRIES_" /> </class> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/logging/log/MessageLog.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -9,7 +9,7 @@ <subclass name="org.jbpm.logging.log.MessageLog" extends="org.jbpm.logging.log.ProcessLog" discriminator-value="M"> - <property name="message" column="MESSAGE_" type="string" length="4000"/> + <property name="message" column="MESSAGE_" type="longstring" length="4000"/> </subclass> </hibernate-mapping> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/module/def/ModuleDefinition.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/module/def/ModuleDefinition.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/module/def/ModuleDefinition.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -18,10 +18,8 @@    -  -  - - <property name="name" column="NAME_" type="string" length="4000"/> + + <property name="name" column="NAME_"/> <many-to-one name="processDefinition" column="PROCESSDEFINITION_" foreign-key="FK_MODDEF_PROCDEF" Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/def/Task.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -12,7 +12,7 @@  <property name="name" column="NAME_" /> - <property name="description" column="DESCRIPTION_" type="string" length="4000"/> + <property name="description" column="DESCRIPTION_" type="longstring" length="4000"/> <many-to-one name="processDefinition" column="PROCESSDEFINITION_" Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/taskmgmt/exe/TaskInstance.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -14,7 +14,7 @@ <version name="version" column="VERSION_" /> <property name="name" column="NAME_" /> - <property name="description" column="DESCRIPTION_" type="string" length="4000"/> + <property name="description" column="DESCRIPTION_" type="longstring" length="4000"/> <property name="actorId" column="ACTORID_" index="IDX_TASK_ACTORID"/> <property name="create" column="CREATE_" /> <property name="start" column="START_" /> Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/test/java/org/jbpm/jbpm2094/JBPM2094Test.java 2009-06-30 13:02:00 UTC (rev 5163) @@ -33,15 +33,22 @@ */ public class JBPM2094Test extends AbstractDbTestCase { + private ProcessDefinition processDefinition; + private static final int TIMEOUT = 60 * 1000; private static final int INSTANCE_COUNT = 5; protected void setUp() throws Exception { super.setUp(); - getJbpmConfiguration().getJobExecutor().setNbrOfThreads(4); + jbpmConfiguration.getJobExecutor().setNbrOfThreads(4); + + processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2094/processdefinition.xml"); + jbpmContext.deployProcessDefinition(processDefinition); } protected void tearDown() throws Exception { + graphSession.deleteProcessDefinition(processDefinition.getId()); + jbpmConfiguration.getJobExecutor().setNbrOfThreads(1); super.tearDown(); } @@ -50,31 +57,22 @@ // Won't fix [JBPM-2094] unindexed foreign keys cause deadlocks in oracle if (getHibernateDialect().indexOf("HSQL") != -1) return; - ProcessDefinition processDefinition = ProcessDefinition.parseXmlResource("org/jbpm/jbpm2094/processdefinition.xml"); - jbpmContext.deployProcessDefinition(processDefinition); + long[] processInstanceIds = new long[INSTANCE_COUNT]; + for (int i = 0; i < INSTANCE_COUNT; i++) { + newTransaction(); + ProcessInstance processInstance = new ProcessInstance(processDefinition); + processInstance.getContextInstance().setVariable("theBody", "conkersbadfurday".getBytes()); + processInstance.signal(); - newTransaction(); - try { - long[] processInstanceIds = new long[INSTANCE_COUNT]; - for (int i = 0; i < INSTANCE_COUNT; i++) { - ProcessInstance processInstance = new ProcessInstance(processDefinition); - processInstance.getContextInstance().setVariable("theBody", "conkersbadfurday".getBytes()); - processInstance.signal(); - jbpmContext.save(processInstance); - processInstanceIds[i] = processInstance.getId(); + jbpmContext.save(processInstance); + processInstanceIds[i] = processInstance.getId(); + } - newTransaction(); - } + processJobs(TIMEOUT); - processJobs(TIMEOUT); - - for (int i = 0; i < INSTANCE_COUNT; i++) { - ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceIds[i]); - assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded()); - } + for (int i = 0; i < INSTANCE_COUNT; i++) { + ProcessInstance processInstance = jbpmContext.loadProcessInstance(processInstanceIds[i]); + assertTrue("expected " + processInstance + " to have ended", processInstance.hasEnded()); } - finally { - graphSession.deleteProcessDefinition(processDefinition.getId()); - } } }

14 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r5162 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: task and 1 other directory.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-06-30 05:01:06 -0400 (Tue, 30 Jun 2009) New Revision: 5162 Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java Log: JBPM-2309 fine tuned task activityName initialization Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-06-30 03:34:44 UTC (rev 5161) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-06-30 09:01:06 UTC (rev 5162) @@ -715,7 +715,6 @@ task.setExecution(this); task.setProcessInstance(processInstance); task.setSignalling(true); - task.setActivityName(getActivityName()); // initialize the name if (taskDefinition.getName()!=null) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-06-30 03:34:44 UTC (rev 5161) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-06-30 09:01:06 UTC (rev 5162) @@ -372,15 +372,21 @@ return taskDefinition; } + // customized getters and setters ////////////////////////////////////////// + + public String getId() { + return Long.toString(dbid); + } + public void setTaskDefinition(TaskDefinitionImpl taskDefinition) { this.taskDefinition = taskDefinition; this.taskDefinitionName = taskDefinition.getName(); } - // customized getters and setters ////////////////////////////////////////// - - public String getId() { - return Long.toString(dbid); + public void setExecution(ExecutionImpl execution) { + this.execution = execution; + this.executionId = execution.getId(); + this.activityName = execution.getActivityName(); } // getters and setters ////////////////////////////////////////////////////// @@ -489,11 +495,6 @@ this.state = state; } - public void setExecution(ExecutionImpl execution) { - this.execution = execution; - this.executionId = execution.getId(); - } - public String getExecutionId() { return executionId; }

14 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r5161 - in jbpm4/branches/jimma/modules/migration/src: main/java/org/jbpm/jpdl/internal/convert/action and 3 other directories.

by do-not-reply＠jboss.org

Author: jim.ma Date: 2009-06-29 23:34:44 -0400 (Mon, 29 Jun 2009) New Revision: 5161 Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/MailNode.java Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Access.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ActionConverterTypes.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ConverterContext.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReader.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverterTool.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/NodeConverterTypes.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Problem.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ProblemListener.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/VariableAccess.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Action.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/CreateTimerAction.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Script.java jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/Node.java jbpm4/branches/jimma/modules/migration/src/main/resources/node.converter.types.xml jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java Log: Added comments to some class and mail node converter.there is no schema definition for mail node, so still throw unsupport mail node warning for it Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Access.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Access.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Access.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -23,6 +23,10 @@ import java.io.Serializable; +/** + * This originates from jbpm3 code base + * + */ public class Access implements Serializable { private static final long serialVersionUID = 1L; Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ActionConverterTypes.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ActionConverterTypes.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ActionConverterTypes.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -34,6 +34,12 @@ import org.dom4j.io.SAXReader; import org.jbpm.jpdl.internal.convert.action.Action; +/** + * This originates from jbpm3 code base + * It reads the "META-INF/action.converter.types.xml" configuration to load the class to convert + * Action elements + */ + public class ActionConverterTypes { public static Set<Class<? extends Action>> getActionTypes() { Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ConverterContext.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ConverterContext.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ConverterContext.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -23,7 +23,11 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; - +/** + * Wraps the validated command line arguments + * @author<a href="mailto:ema@redhat.com>Jim Ma</a> + * + */ public class ConverterContext { public static final String PROCESS_FILE = "processFile"; public static final String PROCESS_FILE_URL = "processFileURL"; @@ -45,11 +49,7 @@ return paramMap.get(key); } - - public String getUasage() { - return "java org.jbpm.jpdl.internal.convert.JpdlConverterTool jdpl-process.xml"; - } - + public void refresh() { paramMap = null; } Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReader.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReader.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReader.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -44,7 +44,11 @@ import org.jbpm.jpdl.internal.convert.node.StartState; import org.jbpm.jpdl.internal.convert.node.TaskNode; import org.xml.sax.InputSource; - +/** + * This is the trimmed down version JpdlXmlReader. + * It parses the jpdl3 process file and convert it to jpdl4 model + * + */ public class Jpdl3ConverterReader implements ProblemListener { private static final Log logger = LogFactory.getLog(Jpdl3ConverterReader.class); private static String JPDL4NS = "http://jbpm.org/4.0/jpdl"; @@ -262,7 +266,7 @@ Element nodeElement = (Element)nodeElementIter.next(); String nodeName = nodeElement.getName(); // get the node type - + //This will affect the transition, so add error and throw exception if ("super-state".equalsIgnoreCase(nodeName) || "mail-node".equalsIgnoreCase(nodeName)) { this.addError("Unsupported " + nodeName + " conversion : <" + nodeName + " name=\"" + element.attributeValue("name") + "\""); } @@ -496,8 +500,8 @@ } else if ((actorId != null) || (pooledActors != null)) { - //TODO:Ask question - task4.addComment("Please Update the AssignmentHandler and implement org.jbpm.api.task.AssignmentHandler to create your own AssignmentHandler"); + //TODO:Ask question and revisit it + task4.addComment("Please Update the AssignmentHandler and implement org.jbpm.api.task.AssignmentHandler to create your own AssignmentHandler."); Element assignmentHandler = task4.addElement("assignment-handler"); assignmentHandler.addAttribute("class", "org.jbpm.taskmgmt.assignment.ActorAssignmentHandler"); @@ -884,6 +888,6 @@ private Element findNode(String name) { return nodeCollection.get(name); } - + private static final Log log = LogFactory.getLog(Jpdl3ConverterReader.class); } Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverterTool.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverterTool.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/JpdlConverterTool.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -31,6 +31,12 @@ import org.dom4j.io.OutputFormat; import org.dom4j.io.XMLWriter; +/** + * Conversion command line tool + * <p>It parses validates the command line arguments + * @author<a href="mailto:ema@redhat.com>Jim Ma</a> + * + */ public class JpdlConverterTool { public static void main(String[] args) { JpdlConverterTool converter = new JpdlConverterTool(); Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/NodeConverterTypes.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/NodeConverterTypes.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/NodeConverterTypes.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -35,6 +35,11 @@ import org.jbpm.jpdl.internal.convert.node.Node; +/** + * This originates from jbpm3 code base + * It reads the "META-INF/node.converter.types.xml" configuration to load the class to convert + * Node elements + */ public class NodeConverterTypes { public static Set<String> getNodeTypes() { Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Problem.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Problem.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/Problem.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -25,6 +25,10 @@ import java.util.Collection; import java.util.Iterator; +/** + * This class orginates from jpbm3 codebase + * + */ public class Problem implements Serializable { private static final long serialVersionUID = 1L; Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ProblemListener.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ProblemListener.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/ProblemListener.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -23,6 +23,10 @@ import java.io.Serializable; +/** + * This class orginates from jpbm3 codebase + * + */ public interface ProblemListener extends Serializable { void addProblem(Problem problem); Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/VariableAccess.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/VariableAccess.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/VariableAccess.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -24,7 +24,7 @@ import java.io.Serializable; /** - * This is orignally from jbpm3 codebase. + * This originates from jbpm3 codebase. * specifies access to a variable. * Variable access is used in 3 situations: * 1) process-state Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Action.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Action.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Action.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -24,6 +24,11 @@ import org.dom4j.Element; import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader; +/** + * The Action class to create the converted action or script elements and map the specific attributes + * @author<a href="mailto:ema@redhat.com>Jim Ma</a> + * + */ public class Action { protected Element convertedElement = null; Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/CreateTimerAction.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/CreateTimerAction.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/CreateTimerAction.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -25,6 +25,12 @@ import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader; import org.jbpm.jpdl.internal.convert.Problem; +/** + * Create the converted timer element and map the specific attributes + * @author<a href="mailto:ema@redhat.com>Jim Ma</a> + * + */ + public class CreateTimerAction extends Action { @Override public Element createConvertedElement(Element actionElement, Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Script.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Script.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/action/Script.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -23,7 +23,11 @@ import org.dom4j.Element; import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader; - +/** + * Create the converted script element and map the specific attributes + * @author<a href="mailto:ema@redhat.com>Jim Ma</a> + * + */ public class Script extends Action { public Element createConvertedElement(Element actionElement, Element jpdl4Doc) { Added: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/MailNode.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/MailNode.java (rev 0) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/MailNode.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -0,0 +1,94 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.jpdl.internal.convert.node; + +import org.dom4j.Element; +import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader; + +public class MailNode extends Node { + public Element createConvertedElement(Element jpdl4Doc) { + convertedElement = jpdl4Doc.addElement("mail"); + return convertedElement; + } + + public void read(Jpdl3ConverterReader reader) { + String template = nodeElement.attributeValue("template"); + String actors = nodeElement.attributeValue("actors"); + String to = nodeElement.attributeValue("to"); + String subject = reader.getProperty("subject", nodeElement); + String text = reader.getProperty("text", nodeElement); + if (template != null) { + convertedElement.addAttribute("template", template); + } + //TODO: handler actors and look at if there is the equivalent AddressResolver in jbpm4 + if (actors != null) { + + } + if (to != null) { + Element toElement = convertedElement.addElement("to"); + //TODO: handler expression + toElement.addAttribute("to", to); + } + if (subject != null) { + Element subjectElement = convertedElement.addElement("subject"); + subjectElement.addText(subject); + } + if (text != null) { + Element textElement = convertedElement.addElement("text"); + textElement.addText(text); + } + } +} + + +/*<mail name="send rectify note" language="juel" g="99,25,115,45"> +<to addresses="winston@minitrue" /> +<cc users="bb" groups="innerparty" /> +<bcc groups="thinkpol" /> +<subject>rectify ${newspaper}</subject> +<text>${newspaper} ${date} reporting bb dayorder doubleplusungood + refs unpersons rewrite fullwise upsub antefiling</text> + +<transition to="end" /> +</mail>*/ + +/* +<mail name="send rectify note" + template="rectify-template" + g="99,25,115,45"> +<transition to="end"/> +</mail>*/ + + + + + Modified: jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/Node.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/Node.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/java/org/jbpm/jpdl/internal/convert/node/Node.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -24,7 +24,11 @@ import org.dom4j.Element; import org.jbpm.jpdl.internal.convert.Jpdl3ConverterReader; import org.jbpm.jpdl.internal.convert.action.Action; - +/** + * create the converted action element and map the specific attributes + * @author<a href="mailto:ema@redhat.com>Jim Ma</a> + * + */ public class Node { protected Element convertedElement = null; protected Element nodeElement = null; Modified: jbpm4/branches/jimma/modules/migration/src/main/resources/node.converter.types.xml =================================================================== --- jbpm4/branches/jimma/modules/migration/src/main/resources/node.converter.types.xml 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/main/resources/node.converter.types.xml 2009-06-30 03:34:44 UTC (rev 5161) @@ -8,8 +8,9 @@ <node-type element="join" class="org.jbpm.jpdl.internal.convert.node.Join" /> <node-type element="decision" class="org.jbpm.jpdl.internal.convert.node.Decision" /> <node-type element="process-state" class="org.jbpm.jpdl.internal.convert.node.ProcessState" /> + <node-type element="mail-node" class="org.jbpm.jpdl.internal.convert.node.MailNode" /> <!--node-type element="super-state" class="org.jbpm.jpdl.internal.convert.node.SuperState" /> - <node-type element="mail-node" class="org.jbpm.jpdl.internal.convert.node.MailNode" /> + <node-type element="merge" class="org.jbpm.jpdl.internal.convert.node.Merge" /> <node-type element="milestone-node" class="oorg.jbpm.jpdl.internal.convert.node.MilestoneNode" /> <node-type element="interleave-start" class="org.jbpm.jpdl.internal.convert.node.InterleaveStart" /> Modified: jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/Jpdl3ConverterReaderTest.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -34,6 +34,10 @@ import org.junit.Test; import org.xml.sax.InputSource; +/** + * Test the jpdl3Converter + * + */ public class Jpdl3ConverterReaderTest { @Test public void testSimpleProcesss() throws Exception { @@ -131,7 +135,7 @@ Assert.assertTrue(problems.get(1).getMsg().startsWith( "unrecognized event listener")); } - + private void testConvert(String resourcefile) throws Exception { String xml = convert(resourcefile); List<Problem> problems = new JpdlParser().createParse().setString(xml) @@ -146,7 +150,7 @@ InputSource ins = new InputSource(inputStream); Jpdl3ConverterReader converter = new Jpdl3ConverterReader(ins); Document doc = converter.readAndConvert(); - // System.out.println(doc.asXML()); + //System.out.println(doc.asXML()); return doc.asXML(); } Modified: jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java =================================================================== --- jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java 2009-06-29 16:52:04 UTC (rev 5160) +++ jbpm4/branches/jimma/modules/migration/src/test/java/org/jbpm/jpdl/internal/convert/JpdlConverterToolTest.java 2009-06-30 03:34:44 UTC (rev 5161) @@ -32,6 +32,10 @@ import org.junit.Ignore; import org.junit.Test; +/** + * Test the command line parser and validation + * + */ public class JpdlConverterToolTest { JpdlConverterTool tool = new JpdlConverterTool();

14 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r5160 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/model and 3 other directories.

by do-not-reply＠jboss.org

Author: jbarrez Date: 2009-06-29 12:52:04 -0400 (Mon, 29 Jun 2009) New Revision: 5160 Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskPropertiesTest.java Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml Log: JBPM-2309: support for retrieval of current activity of a task (eg to display in an image): added executionId/activityName to Task interface. Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java 2009-06-29 15:24:27 UTC (rev 5159) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/task/Task.java 2009-06-29 16:52:04 UTC (rev 5160) @@ -52,6 +52,10 @@ int getPriority(); void setPriority(int priority); - + + String getExecutionId(); + + String getActivityName(); + String getFormResourceName(); } \ No newline at end of file Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-06-29 15:24:27 UTC (rev 5159) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-06-29 16:52:04 UTC (rev 5160) @@ -715,6 +715,7 @@ task.setExecution(this); task.setProcessInstance(processInstance); task.setSignalling(true); + task.setActivityName(getActivityName()); // initialize the name if (taskDefinition.getName()!=null) { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-06-29 15:24:27 UTC (rev 5159) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-06-29 16:52:04 UTC (rev 5160) @@ -50,7 +50,6 @@ import org.jbpm.pvm.internal.session.DbSession; import org.jbpm.pvm.internal.util.EqualsUtil; import org.jbpm.pvm.internal.util.Priority; -import org.jbpm.pvm.internal.wire.WireContext; /** * is one task instance that can be assigned to an actor (read: put in someone's task list) and that @@ -88,6 +87,13 @@ protected ExecutionImpl execution; protected ExecutionImpl processInstance; + + // local storage of the execution id such that it + // can be lazily loaded when not needed. + protected String executionId; + + protected String activityName; + protected SwimlaneImpl swimlane; protected TaskImpl superTask; @@ -485,8 +491,21 @@ public void setExecution(ExecutionImpl execution) { this.execution = execution; + this.executionId = execution.getId(); } + + public String getExecutionId() { + return executionId; + } + + public String getActivityName() { + return activityName; + } + public void setActivityName(String activityName) { + this.activityName = activityName; + } + public void setSubTasks(Set<TaskImpl> subTasks) { this.subTasks = subTasks; } @@ -514,4 +533,6 @@ public void setFormResourceName(String form) { this.formResourceName = form; } + + } Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml =================================================================== --- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-06-29 15:24:27 UTC (rev 5159) +++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-06-29 16:52:04 UTC (rev 5160) @@ -32,6 +32,9 @@ <property name="progress" column="PROGRESS_"/> <property name="isSignalling" column="SIGNALLING_"/> + <property name="executionId" column="EXECUTION_ID_"/> + <property name="activityName" column="ACTIVITY_NAME_"/> + <property name="hasVariables" column="HASVARS_" /> <map name="variables" cascade="all-delete-orphan"> Added: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskPropertiesTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskPropertiesTest.java (rev 0) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskPropertiesTest.java 2009-06-29 16:52:04 UTC (rev 5160) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +/** + * + */ +package org.jbpm.test.task; + +import org.jbpm.api.ProcessDefinition; +import org.jbpm.api.task.Task; +import org.jbpm.test.JbpmTestCase; + + +/** + * @author Joram Barrez + */ +public class TaskPropertiesTest extends JbpmTestCase { + + private static final String ACTOR = "johnDoe"; + + private static final String ACTOR2 = "johnSmoe"; + + private static final String PROCESS = + "<process name='VacationTrip'>" + + " <start>" + + " <transition to='f' />" + + " </start>" + + " <fork name='f'>" + + " <transition to='select destination' />" + + " <transition to='work hard for the money' />" + + " </fork>" + + " <task name='select destination' assignee='" + ACTOR + "'>" + + " <transition to='wait' />" + + " </task>" + + " <task name='work hard for the money' assignee='" + ACTOR2 + "_not_the_same'>" + + " <transition to='wait' />" + + " </task>" + + " <state name='wait'/>" + + "</process>"; + + public void testGetActivityName() { + Task task = startProcessInstanceAndReturnTaskFor(ACTOR); + assertEquals("select destination", task.getActivityName()); + } + + public void testGetProcessDefinitionThroughTask() { + Task task = startProcessInstanceAndReturnTaskFor(ACTOR); + + String pdId = executionService.findExecutionById(task.getExecutionId()).getProcessDefinitionId(); + ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery() + .processDefinitionId(pdId) + .uniqueResult(); + assertEquals("VacationTrip", processDefinition.getName()); + } + + private Task startProcessInstanceAndReturnTaskFor(String actor) { + deployJpdlXmlString(PROCESS); + executionService.startProcessInstanceByKey("VacationTrip"); + return taskService.findPersonalTasks(actor).get(0); + } + +}

14 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r5159 - in jbpm4/trunk/modules: devguide/src/main/docbook/en/modules and 2 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-06-29 11:24:27 -0400 (Mon, 29 Jun 2009) New Revision: 5159 Added: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch13-JBossIntegration.xml Removed: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-JBossIntegration.xml Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/master.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch08-Scripting.xml Log: JBPM-2350 moving jboss integration (incl business archive deployer) to devguide. also added variables userguide docs. Modified: jbpm4/trunk/modules/devguide/src/main/docbook/en/master.xml =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/master.xml 2009-06-29 15:13:18 UTC (rev 5158) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/master.xml 2009-06-29 15:24:27 UTC (rev 5159) @@ -13,6 +13,7 @@ <!ENTITY ch10-JobExecutor SYSTEM "modules/ch10-JobExecutor.xml"> <!ENTITY ch11-SoftwareLogging SYSTEM "modules/ch11-SoftwareLogging.xml"> <!ENTITY ch12-History SYSTEM "modules/ch12-History.xml"> + <!ENTITY ch13-JBossIntegration SYSTEM "modules/ch13-JBossIntegration.xml"> ]> <book lang="en"> @@ -35,5 +36,6 @@ &ch10-JobExecutor; &ch11-SoftwareLogging; &ch12-History; + &ch13-JBossIntegration; </book> \ No newline at end of file Copied: jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch13-JBossIntegration.xml (from rev 5134, jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-JBossIntegration.xml) =================================================================== --- jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch13-JBossIntegration.xml (rev 0) +++ jbpm4/trunk/modules/devguide/src/main/docbook/en/modules/ch13-JBossIntegration.xml 2009-06-29 15:24:27 UTC (rev 5159) @@ -0,0 +1,140 @@ +<chapter id="identity"> + <title>JBoss Integration</title> + + <para> + jBPM provides integration with JBoss 4.2.x and JBoss 5.0.0.GA. + As part of the <link linkend="runningtheinstaller">installation</link>, the ProcessEngine and a deployer for jBPM archives + will be installed as a JBoss service. + </para> + + <para> + After a successful installation you should see that the ProcessEngine + has been started and bound to JNDI: + </para> + + <programlisting> + [...] + 14:12:09,301 INFO [JBPMService] jBPM 4 - Integration JBoss 4 + 14:12:09,301 INFO [JBPMService] 4.0.0.Beta1 + 14:12:09,301 INFO [JBPMService] ProcessEngine bound to: java:/ProcessEngine + </programlisting> + + <section> + <title>Packaging process archives</title> + <para> + When jBPM is deployed on a JBoss instance, process deployments are treated like + any other deployment artifact (i.e. *.war, *.ear) and processed by the JBPMDeployer. + In order to deploy a process archive simply create a *.jpdl archive (zip file) that contains + the process definition (*.jpdl.xml) and all required resources to execute the process (i.e. classes, property files): + </para> + <programlisting> + Bonanova:Desktop hbraun$ jar -tf OrderProcess.jpdl + + META-INF/MANIFEST.MF + OrderProcess.jpdl.xml + org/mycompany/order/*.class + </programlisting> + </section> + + <section> + <title>Deploying processes archives to a JBoss instance</title> + <para> + In order to deploy a process archive simply copy it to $JBOSS_HOME/server/<config>/deploy: + </para> + + <programlisting> + (1) cp OrderProcess.jpdl $JBOSS_HOME/server/default/deploy + + (2) less $JBOSS_HOME/server/default/log + [...] + 2009-04-08 14:12:21,947 INFO [org.jbpm.integration.jboss4.JBPMDeployer] + Deploy file:/Users/hbraun/dev/prj/jboss/tags/JBoss_4_2_2_GA + /build/output/jboss-4.2.2.GA/server/default/deploy/OrderProcess.jpdl + </programlisting> + + <para> + In order to remove a process simply remove the process archive from the deploy directory. + </para> + </section> + + <section> + <title>Process deployments and versioning</title> + <para> + TBD: A prelimenary explanation cn be found <ulink url="http://relative-order.blogspot.com/2009/03/rfc-process-deployment-use-cas...">here</ulink> + </para> + </section> + + <section> + <title>ProcessEngine and J2EE/JEE programming models</title> + <para> + As described above the ProcessEngine will be installed as JBoss service and bound to JNDI. + This means that any EE component (i.e. servlet, ejb) can access it doing a JNDI lookup: + </para> + + <programlisting> + private ProcessEngine processEngine; + [...] + + try + { + InitialContext ctx = new InitialContext(); + this.processEngine = (ProcessEngine)ctx.lookup("java:/ProcessEngine"); + } + catch (Exception e) + { + throw new RuntimeException("Failed to lookup process engine"); + } + </programlisting> + + <para> + Once you obtained an instance of the ProcessEngine you can invoke on it + as described in <link linkend="services">chapter services</link> + </para> + + <programlisting> + UserTransaction tx = (UserTransaction)ctx.lookup("UserTransaction"); (1) + Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); + + try + { + + ExecutionService execService = (ExecutionService) + this.processEngine.get(ExecutionService.class); + + // begin transaction + tx.begin(); + + // invoke on process engine + executionService.signalExecutionById("ICL.82436"); + + // commit transaction + tx.commit(); + + } + catch (Exception e) + { + if(tx!=null) + { + try + { + tx.rollback(); + } + catch (SystemException e1) {} + } + + throw new RuntimeException("...", e); + + } + finally + { + env.close(); + } + </programlisting> + + <para> + (1) Wrapping the call in a UserTransaction is not necessary if the invocation comes a + CMT component, i.e. an EJB. + </para> + </section> + +</chapter> Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-06-29 15:13:18 UTC (rev 5158) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/master.xml 2009-06-29 15:24:27 UTC (rev 5159) @@ -10,7 +10,6 @@ <!ENTITY ch07-Variables SYSTEM "modules/ch07-Variables.xml"> <!ENTITY ch08-Scripting SYSTEM "modules/ch08-Scripting.xml"> <!ENTITY ch09-Identity SYSTEM "modules/ch09-Identity.xml"> - <!ENTITY ch10-JBossIntegration SYSTEM "modules/ch10-JBossIntegration.xml"> <!ENTITY ch11-Emails SYSTEM "modules/ch11-Emails.xml"> ]> @@ -31,7 +30,6 @@ &ch07-Variables; &ch08-Scripting; &ch09-Identity; - &ch10-JBossIntegration; &ch11-Emails; </book> \ No newline at end of file Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-06-29 15:13:18 UTC (rev 5158) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch02-Installation.xml 2009-06-29 15:24:27 UTC (rev 5159) @@ -137,6 +137,9 @@ installing jBPM into JBoss 5. Navigate to that directory and run <literal>ant -p</literal> for more details. </para> + <para>In JBoss, the <literal>ProcessEngine</literal> can be obtained from JNDI + with <literal>new InitialContext().lookup("java:/ProcessEngine")</literal> + </para> </section> <section id="database"> Modified: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch08-Scripting.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch08-Scripting.xml 2009-06-29 15:13:18 UTC (rev 5158) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch08-Scripting.xml 2009-06-29 15:24:27 UTC (rev 5159) @@ -1,18 +1,15 @@ <chapter id="scripting"> <title>Scripting</title> - <para>Scripting in jBPM is based on JSR 223: Scripting for the JavaTM Platform. - Scripting engines can be configured like this: + <para>Only jUEL is configured as the scripting language. jUEL is + an implementation of the Unified Expression Language. For detailed description + of how to use UEL, please refer to + <ulink url="http://java.sun.com/javaee/5/docs/tutorial/doc/bnahq.html"> + the JEE 5 Tutorial, section Unified Expression Language</ulink> </para> - <programlisting><script-manager default-expression-language="juel" - default-script-language="juel" - read-contexts="execution, environment, process-engine" - write-context=""> - <script-language name="juel" factory="com.sun.script.juel.JuelScriptEngineFactory" /> -</script-manager></programlisting> - <para>A jPDL process definition can contain scripts and expressions. All - of the configured scripting engines can be used in each situation. But - scripts and expressions each have their own default. + + <para>To configure other scripting languages then jUEL, please + refer to the developer's guide (non supported). </para> </chapter> Deleted: jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-JBossIntegration.xml =================================================================== --- jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-JBossIntegration.xml 2009-06-29 15:13:18 UTC (rev 5158) +++ jbpm4/trunk/modules/userguide/src/main/docbook/en/modules/ch10-JBossIntegration.xml 2009-06-29 15:24:27 UTC (rev 5159) @@ -1,140 +0,0 @@ -<chapter id="identity"> - <title>JBoss Integration</title> - - <para> - jBPM provides integration with JBoss 4.2.x and JBoss 5.0.0.GA. - As part of the <link linkend="runningtheinstaller">installation</link>, the ProcessEngine and a deployer for jBPM archives - will be installed as a JBoss service. - </para> - - <para> - After a successful installation you should see that the ProcessEngine - has been started and bound to JNDI: - </para> - - <programlisting> - [...] - 14:12:09,301 INFO [JBPMService] jBPM 4 - Integration JBoss 4 - 14:12:09,301 INFO [JBPMService] 4.0.0.Beta1 - 14:12:09,301 INFO [JBPMService] ProcessEngine bound to: java:/ProcessEngine - </programlisting> - - <section> - <title>Packaging process archives</title> - <para> - When jBPM is deployed on a JBoss instance, process deployments are treated like - any other deployment artifact (i.e. *.war, *.ear) and processed by the JBPMDeployer. - In order to deploy a process archive simply create a *.jpdl archive (zip file) that contains - the process definition (*.jpdl.xml) and all required resources to execute the process (i.e. classes, property files): - </para> - <programlisting> - Bonanova:Desktop hbraun$ jar -tf OrderProcess.jpdl - - META-INF/MANIFEST.MF - OrderProcess.jpdl.xml - org/mycompany/order/*.class - </programlisting> - </section> - - <section> - <title>Deploying processes archives to a JBoss instance</title> - <para> - In order to deploy a process archive simply copy it to $JBOSS_HOME/server/<config>/deploy: - </para> - - <programlisting> - (1) cp OrderProcess.jpdl $JBOSS_HOME/server/default/deploy - - (2) less $JBOSS_HOME/server/default/log - [...] - 2009-04-08 14:12:21,947 INFO [org.jbpm.integration.jboss4.JBPMDeployer] - Deploy file:/Users/hbraun/dev/prj/jboss/tags/JBoss_4_2_2_GA - /build/output/jboss-4.2.2.GA/server/default/deploy/OrderProcess.jpdl - </programlisting> - - <para> - In order to remove a process simply remove the process archive from the deploy directory. - </para> - </section> - - <section> - <title>Process deployments and versioning</title> - <para> - TBD: A prelimenary explanation cn be found <ulink url="http://relative-order.blogspot.com/2009/03/rfc-process-deployment-use-cas...">here</ulink> - </para> - </section> - - <section> - <title>ProcessEngine and J2EE/JEE programming models</title> - <para> - As described above the ProcessEngine will be installed as JBoss service and bound to JNDI. - This means that any EE component (i.e. servlet, ejb) can access it doing a JNDI lookup: - </para> - - <programlisting> - private ProcessEngine processEngine; - [...] - - try - { - InitialContext ctx = new InitialContext(); - this.processEngine = (ProcessEngine)ctx.lookup("java:/ProcessEngine"); - } - catch (Exception e) - { - throw new RuntimeException("Failed to lookup process engine"); - } - </programlisting> - - <para> - Once you obtained an instance of the ProcessEngine you can invoke on it - as described in <link linkend="services">chapter services</link> - </para> - - <programlisting> - UserTransaction tx = (UserTransaction)ctx.lookup("UserTransaction"); (1) - Environment env = ((EnvironmentFactory)processEngine).openEnvironment(); - - try - { - - ExecutionService execService = (ExecutionService) - this.processEngine.get(ExecutionService.class); - - // begin transaction - tx.begin(); - - // invoke on process engine - executionService.signalExecutionById("ICL.82436"); - - // commit transaction - tx.commit(); - - } - catch (Exception e) - { - if(tx!=null) - { - try - { - tx.rollback(); - } - catch (SystemException e1) {} - } - - throw new RuntimeException("...", e); - - } - finally - { - env.close(); - } - </programlisting> - - <para> - (1) Wrapping the call in a UserTransaction is not necessary if the invocation comes a - CMT component, i.e. an EJB. - </para> - </section> - -</chapter>

14 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r5158 - in projects/gwt-console/trunk: server/server-core/src/main/java/org/jboss/bpm/console/server and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-06-29 11:13:18 -0400 (Mon, 29 Jun 2009) New Revision: 5158 Added: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormAuthorityRef.java projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java Removed: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/TaskDispatcherPlugin.java Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/InfoFacade.java projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java Log: Rename TaskDispatcher to FormDispatcher Modified: projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java =================================================================== --- projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-06-29 14:55:15 UTC (rev 5157) +++ projects/gwt-console/trunk/gui/war/src/main/java/org/jboss/bpm/console/client/task/AssignedTasksView.java 2009-06-29 15:13:18 UTC (rev 5158) @@ -215,7 +215,7 @@ // plugin availability this.hasDispatcherPlugin = - ServerPlugins.has("org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin"); + ServerPlugins.has("org.jboss.bpm.console.server.plugin.FormDispatcherPlugin"); viewBtn.setEnabled(hasDispatcherPlugin); isInitialized = true; Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2009-06-29 14:55:15 UTC (rev 5157) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2009-06-29 15:13:18 UTC (rev 5158) @@ -45,7 +45,7 @@ singletons.add(new UserMgmtFacade()); singletons.add(new TestFacade()); singletons.add(new EngineFacade()); - + singletons.add(new FormProcessingFacade()); singletons.add( new ReportFacade() ); } Added: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java (rev 0) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/FormProcessingFacade.java 2009-06-29 15:13:18 UTC (rev 5158) @@ -0,0 +1,168 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.server; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.bpm.console.server.plugin.FormAuthorityRef; +import org.jboss.bpm.console.server.plugin.FormDispatcherPlugin; +import org.jboss.bpm.console.server.plugin.PluginMgr; +import org.jboss.resteasy.plugins.providers.multipart.InputPart; +import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; + +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.*; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.Response; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@Path("form") +public class FormProcessingFacade +{ + private static final Log log = LogFactory.getLog(FormProcessingFacade.class); + + private FormDispatcherPlugin formPlugin; + + /** + * Lazy load the {@link org.jboss.bpm.console.server.integration.TaskManagement} + */ + private FormDispatcherPlugin getFormDispatcherPlugin() + { + if(null==this.formPlugin) + { + this.formPlugin = PluginMgr.load(FormDispatcherPlugin.class); + log.debug("Using FormDispatcherPlugin impl:" + this.formPlugin); + } + + return this.formPlugin; + } + + + @GET + @Path("task/{taskId}/render") + @Produces("text/html") + public Response renderTaskUI( + @PathParam("taskId") + String taskId + ) + { + DataHandler dh = getFormDispatcherPlugin().provideForm( + new FormAuthorityRef(taskId) + ); + + if(null==dh) + { + throw new RuntimeException("No UI associated with task ID " + taskId); + } + + return Response.ok(dh.getDataSource()).type("text/html").build(); + } + + @POST + @Path("task/{taskId}/complete") + @Produces("text/html") + @Consumes("multipart/form-data") + public Response closeTaskWithUI( + @Context + HttpServletRequest request, + @PathParam("taskId") + String taskId, + MultipartFormDataInput payload + ) + { + Map<String,Object> processVars = new HashMap<String,Object>(); + + Map<String, InputPart> formData = payload.getFormData(); + Iterator<String> partNames = formData.keySet().iterator(); + + String outcome = null; + + while(partNames.hasNext()) + { + final String partName = partNames.next(); + final InputPart part = formData.get(partName); + final MediaType mediaType = part.getMediaType(); + + if(partName.equals("outcome")) + { + outcome = part.getBodyAsString(); + } + else if(MediaType.TEXT_PLAIN_TYPE.equals(mediaType)) + { + // RFC2045: Each part has an optional "Content-Type" header + // that defaults to "text/plain". + // Can go into process without conversion + processVars.put(partName, part.getBodyAsString()); + } + else + { + // anything else turns into a DataHandler + final byte[] data = part.getBodyAsString().getBytes(); + DataHandler dh = new DataHandler( + new DataSource() + { + public InputStream getInputStream() throws IOException + { + return new ByteArrayInputStream(data); + } + + public OutputStream getOutputStream() throws IOException + { + throw new RuntimeException("This is a readonly DataHandler"); + } + + public String getContentType() + { + return mediaType.getType(); + } + + public String getName() + { + return partName; + } + } + ); + + processVars.put(partName, dh); + } + } + + // complete task + getFormDispatcherPlugin().processCompletion( + new FormAuthorityRef(taskId), processVars, request.getRemoteUser(), outcome + ); + + return Response.ok("Successfully processed task UI").build(); + } +} Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/InfoFacade.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/InfoFacade.java 2009-06-29 14:55:15 UTC (rev 5157) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/InfoFacade.java 2009-06-29 15:13:18 UTC (rev 5158) @@ -21,7 +21,7 @@ */ package org.jboss.bpm.console.server; -import org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin; +import org.jboss.bpm.console.server.plugin.FormDispatcherPlugin; import org.jboss.bpm.console.server.plugin.PluginMgr; import org.jboss.bpm.console.server.plugin.GraphViewerPlugin; import org.jboss.bpm.console.server.plugin.ProcessEnginePlugin; @@ -44,7 +44,7 @@ { private Class[] pluginInterfaces = { - TaskDispatcherPlugin.class, + FormDispatcherPlugin.class, GraphViewerPlugin.class, ProcessEnginePlugin.class }; Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java 2009-06-29 14:55:15 UTC (rev 5157) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskListFacade.java 2009-06-29 15:13:18 UTC (rev 5158) @@ -24,19 +24,22 @@ import com.google.gson.Gson; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.client.model.TaskRefWrapper; -import org.jboss.bpm.console.client.model.TaskRef; import org.jboss.bpm.console.server.gson.GsonFactory; import org.jboss.bpm.console.server.integration.ManagementFactory; import org.jboss.bpm.console.server.integration.TaskManagement; -import org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin; import org.jboss.bpm.console.server.plugin.PluginMgr; +import org.jboss.bpm.console.server.plugin.FormAuthorityRef; +import org.jboss.bpm.console.server.plugin.FormDispatcherPlugin; -import javax.ws.rs.*; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; import javax.ws.rs.core.Response; +import java.net.URL; import java.util.List; -import java.util.ArrayList; -import java.net.URL; /** * REST server module for accessing task related data. @@ -49,7 +52,7 @@ private static final Log log = LogFactory.getLog(TaskMgmtFacade.class); private TaskManagement taskManagement; - private TaskDispatcherPlugin formPlugin; + private FormDispatcherPlugin formPlugin; /** * Lazy load the {@link org.jboss.bpm.console.server.integration.TaskManagement} @@ -67,14 +70,14 @@ } /** - * Lazy load the {@link org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin}. + * Lazy load the {@link org.jboss.bpm.console.server.plugin.FormDispatcherPlugin}. * Can be null if the plugin is not available. */ - private TaskDispatcherPlugin getTaskDispatcherPlugin() + private FormDispatcherPlugin getTaskDispatcherPlugin() { if(null==this.formPlugin) { - this.formPlugin = PluginMgr.load(TaskDispatcherPlugin.class); + this.formPlugin = PluginMgr.load(FormDispatcherPlugin.class); } return this.formPlugin; @@ -107,12 +110,14 @@ private Response processTaskListResponse(List<TaskRef> taskList) { // decorate task form URL if plugin available - TaskDispatcherPlugin formPlugin = getTaskDispatcherPlugin(); + FormDispatcherPlugin formPlugin = getTaskDispatcherPlugin(); if(formPlugin!=null) { for(TaskRef task : taskList) { - URL taskFormURL = formPlugin.getDispatchUrl(task.getId()); + URL taskFormURL = formPlugin.getDispatchUrl( + new FormAuthorityRef(String.valueOf(task.getId())) + ); if(taskFormURL!=null) { task.setUrl(taskFormURL.toExternalForm()); Modified: projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java 2009-06-29 14:55:15 UTC (rev 5157) +++ projects/gwt-console/trunk/server/server-core/src/main/java/org/jboss/bpm/console/server/TaskMgmtFacade.java 2009-06-29 15:13:18 UTC (rev 5158) @@ -26,7 +26,8 @@ import org.jboss.bpm.console.server.integration.ManagementFactory; import org.jboss.bpm.console.server.integration.TaskManagement; import org.jboss.bpm.console.server.plugin.PluginMgr; -import org.jboss.bpm.console.server.plugin.TaskDispatcherPlugin; +import org.jboss.bpm.console.server.plugin.FormAuthorityRef; +import org.jboss.bpm.console.server.plugin.FormDispatcherPlugin; import org.jboss.resteasy.plugins.providers.multipart.InputPart; import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput; @@ -37,13 +38,13 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.io.InputStream; -import java.io.IOException; -import java.io.OutputStream; -import java.io.ByteArrayInputStream; /** * REST server module for accessing task related data. @@ -57,7 +58,7 @@ private TaskManagement taskManagement; - private TaskDispatcherPlugin formPlugin; + private FormDispatcherPlugin formPlugin; /** * Lazy load the {@link org.jboss.bpm.console.server.integration.TaskManagement} @@ -77,12 +78,12 @@ /** * Lazy load the {@link org.jboss.bpm.console.server.integration.TaskManagement} */ - private TaskDispatcherPlugin getTaskDispatcherPlugin() + private FormDispatcherPlugin getFormDispatcherPlugin() { if(null==this.formPlugin) { - this.formPlugin = PluginMgr.load(TaskDispatcherPlugin.class); - log.debug("Using TaskDispatcherPlugin impl:" + this.formPlugin); + this.formPlugin = PluginMgr.load(FormDispatcherPlugin.class); + log.debug("Using FormDispatcherPlugin impl:" + this.formPlugin); } return this.formPlugin; @@ -152,15 +153,19 @@ return Response.ok().build(); } + /* @GET @Path("{taskId}/render") @Produces("text/html") public Response renderUI( @PathParam("taskId") - long taskId + String taskId ) { - DataHandler dh = getTaskDispatcherPlugin().provideTaskUI(taskId); + DataHandler dh = getFormDispatcherPlugin().provideForm( + new FormAuthorityRef(taskId) + ); + if(null==dh) { throw new RuntimeException("No UI associated with task ID " + taskId); @@ -177,7 +182,7 @@ @Context HttpServletRequest request, @PathParam("taskId") - long taskId, + String taskId, MultipartFormDataInput payload ) { @@ -238,15 +243,11 @@ } } - // trigger execution - TaskManagement tm = getTaskManagement(); - - if(null==outcome) - tm.completeTask(taskId, processVars, request.getRemoteUser()); - else - tm.completeTask(taskId, outcome, processVars, request.getRemoteUser()); + // complete task + getFormDispatcherPlugin().processCompletion( + new FormAuthorityRef(taskId), processVars, request.getRemoteUser(), outcome + ); - return Response.ok("Successfully processed task UI").build(); - } + } */ } Added: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormAuthorityRef.java =================================================================== --- projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormAuthorityRef.java (rev 0) +++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormAuthorityRef.java 2009-06-29 15:13:18 UTC (rev 5158) @@ -0,0 +1,59 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.server.plugin; + +/** + * Identifies the source entity associated with a form. + * I.e. process or task. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class FormAuthorityRef +{ + public enum Type {TASK, PROCESS} + + private Type currentType = null; + + private String referenceId; + + public FormAuthorityRef(String referenceId) + { + this.referenceId = referenceId; + this.currentType = Type.TASK; + } + + public FormAuthorityRef(Type currentType, String referenceId) + { + this.currentType = currentType; + this.referenceId = referenceId; + } + + public Type getType() + { + return this.currentType; + } + + public String getReferenceId() + { + return referenceId; + } +} Copied: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java (from rev 5148, projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/TaskDispatcherPlugin.java) =================================================================== --- projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java (rev 0) +++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/FormDispatcherPlugin.java 2009-06-29 15:13:18 UTC (rev 5158) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.server.plugin; + +import javax.activation.DataHandler; +import java.net.URL; +import java.util.Map; + +/** + * Render task UI's and process task completion. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public interface FormDispatcherPlugin +{ + URL getDispatchUrl(FormAuthorityRef ref); + + DataHandler provideForm(FormAuthorityRef ref); + + void processCompletion( + FormAuthorityRef ref, Map<String, Object> payload, + String performingUser, String outcome); +} Deleted: projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/TaskDispatcherPlugin.java =================================================================== --- projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/TaskDispatcherPlugin.java 2009-06-29 14:55:15 UTC (rev 5157) +++ projects/gwt-console/trunk/server/server-integration/src/main/java/org/jboss/bpm/console/server/plugin/TaskDispatcherPlugin.java 2009-06-29 15:13:18 UTC (rev 5158) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.server.plugin; - -import javax.activation.DataHandler; -import java.io.InputStream; -import java.net.URL; - -/** - * Render task UI's and process task completion. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public interface TaskDispatcherPlugin -{ - URL getDispatchUrl(long taskId); - - DataHandler provideTaskUI(long taskId); - - void processCompletion(long taskId, String outcome, InputStream payload); -}

14 years, 10 months

1
0
0 / 0

JBoss JBPM SVN: r5157 - jbpm4/trunk/modules/distro/src/main/files/examples.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2009-06-29 10:55:15 -0400 (Mon, 29 Jun 2009) New Revision: 5157 Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml Log: JBPM-2367 also added forms to deployment of examples business archive Modified: jbpm4/trunk/modules/distro/src/main/files/examples/build.xml =================================================================== --- jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-06-29 14:51:06 UTC (rev 5156) +++ jbpm4/trunk/modules/distro/src/main/files/examples/build.xml 2009-06-29 14:55:15 UTC (rev 5157) @@ -53,7 +53,11 @@ </copy> <jar destfile="${jbpm.home}/examples/target/examples.bar"> <fileset dir="${jbpm.home}/examples/src"> - <include name="**/*.jpdl.xml" /> + <exclude name="jbpm.cfg.xml" /> + <exclude name="jbpm.hibernate.cfg.xml" /> + <exclude name="jbpm.mail.properties" /> + <exclude name="jbpm.mail.templates.examples.xml" /> + <exclude name="logging.properties" /> <exclude name="org/jbpm/examples/task/swimlane/process.jpdl.xml" /> <exclude name="org/jbpm/examples/task/candidates/process.jpdl.xml" /> <exclude name="org/jbpm/examples/concurrency/graphbased/process.jpdl.xml" />

14 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits June 2009