[jbpm-commits] JBoss JBPM SVN: r2422 - in projects/spec/trunk/modules: impl/src/main/java/org/jbpm/ri/model and 1 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Mon Sep 29 03:44:49 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-29 03:44:49 -0400 (Mon, 29 Sep 2008)
New Revision: 2422

Added:
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceServiceTest.java
Removed:
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Node.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/NodeImpl.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceServiceTest.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceTest.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Process.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/ProcessImpl.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/SequenceFlow.java
   projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/SequenceFlowImpl.java
Modified:
   projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/EndEventImpl.java
   projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ProcessImpl.java
   projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/StartEventImpl.java
   projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/TaskImpl.java
   projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/service/HibernatePersistenceService.java
Log:
PersistenceServiceTest good

Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Node.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Node.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Node.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -1,16 +0,0 @@
-package org.jbpm.test.cts.persistence;
-
-import java.util.List;
-
-public interface Node
-{
-
-  public abstract Process getProcess();
-
-  public abstract String getName();
-
-  public abstract List<SequenceFlow> getInFlows();
-
-  public abstract List<SequenceFlow> getOutFlows();
-
-}
\ No newline at end of file

Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/NodeImpl.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/NodeImpl.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/NodeImpl.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -1,92 +0,0 @@
-/**
- * 
- */
-package org.jbpm.test.cts.persistence;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-
-import org.hibernate.annotations.IndexColumn;
-
- at Entity( name= "Node" )
-public class NodeImpl implements Node
-{
-  @Id
-  @GeneratedValue
-  public Integer id;
-  @Basic
-  private String name;
-  @ManyToOne(targetEntity = ProcessImpl.class)
-  private Process process;
-  @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER, mappedBy = "target", targetEntity = SequenceFlowImpl.class)
-  @IndexColumn(name = "targetIndex")
-  private List<SequenceFlow> inFlows = new ArrayList<SequenceFlow>();
-  @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER, mappedBy = "source", targetEntity = SequenceFlowImpl.class)
-  @IndexColumn(name = "sourceIndex")
-  private List<SequenceFlow> outFlows = new ArrayList<SequenceFlow>();
-
-  public NodeImpl()
-  {
-  }
-
-  public NodeImpl(String name)
-  {
-    this.name = name;
-  }
-
-  public Process getProcess()
-  {
-    return process;
-  }
-
-  public void setProcess(Process process)
-  {
-    this.process = process;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  public List<SequenceFlow> getInFlows()
-  {
-    return inFlows;
-  }
-
-  public void setInFlows(List<SequenceFlow> inFlows)
-  {
-    this.inFlows = inFlows;
-  }
-
-  public List<SequenceFlow> getOutFlows()
-  {
-    return outFlows;
-  }
-
-  public void setOutFlows(List<SequenceFlow> flows)
-  {
-    this.outFlows = flows;
-  }
-
-  @Override
-  public String toString()
-  {
-    return "[name=" + name + ",in=" + inFlows + ",out=" + outFlows + "]";
-  }
-
-}
\ No newline at end of file

Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceServiceTest.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceServiceTest.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.test.cts.persistence;
-
-// $Id$
-
-import javax.management.ObjectName;
-
-import org.jbpm.api.ProcessNotFoundException;
-import org.jbpm.api.client.ProcessEngine;
-import org.jbpm.api.model.Process;
-import org.jbpm.api.model.Node;
-import org.jbpm.api.service.PersistenceService;
-import org.jbpm.api.test.CTSTestCase;
-import org.jbpm.test.cts.processbuilder.TestProcessBuilder;
-
-/**
- * Test the ExecutionManager
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public class PersistenceServiceTest extends CTSTestCase
-{
-  /**
-   * Test save, load, delete of a trivial process
-   */
-  public void testSaveLoadDelete() throws Exception
-  {
-    ProcessEngine engine = ProcessEngine.getProcessEngine();
-    PersistenceService service = engine.getService(PersistenceService.class);
-
-    // Save the process
-    Process proc = TestProcessBuilder.getTrivalProcess();
-    
-    System.out.println(proc);
-    for (Node node : proc.getNodes())
-      System.out.println(node);
-    
-    service.saveProcess(proc);
-
-    System.out.println(proc);
-    for (Node node : proc.getNodes())
-      System.out.println(node);
-    
-    // Load the process
-    ObjectName procID = proc.getKey();
-    Process procLoad = service.loadProcess(procID);
-    
-    System.out.println(procLoad);
-    for (Node node : procLoad.getNodes())
-      System.out.println(node);
-      
-    TestProcessBuilder.validateTrivialProcess(procLoad);
-
-    // Delete the process
-    service.deleteProcess(proc);
-    try
-    {
-      service.loadProcess(procID);
-      fail("ProcessNotFoundException expected");
-    }
-    catch (ProcessNotFoundException ex)
-    {
-      // expected
-    }
-  }
-}

