[jbpm-commits] JBoss JBPM SVN: r2733 - in projects/spec/branches/tdiesler/modules: api/src/main/java/org/jbpm/api/service and 13 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Sat Nov 1 05:51:25 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-11-01 05:51:25 -0400 (Sat, 01 Nov 2008)
New Revision: 2733

Modified:
   projects/spec/branches/tdiesler/modules/api/.classpath
   projects/spec/branches/tdiesler/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java
   projects/spec/branches/tdiesler/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java
   projects/spec/branches/tdiesler/modules/cts/.classpath
   projects/spec/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java
   projects/spec/branches/tdiesler/modules/dialects/api10/.classpath
   projects/spec/branches/tdiesler/modules/dialects/jpdl32/.classpath
   projects/spec/branches/tdiesler/modules/dialects/stp/.classpath
   projects/spec/branches/tdiesler/modules/dialects/xpdl21/.classpath
   projects/spec/branches/tdiesler/modules/ri/.classpath
   projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java
   projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java
   projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java
   projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java
   projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/PropertySupportImpl.java
   projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java
   projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java
   projects/spec/branches/tdiesler/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java
   projects/spec/branches/tdiesler/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java
   projects/spec/branches/tdiesler/modules/samples/airticket/client/.classpath
   projects/spec/branches/tdiesler/modules/samples/airticket/server/.classpath
Log:
mostly good

Modified: projects/spec/branches/tdiesler/modules/api/.classpath
===================================================================
--- projects/spec/branches/tdiesler/modules/api/.classpath	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/api/.classpath	2008-11-01 09:51:25 UTC (rev 2733)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/eclipse/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/branches/tdiesler/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java
===================================================================
--- projects/spec/branches/tdiesler/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -60,8 +60,9 @@
 
   /**
    * Load the ProcessDefinition from persistent storage
+   * @param fetchEager TODO
    */
-  public abstract ProcessDefinition loadProcessDefinition(ObjectName procDefID);
+  public abstract ProcessDefinition loadProcessDefinition(ObjectName procDefID, boolean fetchEager);
 
   /**
    * Delete the ProcessDefinition from persistent storage
@@ -75,8 +76,9 @@
 
   /**
    * Load the Process from persistent storage
+   * @param fetchEager TODO
    */
