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

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 @@ <!-- Automatic schema creation (begin) --> <property name="hibernate.hbm2ddl.auto">create</property> + <property name="connection.pool_size">5</property> <!-- Automatic schema creation (end) --> - + <!-- Simple memory-only cache --> <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 @@ <!-- hql queries --> <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> + <!-- DB2 type mappings --> + <mapping resource="org/jbpm/db/hibernate.types.db2.hbm.xml" /> + <!-- hql queries used in simulation for querying historical data. uncomment if you want to use the GetSimulationInputCommand or you want to use the queries directly. @@ -88,7 +91,7 @@ <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/HibernateStringInstance.db2.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"/> Modified: 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.default.xml 2009-06-30 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.default.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -5,6 +5,9 @@ <!-- hql queries --> <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> + <!-- type mappings --> + <mapping resource="org/jbpm/db/hibernate.types.hbm.xml" /> + <!-- hql queries used in simulation for querying historical data. uncomment if you want to use the GetSimulationInputCommand or you want to use the queries directly. Modified: 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 09:01:06 UTC (rev 5162) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/hibernate.mapping.oracle.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -5,6 +5,9 @@ <!-- hql queries --> <mapping resource="org/jbpm/db/hibernate.queries.hbm.xml" /> + <!-- type mappings --> + <mapping resource="org/jbpm/db/hibernate.types.hbm.xml" /> + <!-- hql queries used in simulation for querying historical data. uncomment if you want to use the GetSimulationInputCommand or you want to use the queries directly. 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/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml (rev 0) +++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.db2.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -0,0 +1,16 @@ +<?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.exe.variableinstance.HibernateStringInstance" + extends="org.jbpm.context.exe.VariableInstance" + discriminator-value="I"> + <any name="value" id-type="text" cascade="save-update"> + <column name="STRINGIDCLASS_" /> + <column name="STRINGVALUE_" length="4000"/> + </any> + </subclass> +</hibernate-mapping> Deleted: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml =================================================================== --- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/resources/org/jbpm/context/exe/variableinstance/HibernateStringInstance.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/context/exe/variableinstance/HibernateStringInstance.sybase.hbm.xml 2009-06-30 13:02:00 UTC (rev 5163) @@ -1,17 +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.exe.variableinstance.HibernateStringInstance" - extends="org.jbpm.context.exe.VariableInstance" - discriminator-value="I"> - <!-- id-type seems to be unaware of type definitions --> - <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 @@ <!-- GRAPHELEMENT --> <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 @@ <!-- GRAPHELEMENT --> <!-- base class fields are mapped here --> <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 @@ <!-- GRAPHELEMENT --> <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 @@ <!-- L : org.jbpm.logging.def.LoggingDefinition --> <!-- I : org.jbpm.scheduler.def.SchedulerDefinition --> <!-- T : org.jbpm.taskmgmt.def.TaskMgmtDefinition --> - <!-- : --> - <!-- : --> - - <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 @@ <!-- GRAPHELEMENT --> <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()); - } } }