Added: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceServiceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceServiceTest.java	                        (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceServiceTest.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.test.cts.persistence;
+
+// $Id$
+
+import javax.management.ObjectName;
+
+import org.jbpm.api.ProcessNotFoundException;
+import org.jbpm.api.client.ProcessEngine;
+import org.jbpm.api.model.Process;
+import org.jbpm.api.service.PersistenceService;
+import org.jbpm.api.test.CTSTestCase;
+import org.jbpm.test.cts.processbuilder.TestProcessBuilder;
+
+/**
+ * Test the ExecutionManager
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 08-Jul-2008
+ */
+public class PersistenceServiceTest extends CTSTestCase
+{
+  /**
+   * Test save, load, delete of a trivial process
+   */
+  public void testSaveLoadDelete() throws Exception
+  {
+    ProcessEngine engine = ProcessEngine.getProcessEngine();
+    PersistenceService service = engine.getService(PersistenceService.class);
+
+    // Save the process
+    Process proc = TestProcessBuilder.getTrivalProcess();
+    service.saveProcess(proc);
+
+    // Load the process
+    ObjectName procID = proc.getKey();
+    Process procLoad = service.loadProcess(procID);
+    TestProcessBuilder.validateTrivialProcess(procLoad);
+
+    // Delete the process
+    service.deleteProcess(proc);
+    try
+    {
+      service.loadProcess(procID);
+      fail("ProcessNotFoundException expected");
+    }
+    catch (ProcessNotFoundException ex)
+    {
+      // expected
+    }
+  }
+}

Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceTest.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/PersistenceTest.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -1,142 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jbpm.test.cts.persistence;
-
-// $Id$
-
-import org.hibernate.Hibernate;
-import org.hibernate.ObjectNotFoundException;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cfg.AnnotationConfiguration;
-import org.hibernate.classic.Session;
-import org.jbpm.api.ProcessNotFoundException;
-import org.jbpm.api.test.CTSTestCase;
-
-/**
- * Test the ExecutionManager
- * 
- * @author thomas.diesler at jboss.com
- * @since 08-Jul-2008
- */
-public class PersistenceTest extends CTSTestCase
-{
-  private String hibernateConfig;
-  private SessionFactory sessionFactory;
-
-  /**
-   * Test save, load, delete of a trivial process
-   */
-  public void testSaveLoadDelete() throws Exception
-  {
-    NodeImpl na = new NodeImpl("A");
-    NodeImpl nb = new NodeImpl("B");
-    NodeImpl nc = new NodeImpl("C");
-
-    ProcessImpl proc = new ProcessImpl("P");
-    proc.addNode(na);
-    proc.addNode(nb);
-    proc.addNode(nc);
-
-    new SequenceFlowImpl(na, nb);
-    new SequenceFlowImpl(nb, nc);
-
-    System.out.println(proc);
-
-    Session session = getSessionFactory().openSession();
-    Transaction tx = session.beginTransaction();
-    try
-    {
-      session.save(proc);
-
-      tx.commit();
-    }
-    finally
-    {
-      session.close();
-    }
-
-    Process loadProc = loadProcess(proc.id);
-
-    System.out.println();
-    System.out.println(loadProc);
-
-    deleteProcess(proc);
-  }
-
-  public Process loadProcess(Integer id)
-  {
-    Process proc = null;
-    Session session = getSessionFactory().openSession();
-    try
-    {
-      proc = (Process)session.load(ProcessImpl.class, id);
-      Hibernate.initialize(proc);
-    }
-    catch (ObjectNotFoundException ex)
-    {
-      throw new ProcessNotFoundException("Cannot find process: " + id);
-    }
-    finally
-    {
-      session.close();
-    }
-    return proc;
-  }
-
-  public void deleteProcess(Process proc)
-  {
-    Session session = getSessionFactory().openSession();
-    Transaction tx = session.beginTransaction();
-    try
-    {
-      session.delete(proc);
-      tx.commit();
-    }
-    finally
-    {
-      session.close();
-    }
-  }
-
-  private SessionFactory getSessionFactory()
-  {
-    // If this property is not explicitly set in the beans config
-    // fall back to the -Ddatabase property that also activates
-    // the corresponding mvn profiles
-    if (hibernateConfig == null)
-    {
-      String database = System.getProperty("database", "mysql");
-      hibernateConfig = "hibernate.cfg." + database + ".xml";
-    }
-
-    if (sessionFactory == null)
-    {
-      AnnotationConfiguration anConfig = new AnnotationConfiguration();
-      anConfig.addAnnotatedClass(ProcessImpl.class);
-      anConfig.addAnnotatedClass(NodeImpl.class);
-      anConfig.addAnnotatedClass(SequenceFlowImpl.class);
-      sessionFactory = anConfig.configure(hibernateConfig).buildSessionFactory();
-    }
-    return sessionFactory;
-  }
-}

Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Process.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Process.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/Process.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -1,12 +0,0 @@
-package org.jbpm.test.cts.persistence;
-
-import java.util.List;
-
-public interface Process
-{
-
-  public abstract String getName();
-
-  public abstract List<Node> getNodes();
-
-}
\ No newline at end of file

Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/ProcessImpl.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/ProcessImpl.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/ProcessImpl.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -1,69 +0,0 @@
-/**
- * 
- */
-package org.jbpm.test.cts.persistence;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-
- at Entity( name= "Process" )
-public class ProcessImpl implements Process
-{
-  @Id
-  @GeneratedValue
-  public Integer id;
-  @Basic
-  private String name;
-  @OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER, mappedBy = "process", targetEntity = NodeImpl.class)
-  private List<Node> nodes = new ArrayList<Node>();
-
-  public ProcessImpl()
-  {
-  }
-
-  public ProcessImpl(String name)
-  {
-    this.name = name;
-  }
-
-  public String getName()
-  {
-    return name;
-  }
-
-  public void setName(String name)
-  {
-    this.name = name;
-  }
-
-  public List<Node> getNodes()
-  {
-    return nodes;
-  }
-
-  public void setNodes(List<Node> nodes)
-  {
-    this.nodes = nodes;
-  }
-
-  public void addNode(Node node)
-  {
-    ((NodeImpl)node).setProcess(this);
-    nodes.add(node);
-  }
-
-  @Override
-  public String toString()
-  {
-    return "[name=" + name + ",nodes=" + nodes + "]";
-  }
-
-}
\ No newline at end of file

Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/SequenceFlow.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/SequenceFlow.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/SequenceFlow.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -1,12 +0,0 @@
-package org.jbpm.test.cts.persistence;
-
-public interface SequenceFlow
-{
-
-  public abstract String getTargetName();
-
-  public abstract Node getSource();
-
-  public abstract Node getTarget();
-
-}
\ No newline at end of file

