[jbpm-commits] JBoss JBPM SVN: r2735 - in jbpm4/trunk/modules: pvm/src/main/java/org/jbpm/cfg and 2 other directories.

[do-not-reply at jboss.org]

Author: tom.baeyens at jboss.com
Date: 2008-11-01 06:19:43 -0400 (Sat, 01 Nov 2008)
New Revision: 2735

Modified:
   jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java
   jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java
   jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java
   jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java
Log:
unification api proposals

Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java
===================================================================
--- jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/pvm/env/Environment.java	2008-11-01 10:19:43 UTC (rev 2735)
@@ -242,7 +242,7 @@
   /** pops the closing context from the stack of current contexts.  This 
    * is the first thing that needs to be done when an environment is closed.
    * @see EnvironmentFactory#push(Environment) */ 
-  protected static synchronized Environment popEnvironment() {
+  public static synchronized Environment popEnvironment() {
     Environment popped = currentEnvironment.get();
     currentEnvironment.set(null);
     Stack<Environment> stack = currentEnvironmentStack.get();

Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/cfg/JbpmConfiguration.java	2008-11-01 10:19:43 UTC (rev 2735)
@@ -180,11 +180,16 @@
     // add the environment block context to the environment
     environment.addContext(environmentContext);
 
-    // finish the creation of the environment wire context
-    environmentContext.create();
-    
     Environment.pushEnvironment(environment);
+    try {
+      // finish the creation of the environment wire context
+      environmentContext.create();
 
+    } catch (RuntimeException e) {
+      Environment.popEnvironment();
+      throw e;
+    }
+
     // if all went well, return the created environment
     return environment;
   }

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessDefinitionDbTest.java	2008-11-01 10:19:43 UTC (rev 2735)
@@ -65,7 +65,7 @@
   {
     OpenProcessDefinition processDefinition = ProcessFactory.build().node("a").initial().node("b").node("c").done();
 
-    processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction ////////////////////////////
+    processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction ////////////////////////////
 
     assertNotNull(processDefinition);
     List<Node> nodes = processDefinition.getNodes();
@@ -90,7 +90,7 @@
   {
     OpenProcessDefinition processDefinition = ProcessFactory.build().node("a").initial().node("b").node("c").done();
 
-    processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction ////////////////////////////
+    processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction ////////////////////////////
 
     Node initial = processDefinition.getInitial();
     assertNotNull(initial);
@@ -109,14 +109,14 @@
     OpenProcessDefinition processDefinition = ProcessFactory.build().compositeNode("top").initial().node("a").compositeNode("b").node("b1")
         .node("b2").node("b3").compositeEnd().node("c").compositeEnd().done();
 
-    processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction ////////////////////////////
+    processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction ////////////////////////////
 
     assertNotNull(processDefinition);
     Node initial = processDefinition.getInitial();
     assertNotNull(initial);
     assertEquals(initial, processDefinition.getNode("top"));
 
-    processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction ////////////////////////////
+    processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction ////////////////////////////
 
     List<Node> nodes = processDefinition.getNodes();
     assertNotNull(nodes);
@@ -138,7 +138,7 @@
     assertEquals("b2", nodes.get(1).getName());
     assertEquals("b3", nodes.get(2).getName());
 
-    processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction ////////////////////////////
+    processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction ////////////////////////////
 
     Node node = processDefinition.findNode("b2");
     assertNotNull(node);
@@ -154,7 +154,7 @@
         .transition("toc").to("c").node("b").transition("toa").to("a").transition().to("b").transition("toc").to("c").node("c")
         .transition().to("c").node("d").done();
 
-    processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction ////////////////////////////
+    processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction ////////////////////////////
 
     assertEquals("a", processDefinition.getNode("a").getDefaultTransition().getDestination().getName());
     assertEquals("a", processDefinition.getNode("b").getDefaultTransition().getDestination().getName());
@@ -169,7 +169,7 @@
     OpenProcessDefinition processDefinition = ProcessFactory.build().node().initial().transition().to("a").transition().to("b").node("a")
         .node("b").done();
 
-    processDefinition = reload(processDefinition, OpenProcessDefinition.class); // / new transaction ////////////////////////////
+    processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // / new transaction ////////////////////////////
 
     assertNotNull(processDefinition);
     Node node = processDefinition.getInitial();

Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java
===================================================================
--- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/internal/db/model/ProcessExecutionDbTest.java	2008-11-01 10:19:43 UTC (rev 2735)
@@ -37,7 +37,7 @@
   {
     OpenProcessDefinition processDefinition = new ProcessDefinitionImpl();
 
-    processDefinition = reload(processDefinition, OpenProcessDefinition.class); // new transaction /////////
+    processDefinition = reload(processDefinition, ProcessDefinitionImpl.class); // new transaction /////////
 
     ExecutionImpl execution = new ExecutionImpl();
     execution.setKey("businessKey");

Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java
===================================================================
--- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java	2008-11-01 09:59:11 UTC (rev 2734)
+++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/EnvironmentDbTestCase.java	2008-11-01 10:19:43 UTC (rev 2735)
@@ -120,7 +120,7 @@
     }
   }
   
-  public <T> T reload(T object, Class<T> persistentClass) {
+  public <T> T reload(Object object, Class<T> persistentClass) {
     environment.get(DbSession.class).save(object);
     newTransaction();