-  public abstract Process loadProcess(ObjectName procID);
+  public abstract Process loadProcess(ObjectName procID, boolean fetchEager);
 
   /**
    * Delete the Process from persistent storage

Modified: projects/spec/branches/tdiesler/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java
===================================================================
--- projects/spec/branches/tdiesler/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/api/src/main/java/org/jbpm/api/test/ProcessCatalog.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -96,13 +96,11 @@
     SequenceFlow startFlow = start.getOutFlow();
     TestCase.assertNotNull("Start flow not null", startFlow);
     TestCase.assertEquals("Task", startFlow.getTargetRef());
-    TestCase.assertSame(start, startFlow.getSourceRef());
-    TestCase.assertSame(task, startFlow.getTargetRef());
+    TestCase.assertEquals("Start", startFlow.getSourceRef());
 
     SequenceFlow taskFlow = task.getOutFlow();
     TestCase.assertNotNull("Task flow not null", taskFlow);
     TestCase.assertEquals("End", taskFlow.getTargetRef());
-    TestCase.assertSame(task, taskFlow.getSourceRef());
-    TestCase.assertSame(end, taskFlow.getTargetRef());
+    TestCase.assertEquals("Task", taskFlow.getSourceRef());
   }
 }

Modified: projects/spec/branches/tdiesler/modules/cts/.classpath
===================================================================
--- projects/spec/branches/tdiesler/modules/cts/.classpath	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/cts/.classpath	2008-11-01 09:51:25 UTC (rev 2733)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/eclipse/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java
===================================================================
--- projects/spec/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/cts/src/test/java/org/jbpm/test/pattern/control/sequence/SequencePersistenceTest.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -47,6 +47,6 @@
     ObjectName procDefID = service.saveProcessDefinition(procDef);
     
     // Reload the process defintion
-    return service.loadProcessDefinition(procDefID);
+    return service.loadProcessDefinition(procDefID, false);
   }
 }

Modified: projects/spec/branches/tdiesler/modules/dialects/api10/.classpath
===================================================================
--- projects/spec/branches/tdiesler/modules/dialects/api10/.classpath	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/dialects/api10/.classpath	2008-11-01 09:51:25 UTC (rev 2733)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/eclipse/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/branches/tdiesler/modules/dialects/jpdl32/.classpath
===================================================================
--- projects/spec/branches/tdiesler/modules/dialects/jpdl32/.classpath	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/dialects/jpdl32/.classpath	2008-11-01 09:51:25 UTC (rev 2733)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/eclipse/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/branches/tdiesler/modules/dialects/stp/.classpath
===================================================================
--- projects/spec/branches/tdiesler/modules/dialects/stp/.classpath	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/dialects/stp/.classpath	2008-11-01 09:51:25 UTC (rev 2733)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/eclipse/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/branches/tdiesler/modules/dialects/xpdl21/.classpath
===================================================================
--- projects/spec/branches/tdiesler/modules/dialects/xpdl21/.classpath	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/dialects/xpdl21/.classpath	2008-11-01 09:51:25 UTC (rev 2733)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/eclipse/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/branches/tdiesler/modules/ri/.classpath
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/.classpath	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/.classpath	2008-11-01 09:51:25 UTC (rev 2733)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" output="target/eclipse/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/eclipse/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -407,10 +407,10 @@
   public void initialize(Session session)
   {
     Hibernate.initialize(this);
+    Hibernate.initialize(propSupport);
     Hibernate.initialize(assignments);
     Hibernate.initialize(outFlows);
     Hibernate.initialize(inFlows);
-    getProperties();
   }
 
   private void checkAndInitializeStructure(ProcessStructure procStruct)

Modified: projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -38,6 +38,7 @@
 import javax.persistence.OneToOne;
 import javax.persistence.Transient;
 
+import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.jbpm.api.Constants;
 import org.jbpm.api.client.ProcessEngine;
@@ -234,6 +235,9 @@
   @Override
   public void initialize(Session session)
   {
+    Hibernate.initialize(this);
+    ProcessStructureImpl procStructImpl = (ProcessStructureImpl)procStruct;
+    procStructImpl.initialize(session);
   }
   
   @Override

Modified: projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -35,6 +35,7 @@
 import javax.persistence.OneToOne;
 import javax.persistence.Transient;
 
+import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.jbpm.api.Constants;
 import org.jbpm.api.client.ProcessEngine;
@@ -46,7 +47,6 @@
 import org.jbpm.api.model.ProcessDefinition;
 import org.jbpm.api.model.Property;
 import org.jbpm.api.model.builder.ObjectNameFactory;
-import org.jbpm.api.model.internal.ProcessStructure;
 import org.jbpm.api.runtime.Attachments;
 import org.jbpm.api.service.ExecutionService;
 import org.jbpm.api.service.ProcessService;
@@ -71,10 +71,10 @@
   private ProcessStatus status = ProcessStatus.None;
 
   @ManyToOne(targetEntity = ProcessDefinitionImpl.class)
-  private ProcessDefinition procDef;
+  private ProcessDefinitionImpl procDef;
 
   @OneToOne(cascade = { CascadeType.ALL }, targetEntity = ProcessStructureImpl.class)
-  private ProcessStructure procStruct;
+  private ProcessStructureImpl procStruct;
   
   @Transient
   private transient RuntimeException runtimeException;
@@ -278,38 +278,37 @@
   @Override
   public void initialize(Session session)
   {
+    Hibernate.initialize(this);
+    procDef.initialize(session);
+    procStruct.initialize(session);
   }
   
   @Override
   protected void create(Process proc)
   {
     super.create(proc);
-    ProcessStructureImpl procStructImpl = (ProcessStructureImpl)procStruct;
-    procStructImpl.create(proc);
+    procStruct.create(proc);
   }
 
   @Override
   public void register(Process proc)
   {
     super.register(proc);
-    ProcessStructureImpl procStructImpl = (ProcessStructureImpl)procStruct;
-    procStructImpl.register(proc);
+    procStruct.register(proc);
   }
 
   @Override
   public void unregister(Process proc)
   {
     super.unregister(proc);
-    ProcessStructureImpl procStructImpl = (ProcessStructureImpl)procStruct;
-    procStructImpl.unregister(proc);
+    procStruct.unregister(proc);
   }
 
   @Override
   protected void destroy(Process proc)
   {
     super.destroy(proc);
-    ProcessStructureImpl procStructImpl = (ProcessStructureImpl)procStruct;
-    procStructImpl.destroy(proc);
+    procStruct.destroy(proc);
   }
 
   public String toString()

Modified: projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -36,6 +36,7 @@
 import javax.persistence.OneToOne;
 import javax.persistence.Transient;
 
+import org.hibernate.Hibernate;
 import org.hibernate.Session;
 import org.hibernate.annotations.IndexColumn;
 import org.jbpm.api.Constants;
@@ -73,13 +74,13 @@
   @Basic
   private String name;
 
+  @OneToOne(cascade = { CascadeType.ALL }, targetEntity = PropertySupportImpl.class)
+  protected PropertySupport propSupport = new PropertySupportImpl();
+
   @IndexColumn(name = "nodeIndex")
   @OneToMany(cascade = { CascadeType.ALL }, mappedBy = "procStruct", targetEntity = NodeImpl.class)
   private List<Node> nodes = new ArrayList<Node>();
 
-  @OneToOne(cascade = { CascadeType.ALL }, targetEntity = PropertySupportImpl.class)
-  protected PropertySupport propSupport = new PropertySupportImpl();
-
   @IndexColumn(name = "msgIndex")
   @OneToMany(cascade = { CascadeType.ALL }, targetEntity = MessageImpl.class)
   private List<Message> messages = new ArrayList<Message>();
@@ -91,7 +92,7 @@
   @IndexColumn(name = "groupIndex")
   @OneToMany(cascade = { CascadeType.ALL }, targetEntity = GroupImpl.class)
   private List<Group> groups = new ArrayList<Group>();
-  
+
   public ProcessStructureImpl(ProcessEngine engine, String name)
   {
     super(engine);
@@ -257,13 +258,13 @@
   {
     return propSupport.removeProperty(name);
   }
-  
+
   public void addGroup(GroupImpl groupImpl)
   {
     groupImpl.setGroupIndex(groups.size());
     groups.add(groupImpl);
   }
-  
+
   @Override
   public Group getGroup(String grpName)
   {
@@ -288,8 +289,19 @@
   @Override
   public void initialize(Session session)
   {
+    Hibernate.initialize(this);
+    Hibernate.initialize(propSupport);
+    Hibernate.initialize(messages);
+    Hibernate.initialize(assignments);
+    Hibernate.initialize(groups);
+    
+    for (Node node : getNodes())
+    {
+      AbstractElementImpl elImpl = (AbstractElementImpl)node;
+      elImpl.initialize(session);
+    }
   }
-  
+
   @Override
   public void create(ProcessDefinition procDef)
   {

Modified: projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/PropertySupportImpl.java
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/PropertySupportImpl.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/model/PropertySupportImpl.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -31,6 +31,7 @@
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.MapKey;
@@ -54,7 +55,7 @@
   protected Integer id;
 
   @MapKey (name = "name")
-  @OneToMany(cascade = { CascadeType.ALL }, targetEntity = PropertyImpl.class)
+  @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER, targetEntity = PropertyImpl.class)
   private Map<String, Property> propmap = new HashMap<String, Property>();
 
   @Override

Modified: projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -29,7 +29,6 @@
 
 import javax.management.ObjectName;
 
-import org.hibernate.Hibernate;
 import org.hibernate.ObjectNotFoundException;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
@@ -106,16 +105,20 @@
   }
 
   @Override
-  public ProcessDefinition loadProcessDefinition(ObjectName procDefID)
+  public ProcessDefinition loadProcessDefinition(ObjectName procDefID, boolean fetchEager)
   {
     log.debug("START loadProcessDefinition: " + procDefID);
-    ProcessDefinitionImpl procDefImpl = null;
+    ProcessDefinition procDef = null;
     Session session = getSessionFactory().openSession();
     try
     {
       Integer id = Integer.valueOf(procDefID.getKeyProperty("id"));
-      procDefImpl = (ProcessDefinitionImpl)session.load(ProcessDefinitionImpl.class, id);
-      Hibernate.initialize(procDefImpl);
+      procDef = (ProcessDefinition)session.load(ProcessDefinitionImpl.class, id);
+      if (fetchEager == true)
+      {
+        AbstractElementImpl elImpl = (AbstractElementImpl)procDef;
+        elImpl.initialize(session);
+      }
     }
     catch (ObjectNotFoundException ex)
     {
@@ -126,7 +129,7 @@
       session.close();
     }
     log.debug("END loadProcessDefinition: " + procDefID);
-    return (ProcessDefinition)procDefImpl;
+    return (ProcessDefinition)procDef;
   }
 
   @Override
@@ -167,7 +170,7 @@
   }
 
   @Override
-  public Process loadProcess(ObjectName procID)
+  public Process loadProcess(ObjectName procID, boolean fetchEager)
   {
     log.debug("START loadProcess: " + procID);
     Process proc = null;
@@ -176,7 +179,11 @@
     {
       Integer id = Integer.valueOf(procID.getKeyProperty("id"));
       proc = (Process)session.load(ProcessImpl.class, id);
-      Hibernate.initialize(proc);
+      if (fetchEager == true)
+      {
+        AbstractElementImpl elImpl = (AbstractElementImpl)proc;
+        elImpl.initialize(session);
+      }
     }
     catch (ObjectNotFoundException ex)
     {
@@ -246,9 +253,7 @@
   public void deleteNode(Session session, Node node)
   {
     log.debug("START deleteNode: " + node);
-    
     session.delete(node);
-    
     log.debug("END deleteNode: " + node);
   }
 

Modified: projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -73,7 +73,7 @@
   }
 
   @Override
-  public ProcessDefinition loadProcessDefinition(ObjectName procDefID)
+  public ProcessDefinition loadProcessDefinition(ObjectName procDefID, boolean fetchEager)
   {
     ProcessDefinition procDef = procDefs.get(procDefID);
     if (procDef == null)
@@ -100,7 +100,7 @@
   }
 
   @Override
-  public Process loadProcess(ObjectName procID)
+  public Process loadProcess(ObjectName procID, boolean fetchEager)
   {
     Process proc = procs.get(procID);
     if (proc == null)

Modified: projects/spec/branches/tdiesler/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessDefinitionPersistenceTest.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -57,7 +57,7 @@
 
     // Load the ProcessDefinition
     ObjectName procDefID = procDef.getKey();
-    ProcessDefinition loadDef = service.loadProcessDefinition(procDefID);
+    ProcessDefinition loadDef = service.loadProcessDefinition(procDefID, true);
     ProcessCatalog.validateDefaultProcess(loadDef);
 
     StartEvent start = loadDef.getNode(StartEvent.class, "Start");
@@ -72,7 +72,7 @@
     service.deleteProcessDefinition(procDef);
     try
     {
-      service.loadProcessDefinition(procDefID);
+      service.loadProcessDefinition(procDefID, true);
       fail("ProcessNotFoundException expected");
     }
     catch (ProcessNotFoundException ex)

Modified: projects/spec/branches/tdiesler/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java
===================================================================
--- projects/spec/branches/tdiesler/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java	2008-11-01 09:51:25 UTC (rev 2733)
@@ -64,7 +64,7 @@
 
     // Load the process
     ObjectName procID = proc.getKey();
-    Process loadProc = service.loadProcess(procID);
+    Process loadProc = service.loadProcess(procID, true);
     ProcessCatalog.validateDefaultProcess(loadProc.getProcessDefinition());
 
     StartEvent start = loadProc.getNode(StartEvent.class, "Start");
@@ -79,7 +79,7 @@
     service.deleteProcess(proc);
     try
     {
-      service.loadProcess(procID);
+      service.loadProcess(procID, true);
       fail("ProcessNotFoundException expected");
     }
     catch (ProcessNotFoundException ex)

Modified: projects/spec/branches/tdiesler/modules/samples/airticket/client/.classpath
===================================================================
--- projects/spec/branches/tdiesler/modules/samples/airticket/client/.classpath	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/samples/airticket/client/.classpath	2008-11-01 09:51:25 UTC (rev 2733)
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/eclipse/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Modified: projects/spec/branches/tdiesler/modules/samples/airticket/server/.classpath
===================================================================
--- projects/spec/branches/tdiesler/modules/samples/airticket/server/.classpath	2008-11-01 09:02:57 UTC (rev 2732)
+++ projects/spec/branches/tdiesler/modules/samples/airticket/server/.classpath	2008-11-01 09:51:25 UTC (rev 2733)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" output="target/eclipse/test-classes" path="src/test/java"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="target/eclipse/classes"/>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>




More information about the jbpm-commits mailing list