7:31 p.m.
Author: alex.guizar(a)jboss.com
Date: 2010-12-13 20:31:35 -0500 (Mon, 13 Dec 2010)
New Revision: 6864
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/module/def/ModuleDefinition.java
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/exe/RuntimeAction.hbm.xml
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/node/TaskNode.hbm.xml
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/module/exe/ModuleInstance.hbm.xml
Log:
JBPM-2031 review bidirectional associations; define one end as inverse or disable inserts
and updates, where needed
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java 2010-12-14
01:31:35 UTC (rev 6864)
@@ -510,7 +510,7 @@
}
if (definitions == null) definitions = new HashMap();
- definitions.put(moduleDefinition.getClass().getName(), moduleDefinition);
+ definitions.put(moduleDefinition.getName(), moduleDefinition);
moduleDefinition.setProcessDefinition(this);
return moduleDefinition;
}
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/module/def/ModuleDefinition.java
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/module/def/ModuleDefinition.java 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/java/org/jbpm/module/def/ModuleDefinition.java 2010-12-14
01:31:35 UTC (rev 6864)
@@ -29,7 +29,7 @@
public abstract class ModuleDefinition implements Serializable {
long id;
- protected String name; // name equals fully qualified class name
+ protected String name = getClass().getName();
protected ProcessDefinition processDefinition;
private static final long serialVersionUID = 1L;
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Action.hbm.xml 2010-12-14
01:31:35 UTC (rev 6864)
@@ -30,14 +30,15 @@
cascade="all"
foreign-key="FK_ACTION_ACTNDEL"
index="IDX_ACTION_ACTNDL" />
+ <!-- bidirectional, other side is indexed; make this side inverse -->
<many-to-one name="event"
column="EVENT_"
foreign-key="FK_ACTION_EVENT"
- index="IDX_ACTION_EVENT" />
+ index="IDX_ACTION_EVENT"
+ insert="false" update="false" />
<many-to-one name="processDefinition"
column="PROCESSDEFINITION_"
foreign-key="FK_ACTION_PROCDEF"
index="IDX_ACTION_PROCDF" />
-
</class>
</hibernate-mapping>
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Node.hbm.xml 2010-12-14
01:31:35 UTC (rev 6864)
@@ -9,7 +9,7 @@
discriminator-value="N">
<id name="id" column="ID_"><generator
class="native" /></id>
<discriminator type="char" column="CLASS_"/>
- <!-- KEEP THIS IN SYNC WITH Event.hbm.xml, ExceptionHandler.hbm.xml and
RuntimeAction.bhm.xml !!! -->
+ <!-- KEEP THIS IN SYNC WITH Event.hbm.xml, ExceptionHandler.hbm.xml and
RuntimeAction.hbm.xml !!! -->
<!-- NOTE that the characters may not overlap with other GraphElement identifiers
-->
<!-- C : org.jbpm.graph.node.ProcessState -->
<!-- D : org.jbpm.graph.node.Decision -->
@@ -41,7 +41,7 @@
<one-to-many class="org.jbpm.graph.def.ExceptionHandler" />
</list>
<!-- ============ -->
-
+
<property name="isAsync" column="ISASYNC_"/>
<property name="isAsyncExclusive" column="ISASYNCEXCL_"/>
@@ -50,20 +50,21 @@
cascade="all"
foreign-key="FK_NODE_ACTION"
index="IDX_NODE_ACTION" />
+ <!-- bidirectional, other side is indexed; make this side inverse -->
<many-to-one name="superState"
column="SUPERSTATE_"
foreign-key="FK_NODE_SUPERSTATE"
- index="IDX_NODE_SUPRSTATE"/>
-
+ index="IDX_NODE_SUPRSTATE"
+ insert="false" update="false"/>
+
<list name="leavingTransitions" cascade="all">
<key column="FROM_" />
<list-index column="FROMINDEX_" />
<one-to-many class="org.jbpm.graph.def.Transition" />
</list>
- <set name="arrivingTransitions">
+ <set name="arrivingTransitions" inverse="true">
<key column="TO_" />
<one-to-many class="org.jbpm.graph.def.Transition" />
</set>
-
</class>
</hibernate-mapping>
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/ProcessDefinition.hbm.xml 2010-12-14
01:31:35 UTC (rev 6864)
@@ -52,11 +52,10 @@
<map-key column="NAME_" type="string"/>
<one-to-many class="org.jbpm.graph.def.Action" />
</map>
- <map name="definitions" cascade="all">
+ <map name="definitions" cascade="all"
inverse="true">
<key column="PROCESSDEFINITION_" />
<map-key column="NAME_" type="string"/>
<one-to-many class="org.jbpm.module.def.ModuleDefinition" />
</map>
-
</class>
</hibernate-mapping>
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/def/Transition.hbm.xml 2010-12-14
01:31:35 UTC (rev 6864)
@@ -26,16 +26,17 @@
<one-to-many class="org.jbpm.graph.def.ExceptionHandler" />
</list>
<!-- ============ -->
-
+
+ <!-- bidirectional, other side is indexed; make this side inverse -->
<many-to-one name="from"
column="FROM_"
foreign-key="FK_TRANSITION_FROM"
- index="IDX_TRANSIT_FROM"/>
+ index="IDX_TRANSIT_FROM"
+ insert="false" update="false"/>
<many-to-one name="to"
column="TO_"
foreign-key="FK_TRANSITION_TO"
index="IDX_TRANSIT_TO"/>
<property name="condition" column="CONDITION_"/>
-
</class>
</hibernate-mapping>
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/exe/Comment.hbm.xml 2010-12-14
01:31:35 UTC (rev 6864)
@@ -12,14 +12,17 @@
<property name="actorId" column="ACTORID_"/>
<property name="time" column="TIME_"/>
<property name="message" column="MESSAGE_"
type="longstring" length="4000"/>
+ <!-- bidirectional, other side is indexed; make this side inverse -->
<many-to-one name="token"
column="TOKEN_"
foreign-key="FK_COMMENT_TOKEN"
- index="IDX_COMMENT_TOKEN"/>
+ index="IDX_COMMENT_TOKEN"
+ insert="false" update="false"/>
+ <!-- bidirectional, other side is indexed; make this side inverse -->
<many-to-one name="taskInstance"
column="TASKINSTANCE_"
foreign-key="FK_COMMENT_TSK"
- index="IDX_COMMENT_TSK"/>
-
+ index="IDX_COMMENT_TSK"
+ insert="false" update="false"/>
</class>
</hibernate-mapping>
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/exe/RuntimeAction.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/exe/RuntimeAction.hbm.xml 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/exe/RuntimeAction.hbm.xml 2010-12-14
01:31:35 UTC (rev 6864)
@@ -10,7 +10,7 @@
<version name="version" column="VERSION_" />
<property name="eventType" column="EVENTTYPE_"/>
-
+
<any name="graphElement" id-type="long"
meta-type="char">
<meta-value value="A"
class="org.jbpm.taskmgmt.def.Task"/>
<meta-value value="C"
class="org.jbpm.graph.node.ProcessState" />
@@ -29,14 +29,15 @@
<column name="GRAPHELEMENT_"/>
</any>
+ <!-- bidirectional, other side is indexed; make this side inverse -->
<many-to-one name="processInstance"
column="PROCESSINSTANCE_"
foreign-key="FK_RTACTN_PROCINST"
- index="IDX_RTACTN_PRCINST"/>
+ index="IDX_RTACTN_PRCINST"
+ insert="false" update="false"/>
<many-to-one name="action"
column="ACTION_"
foreign-key="FK_RTACTN_ACTION"
index="IDX_RTACTN_ACTION" />
-
</class>
</hibernate-mapping>
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/node/TaskNode.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/node/TaskNode.hbm.xml 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/graph/node/TaskNode.hbm.xml 2010-12-14
01:31:35 UTC (rev 6864)
@@ -10,7 +10,7 @@
<property name="signal" column="SIGNAL_" />
<property name="createTasks" column="CREATETASKS_" />
<property name="endTasks" column="ENDTASKS_" />
- <set name="tasks" cascade="all">
+ <set name="tasks" cascade="all" inverse="true">
<key column="TASKNODE_" foreign-key="FK_TASK_TASKNODE"
/>
<one-to-many class="org.jbpm.taskmgmt.def.Task" />
</set>
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/logging/log/ProcessLog.hbm.xml 2010-12-14
01:31:35 UTC (rev 6864)
@@ -1,12 +1,10 @@
<?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"
+ <class name="org.jbpm.logging.log.ProcessLog"
table="JBPM_LOG"
discriminator-value="P"
lazy="false">
@@ -41,19 +39,19 @@
<!-- 4 : org.jbpm.taskmgmt.log.SwimlaneLog -->
<!-- 5 : org.jbpm.taskmgmt.log.SwimlaneCreateLog -->
<!-- 6 : org.jbpm.taskmgmt.log.SwimlaneAssignLog -->
-
<discriminator type="char" column="CLASS_"/>
-
+
<property name="index" column="INDEX_" />
<property name="date" column="DATE_" />
- <many-to-one name="token"
- column="TOKEN_"
+ <many-to-one name="token"
+ column="TOKEN_"
foreign-key="FK_LOG_TOKEN"
index="IDX_LOG_TOKEN" />
- <many-to-one name="parent"
- column="PARENT_"
+ <!-- bidirectional, other side is indexed; make this side inverse -->
+ <many-to-one name="parent"
+ column="PARENT_"
foreign-key="FK_LOG_PARENT"
- index="IDX_LOG_PARENT" />
+ index="IDX_LOG_PARENT"
+ insert="false" update="false" />
</class>
-
</hibernate-mapping>
Modified:
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/module/exe/ModuleInstance.hbm.xml
===================================================================
---
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/module/exe/ModuleInstance.hbm.xml 2010-12-10
20:07:24 UTC (rev 6863)
+++
jbpm3/branches/jbpm-3.2-soa/core/src/main/resources/org/jbpm/module/exe/ModuleInstance.hbm.xml 2010-12-14
01:31:35 UTC (rev 6864)
@@ -1,11 +1,9 @@
<?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.module.exe.ModuleInstance"
table="JBPM_MODULEINSTANCE"
abstract="true"
@@ -18,12 +16,12 @@
<!-- T : org.jbpm.taskmgmt.def.TaskMgmtDefinition -->
<discriminator type="char" column="CLASS_"/>
<version name="version" column="VERSION_" />
-
+
+ <!-- bidirectional, other side is indexed; make this side inverse -->
<many-to-one name="processInstance"
column="PROCESSINSTANCE_"
foreign-key="FK_MODINST_PRCINST"
- index="IDX_MODINST_PRINST"/>
-
+ index="IDX_MODINST_PRINST"
+ insert="false" update="false"/>
</class>
-
</hibernate-mapping>