[jbpm-commits] JBoss JBPM SVN: r4815 - in jbpm4/trunk/modules/pvm/src/main: java/org/jbpm/pvm/internal/task and 1 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-05-14 12:04:40 -0400 (Thu, 14 May 2009)
New Revision: 4815

Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.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-2124 removed task id property

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java	2009-05-14 14:08:17 UTC (rev 4814)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/HibernateTaskDbSession.java	2009-05-14 16:04:40 UTC (rev 4815)
@@ -54,9 +54,6 @@
     
     if (! taskImpl.isPersisted()) {
       Serializable dbid = session.save(taskImpl);
-      if (taskImpl.getId() == null) {
-        taskImpl.setId(dbid.toString());
-      }
 
     } else {
       session.update(taskImpl);

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-05-14 14:08:17 UTC (rev 4814)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java	2009-05-14 16:04:40 UTC (rev 4815)
@@ -67,7 +67,6 @@
   public static final String STATE_SUSPENDED = "suspended"; 
   public static final String STATE_ACTIVE = "active"; 
   
-  protected String id;
   protected String name;
   protected String description;
 
@@ -388,12 +387,6 @@
   public long getDbid() {
     return dbid;
   }
-  public String getId() {
-    return id;
-  }
-  public void setId(String id) {
-    this.id = id;
-  }
   public String getName() {
     return name;
   }

Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml	2009-05-14 14:08:17 UTC (rev 4814)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml	2009-05-14 16:04:40 UTC (rev 4815)
@@ -4,65 +4,6 @@
           "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 <hibernate-mapping auto-import="false" package="org.jbpm.pvm.internal.task" default-access="field">
 
-  <!-- ### ASSIGNABLE DEFINITIONS #########################################
-  <class name="AssignableDefinitionImpl" 
-         table="JBPM4_ASSIGNDEF"
-         discriminator-value="A" >
-    <id name="dbid" column="DBID_">
-      <generator class="native" />
-    </id>
-    <discriminator><column name="CLASS_" /></discriminator>
-    <version name="dbversion" column="DBVERSION_" />
-
-    <property name="name" column="NAME_"/>
-    <property name="description" column="DESCR_"/>
-    <property name="assigneeExpression" column="ASS_EXPR_"/>
-    <property name="assigneeExpressionLanguage" column="ASS_EXPR_LANG_"/>
-    <property name="candidateUsersExpression" column="CNDUSR_EXPR_"/>
-    <property name="candidateUsersExpressionLanguage" column="CNDUSR_EXPRLANG_"/>
-    <property name="candidateGroupsExpression" column="CNDGRP_EXPR_"/>
-    <property name="candidateGroupsExpressionLanguage" column="CNDGRP_EXPRLANG_"/>
-
-    <many-to-one name="assignmentHandlerDescriptor"
-                 column="ASSHNDLR_DESCR_" 
-                 cascade="all"
-                 class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
-                 foreign-key="FK_ASSHNDLR_DESCR"
-                 index="IDX_ASSHNDLR_DESCR" />
-
-    <subclass name="SwimlaneDefinitionImpl" discriminator-value="S">
-    </subclass>
-     -->
-
-    <!-- ### TASK DEFINITION ################################################
-    <subclass name="TaskDefinitionImpl" discriminator-value="T">
-  
-      <property name="priority" column="PRIORITY_"/>
-      <property name="dueDateDuration" column="DUEDATE_"/>
-      
-      <many-to-one name="taskHandlerDescriptor"
-                   column="TSKHNDLRDESCR_" 
-                   cascade="all"
-                   class="org.jbpm.pvm.internal.wire.descriptor.AbstractDescriptor"
-                   foreign-key="FK_TSKHNDLR_DESCR"
-                   index="IDX_TSKHNDLR_DESCR" />
-
-      <many-to-one name="swimlaneDefinition"
-                   column="SWIMLDEF_" 
-                   cascade="all"
-                   class="SwimlaneDefinitionImpl"
-                   foreign-key="FK_TSK_SWIMLDEF"
-                   index="IDX_TSK_SWIMLDEF" />
-  
-      <list name="subTaskDefinitions" cascade="all-delete-orphan">
-        <key column="TASKDEF_" />
-        <list-index column="TASKDEF_IDX_" />
-        <one-to-many class="TaskDefinitionImpl" />
-      </list>
-    </subclass>
-  </class>
-   -->
-
   <!-- ### TASK ########################################################### -->
   <class name="TaskImpl" 
          table="JBPM4_TASK"
@@ -73,7 +14,6 @@
     <discriminator type="char" column="CLASS_"/>
     <version name="dbversion" column="DBVERSION_" />
 
-    <property name="id" column="ID_" unique="true" />
     <property name="name" column="NAME_"/>
     <property name="description" column="DESCR_"/>
     <property name="state" column="STATE_"/>