[jbpm-commits] JBoss JBPM SVN: r5664 - in jbpm4/trunk/modules: test-cfg/src/test/resources/org/jbpm/test/hibernatelongid and 1 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2009-09-21 03:40:38 -0400 (Mon, 21 Sep 2009)
New Revision: 5664

Modified:
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java
   jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml
   jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatestringid/jbpm.cfg.xml
Log:
JBPM-2526 used dynamic lookup for DbidGenerator in DeploymentProperty

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-21 07:32:02 UTC (rev 5663)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/repository/DeploymentProperty.java	2009-09-21 07:40:38 UTC (rev 5664)
@@ -24,7 +24,6 @@
 import java.io.Serializable;
 
 import org.jbpm.api.JbpmException;
-import org.jbpm.pvm.internal.env.EnvironmentImpl;
 import org.jbpm.pvm.internal.id.DbidGenerator;
 
 
@@ -46,7 +45,7 @@
   }
   
   public DeploymentProperty(DeploymentImpl deployment, String objectName, String key) {
-    this.dbid = EnvironmentImpl.getFromCurrent(DbidGenerator.class).getNextId();
+    this.dbid = DbidGenerator.getDbidGenerator().getNextId();
     this.deployment = deployment;
     this.objectName = objectName;
     this.key = key;

Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml	2009-09-21 07:32:02 UTC (rev 5663)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatelongid/jbpm.cfg.xml	2009-09-21 07:40:38 UTC (rev 5664)
@@ -23,6 +23,11 @@
 
     <hibernate-session-factory />
 
+    <object class="org.jbpm.pvm.internal.id.DatabaseDbidGenerator" init="eager">
+      <field name="commandService"><ref type="org.jbpm.pvm.internal.cmd.CommandService" /></field>
+      <invoke method="initialize" />
+    </object>
+
     <script-manager default-expression-language="juel"
                     default-script-language="juel">
       <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />

Modified: jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatestringid/jbpm.cfg.xml
===================================================================
--- jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatestringid/jbpm.cfg.xml	2009-09-21 07:32:02 UTC (rev 5663)
+++ jbpm4/trunk/modules/test-cfg/src/test/resources/org/jbpm/test/hibernatestringid/jbpm.cfg.xml	2009-09-21 07:40:38 UTC (rev 5664)
@@ -23,6 +23,11 @@
 
     <hibernate-session-factory />
 
+    <object class="org.jbpm.pvm.internal.id.DatabaseDbidGenerator" init="eager">
+      <field name="commandService"><ref type="org.jbpm.pvm.internal.cmd.CommandService" /></field>
+      <invoke method="initialize" />
+    </object>
+
     <script-manager default-expression-language="juel"
                     default-script-language="juel">
       <script-language name="juel" factory="org.jbpm.pvm.internal.script.JuelScriptEngineFactory" />