Deleted: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/SequenceFlowImpl.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/SequenceFlowImpl.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/persistence/SequenceFlowImpl.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -1,109 +0,0 @@
-/**
- * 
- */
-package org.jbpm.test.cts.persistence;
-
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-
- at Entity( name= "SequenceFlow" )
-public class SequenceFlowImpl implements SequenceFlow
-{
-  @Id
-  @GeneratedValue
-  public Integer id;
-  @Basic
-  private String targetName;
-  @Basic
-  private int sourceIndex;
-  @Basic
-  private int targetIndex;
-  @ManyToOne(cascade = CascadeType.ALL, targetEntity = NodeImpl.class)
-  private Node source;
-  @ManyToOne(cascade = CascadeType.ALL, targetEntity = NodeImpl.class)
-  private Node target;
-
-  public SequenceFlowImpl()
-  {
-  }
-
-  public SequenceFlowImpl(Node source, Node target)
-  {
-    this.source = source;
-    this.target = target;
-    this.targetName = target.getName();
-    this.sourceIndex = source.getOutFlows().size();
-    this.targetIndex = target.getInFlows().size();
-    source.getOutFlows().add(this);
-    target.getInFlows().add(this);
-  }
-
-  public int getSourceIndex()
-  {
-    return sourceIndex;
-  }
-
-  public void setSourceIndex(int sourceIndex)
-  {
-    this.sourceIndex = sourceIndex;
-  }
-
-  public int getTargetIndex()
-  {
-    return targetIndex;
-  }
-
-  public void setTargetIndex(int targetIndex)
-  {
-    this.targetIndex = targetIndex;
-  }
-
-  /* (non-Javadoc)
-   * @see org.jbpm.test.cts.persistence.SequenceFlow#getTargetName()
-   */
-  public String getTargetName()
-  {
-    return targetName;
-  }
-
-  public void setTargetName(String targetName)
-  {
-    this.targetName = targetName;
-  }
-
-  /* (non-Javadoc)
-   * @see org.jbpm.test.cts.persistence.SequenceFlow#getSource()
-   */
-  public Node getSource()
-  {
-    return source;
-  }
-
-  public void setSource(Node source)
-  {
-    this.source = source;
-  }
-
-  /* (non-Javadoc)
-   * @see org.jbpm.test.cts.persistence.SequenceFlow#getTarget()
-   */
-  public Node getTarget()
-  {
-    return target;
-  }
-
-  public void setTarget(Node target)
-  {
-    this.target = target;
-  }
-
-  @Override
-  public String toString()
-  {
-    return "[" + source.getName() + "->" + target.getName() + "]";
-  }
-}
\ No newline at end of file

Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/EndEventImpl.java
===================================================================
--- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/EndEventImpl.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/EndEventImpl.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -95,8 +95,8 @@
 
   public void setInFlow(SequenceFlowImpl inFlow)
   {
+    inFlow.setSourceIndex(inFlows.size());
     inFlows.add(inFlow);
-    inFlow.setSourceIndex(inFlows.size());
   }
 
   public String toString()

Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ProcessImpl.java
===================================================================
--- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ProcessImpl.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ProcessImpl.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -121,13 +121,12 @@
     if (nodeImpl == null)
       throw new IllegalArgumentException("Node cannot be null");
     
