[jbpm-commits] JBoss JBPM SVN: r5651 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/pvm/internal/hibernate and 9 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Wed Sep 16 10:31:51 EDT 2009
Author: tom.baeyens at jboss.com
Date: 2009-09-16 10:31:51 -0400 (Wed, 16 Sep 2009)
New Revision: 5651
Modified:
jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDetailImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.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/model/ScopeInstanceImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java
jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java
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/type/Variable.java
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml
jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml
Log:
JBPM-2526 switched the other persistent entities over to jbpm dbid generation
Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/NewDeployment.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -66,4 +66,5 @@
* @return the generated deploymentId identification for this deployment
* in the {@link RepositoryService repository}. */
String deploy();
+
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/hibernate/DbSessionImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -40,6 +40,7 @@
import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.model.HistoryCommentImpl;
import org.jbpm.pvm.internal.history.model.HistoryProcessInstanceImpl;
+import org.jbpm.pvm.internal.id.DbidGenerator;
import org.jbpm.pvm.internal.job.JobImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.query.DeploymentQueryImpl;
@@ -364,6 +365,8 @@
protected TaskImpl newTask() {
TaskImpl task = new TaskImpl();
+ long dbid = EnvironmentImpl.getFromCurrent(DbidGenerator.class).getNextId();
+ task.setDbid(dbid);
task.setNew(true);
return task;
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryActivityInstanceImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -30,6 +30,7 @@
import org.jbpm.api.history.HistoryActivityInstance;
import org.jbpm.api.history.HistoryProcessInstance;
+import org.jbpm.pvm.internal.id.DbidGenerator;
import org.jbpm.pvm.internal.model.ActivityImpl;
import org.jbpm.pvm.internal.model.ExecutionImpl;
@@ -71,6 +72,7 @@
this.executionId = execution.getId();
this.activityName = activity.getName();
this.startTime = execution.getHistoryActivityStart();
+ this.dbid = DbidGenerator.getDbidGenerator().getNextId();
}
// details //////////////////////////////////////////////////////////////////
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDetailImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDetailImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/history/model/HistoryDetailImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -25,6 +25,7 @@
import java.util.Date;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.id.DbidGenerator;
import org.jbpm.pvm.internal.util.Clock;
import org.jbpm.pvm.internal.util.EqualsUtil;
@@ -55,6 +56,7 @@
// dummy string constructor to differentiate from
// the default constructor which is used by hibernate
protected HistoryDetailImpl(String dummy) {
+ this.dbid = DbidGenerator.getDbidGenerator().getNextId();
this.time = Clock.getCurrentTime();
EnvironmentImpl environment = EnvironmentImpl.getCurrent();
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/GroupImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -73,4 +73,7 @@
public void setType(String type) {
this.type = type;
}
+ public void setDbid(long dbid) {
+ this.dbid = dbid;
+ }
}
\ No newline at end of file
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/IdentitySessionImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -30,6 +30,8 @@
import org.jbpm.api.JbpmException;
import org.jbpm.api.identity.Group;
import org.jbpm.api.identity.User;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.id.DbidGenerator;
import org.jbpm.pvm.internal.identity.spi.IdentitySession;
/**
@@ -39,10 +41,13 @@
protected Session session;
- public String createUser(String userName, String givenName, String familyName,
- String businessEmail) {
+ public String createUser(String userName, String givenName, String familyName, String businessEmail) {
UserImpl user = new UserImpl(userName, givenName, familyName);
user.setBusinessEmail(businessEmail);
+
+ long dbid = EnvironmentImpl.getFromCurrent(DbidGenerator.class).getNextId();
+ user.setDbid(dbid);
+
session.save(user);
return user.getId();
@@ -90,6 +95,10 @@
GroupImpl group = new GroupImpl();
String groupId = groupType != null ? groupType + "." + groupName : groupName;
group.setId(groupId);
+
+ long dbid = EnvironmentImpl.getFromCurrent(DbidGenerator.class).getNextId();
+ group.setDbid(dbid);
+
group.setName(groupName);
group.setType(groupType);
@@ -97,7 +106,7 @@
GroupImpl parentGroup = findGroupById(parentGroupId);
group.setParent(parentGroup);
}
-
+
session.save(group);
return group.getId();
@@ -172,6 +181,9 @@
membership.setGroup(group);
membership.setRole(role);
+ long dbid = EnvironmentImpl.getFromCurrent(DbidGenerator.class).getNextId();
+ membership.setDbid(dbid);
+
session.save(membership);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/MembershipImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -60,4 +60,8 @@
public void setRole(String role) {
this.role = role;
}
+
+ public void setDbid(long dbid) {
+ this.dbid = dbid;
+ }
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/identity/impl/UserImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -94,4 +94,8 @@
public void setPassword(String password) {
this.password = password;
}
+
+ public void setDbid(long dbid) {
+ this.dbid = dbid;
+ }
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/MessageImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -22,6 +22,7 @@
package org.jbpm.pvm.internal.job;
import org.jbpm.api.job.Message;
+import org.jbpm.pvm.internal.id.DbidGenerator;
import org.jbpm.pvm.internal.model.ExecutionImpl;
/**
@@ -41,5 +42,6 @@
public MessageImpl(ExecutionImpl execution) {
this.execution = execution;
this.processInstance = execution.getProcessInstance();
+ this.dbid = DbidGenerator.getDbidGenerator().getNextId();
}
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/job/TimerImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -31,6 +31,7 @@
import org.jbpm.pvm.internal.cal.BusinessCalendar;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.env.Transaction;
+import org.jbpm.pvm.internal.id.DbidGenerator;
import org.jbpm.pvm.internal.jobexecutor.JobAddedNotification;
import org.jbpm.pvm.internal.jobexecutor.JobExecutor;
import org.jbpm.pvm.internal.model.ObservableElement;
@@ -65,6 +66,7 @@
}
public void schedule() {
+ this.dbid = DbidGenerator.getDbidGenerator().getNextId();
TimerSession timerSession = EnvironmentImpl.getFromCurrent(TimerSession.class);
timerSession.schedule(this);
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/lob/Lob.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -26,6 +26,7 @@
import java.util.List;
import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.id.DbidGenerator;
/**
@@ -65,11 +66,13 @@
public Lob(byte[] bytes) {
cachedBytes = bytes;
getBlobStrategy().set(bytes, this);
+ this.dbid = DbidGenerator.getDbidGenerator().getNextId();
}
public Lob(char[] text) {
cachedChars = text;
getClobStrategy().set(text, this);
+ this.dbid = DbidGenerator.getDbidGenerator().getNextId();
}
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-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ExecutionImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -802,6 +802,8 @@
public SwimlaneImpl createSwimlane(String swimlaneName) {
SwimlaneImpl swimlane = new SwimlaneImpl();
+ long dbid = EnvironmentImpl.getFromCurrent(DbidGenerator.class).getNextId();
+ swimlane.setDbid(dbid);
swimlane.setName(swimlaneName);
swimlane.setExecution(this);
swimlanes.put(swimlaneName, swimlane);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/model/ScopeInstanceImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -35,6 +35,7 @@
import org.jbpm.pvm.internal.env.EnvironmentImpl;
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.events.VariableCreate;
+import org.jbpm.pvm.internal.id.DbidGenerator;
import org.jbpm.pvm.internal.job.TimerImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
import org.jbpm.pvm.internal.type.Converter;
@@ -135,8 +136,11 @@
variable.setExecution(getExecution());
variable.setTask(getTask());
variable.setHistoryEnabled(isHistoryEnabled);
-
+
variable.setValue(value);
+
+ long dbid = DbidGenerator.getDbidGenerator().getNextId();
+ variable.setDbid(dbid);
if (isHistoryEnabled) {
HistoryEvent.fire(new VariableCreate(variable));
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -315,4 +315,7 @@
public String getState() {
return state;
}
+ public void setDbid(long dbid) {
+ this.dbid = dbid;
+ }
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -24,6 +24,8 @@
import java.io.Serializable;
import org.jbpm.api.JbpmException;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.id.DbidGenerator;
/**
@@ -44,6 +46,7 @@
}
public DeploymentProperty(DeploymentImpl deployment, String objectName, String key) {
+ this.dbid = EnvironmentImpl.getFromCurrent(DbidGenerator.class).getNextId();
this.deployment = deployment;
this.objectName = objectName;
this.key = key;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/RepositorySessionImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -32,6 +32,8 @@
import org.jbpm.api.ProcessDefinition;
import org.jbpm.api.ProcessDefinitionQuery;
import org.jbpm.internal.log.Log;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.id.DbidGenerator;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.model.ProcessDefinitionImpl;
import org.jbpm.pvm.internal.query.ProcessDefinitionQueryImpl;
@@ -51,6 +53,8 @@
public String deploy(NewDeployment deployment) {
DeploymentImpl deploymentImpl = (DeploymentImpl) deployment;
+ long dbid = EnvironmentImpl.getFromCurrent(DbidGenerator.class).getNextId();
+ deploymentImpl.setDbid(dbid);
session.save(deploymentImpl);
deployerManager.deploy(deploymentImpl);
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/ParticipationImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -24,6 +24,8 @@
import java.io.Serializable;
import org.jbpm.api.task.Participation;
+import org.jbpm.pvm.internal.env.EnvironmentImpl;
+import org.jbpm.pvm.internal.id.DbidGenerator;
/** the relation between a task and a person.
@@ -47,6 +49,7 @@
}
public ParticipationImpl(String userId, String groupId, String type) {
+ this.dbid = EnvironmentImpl.getFromCurrent(DbidGenerator.class).getNextId();
this.userId = userId;
this.groupId = groupId;
this.type = type;
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/SwimlaneImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -22,7 +22,6 @@
package org.jbpm.pvm.internal.task;
import java.io.Serializable;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
@@ -148,4 +147,7 @@
public void setExecution(ExecutionImpl execution) {
this.execution = execution;
}
+ public void setDbid(long dbid) {
+ this.dbid = dbid;
+ }
}
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-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/task/TaskImpl.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -487,4 +487,8 @@
public void setNew(boolean isNew) {
this.isNew = isNew;
}
+
+ public void setDbid(long dbid) {
+ this.dbid = dbid;
+ }
}
Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/type/Variable.java 2009-09-16 14:31:51 UTC (rev 5651)
@@ -28,6 +28,7 @@
import org.jbpm.pvm.internal.history.HistoryEvent;
import org.jbpm.pvm.internal.history.HistorySession;
import org.jbpm.pvm.internal.history.events.VariableUpdate;
+import org.jbpm.pvm.internal.id.DbidGenerator;
import org.jbpm.pvm.internal.model.ExecutionImpl;
import org.jbpm.pvm.internal.task.TaskImpl;
@@ -124,7 +125,7 @@
}
// getters and setters //////////////////////////////////////////////////////
-
+
public String getKey() {
return key;
}
@@ -161,4 +162,7 @@
public void setHistoryEnabled(boolean isHistoryEnabled) {
this.isHistoryEnabled = isHistoryEnabled;
}
+ public void setDbid(long dbid) {
+ this.dbid = dbid;
+ }
}
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.execution.hbm.xml 2009-09-16 14:31:51 UTC (rev 5651)
@@ -120,7 +120,7 @@
-->
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<discriminator column="CLASS_"/>
<version name="dbversion" column="DBVERSION_" />
@@ -188,7 +188,7 @@
<!-- ### LOB ############################################################ -->
<class name="org.jbpm.pvm.internal.lob.Lob" table="JBPM4_LOB">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<version name="dbversion" column="DBVERSION_" />
<property name="blob" type="blob"><column name="BLOB_VALUE_" /></property>
@@ -202,7 +202,7 @@
<class name="org.jbpm.pvm.internal.job.JobImpl" table="JBPM4_JOB" discriminator-value="Job">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<discriminator column="CLASS_" />
<version name="dbversion" column="DBVERSION_" />
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.history.hbm.xml 2009-09-16 14:31:51 UTC (rev 5651)
@@ -50,7 +50,7 @@
<!-- ### HISTORY ACTIVITY INSTANCE ####################################### -->
<class name="HistoryActivityInstanceImpl" table="JBPM4_HIST_ACTINST" discriminator-value="act">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<discriminator column="CLASS_" />
<version name="dbversion" column="DBVERSION_" />
@@ -169,7 +169,7 @@
<!-- ### HISTORY COMMENTS ################################################# -->
<class name="HistoryDetailImpl" table="JBPM4_HIST_DETAIL">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<discriminator column="CLASS_" />
<version name="dbversion" column="DBVERSION_" />
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.identity.hbm.xml 2009-09-16 14:31:51 UTC (rev 5651)
@@ -6,7 +6,7 @@
<!-- ### USER ########################################################### -->
<class name="UserImpl" table="JBPM4_ID_USER">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<version name="dbversion" column="DBVERSION_" />
@@ -20,7 +20,7 @@
<!-- ### MEMBERSHIP ##################################################### -->
<class name="MembershipImpl" table="JBPM4_ID_MEMBERSHIP">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<version name="dbversion" column="DBVERSION_" />
@@ -42,7 +42,7 @@
<!-- ### GROUP ########################################################### -->
<class name="GroupImpl" table="JBPM4_ID_GROUP">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<version name="dbversion" column="DBVERSION_" />
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.repository.hbm.xml 2009-09-16 14:31:51 UTC (rev 5651)
@@ -9,7 +9,7 @@
<!-- ProcessElementImpl part ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<property name="name" type="text" column="NAME_" />
@@ -35,7 +35,7 @@
<class name="org.jbpm.pvm.internal.repository.DeploymentProperty" table="JBPM4_DEPLOYPROP">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<many-to-one name="deployment"
class="org.jbpm.pvm.internal.repository.DeploymentImpl"
Modified: jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-09-16 13:15:55 UTC (rev 5650)
+++ jbpm4/trunk/modules/pvm/src/main/resources/jbpm.task.hbm.xml 2009-09-16 14:31:51 UTC (rev 5651)
@@ -9,7 +9,7 @@
table="JBPM4_TASK"
discriminator-value="T">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<discriminator type="char" column="CLASS_"/>
<version name="dbversion" column="DBVERSION_" />
@@ -78,7 +78,7 @@
<!-- ### PARTICIPANT #################################################### -->
<class name="ParticipationImpl" table="JBPM4_PARTICIPATION">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<version name="dbversion" column="DBVERSION_" />
@@ -102,7 +102,7 @@
<!-- ### SWIMLANE ####################################################### -->
<class name="SwimlaneImpl" table="JBPM4_SWIMLANE">
<id name="dbid" column="DBID_">
- <generator class="native" />
+ <generator class="assigned" />
</id>
<version name="dbversion" column="DBVERSION_" />
More information about the jbpm-commits
mailing list