-    nodes.add(nodeImpl);
     nodeImpl.setNodeIndex(nodes.size());
+    nodes.add(nodeImpl);
   }
 
   public List<Node> getNodes()
   {
-    System.out.println(nodes);
     return nodes;
   }
 

Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/StartEventImpl.java
===================================================================
--- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/StartEventImpl.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/StartEventImpl.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -92,8 +92,8 @@
 
   public void setOutFlow(SequenceFlowImpl outFlow)
   {
+    outFlow.setTargetIndex(outFlows.size());
     outFlows.add(outFlow);
-    outFlow.setTargetIndex(outFlows.size());
   }
 
   public String toString()

Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/TaskImpl.java
===================================================================
--- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/TaskImpl.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/TaskImpl.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -90,8 +90,8 @@
 
   public void setInFlow(SequenceFlowImpl inFlow)
   {
+    inFlow.setSourceIndex(inFlows.size());
     inFlows.add(inFlow);
-    inFlow.setSourceIndex(inFlows.size());
   }
 
   @Transient
@@ -104,8 +104,8 @@
 
   public void setOutFlow(SequenceFlowImpl outFlow)
   {
+    outFlow.setTargetIndex(outFlows.size());
     outFlows.add(outFlow);
-    outFlow.setTargetIndex(outFlows.size());
   }
 
   public String toString()

Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/service/HibernatePersistenceService.java
===================================================================
--- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/service/HibernatePersistenceService.java	2008-09-29 07:32:25 UTC (rev 2421)
+++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/service/HibernatePersistenceService.java	2008-09-29 07:44:49 UTC (rev 2422)
@@ -65,6 +65,7 @@
 
   public ObjectName saveProcess(Process proc)
   {
+    log.debug("START saveProcess: " + proc.getKey());
     Session session = getSessionFactory().openSession();
     Transaction tx = session.beginTransaction();
     try
@@ -76,12 +77,13 @@
     {
       session.close();
     }
+    log.debug("END saveProcess: " + proc.getKey());
     return proc.getKey();
   }
 
   public Process loadProcess(ObjectName procID)
   {
-    log.debug("START loadProcess >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
+    log.debug("START loadProcess: " + procID);
     ProcessImpl procImpl = null;
     Session session = getSessionFactory().openSession();
     try
@@ -98,12 +100,13 @@
     {
       session.close();
     }
-    log.debug("END loadProcess <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<");
+    log.debug("END loadProcess: " + procID);
     return procImpl;
   }
 
   public void deleteProcess(Process proc)
   {
+    log.debug("START deleteProcess: " + proc.getKey());
     Session session = getSessionFactory().openSession();
     Transaction tx = session.beginTransaction();
     try
@@ -115,6 +118,7 @@
     {
       session.close();
     }
+    log.debug("END deleteProcess: " + proc.getKey());
   }
 
   private SessionFactory getSessionFactory()




More information about the jbpm-commits mailing list