[jbpm-commits] JBoss JBPM SVN: r2277 - in projects/jbpm-spec/trunk/modules: api/src/main/java/org/jboss/bpm/client and 3 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Wed Sep 17 12:04:01 EDT 2008


Author: thomas.diesler at jboss.com
Date: 2008-09-17 12:04:00 -0400 (Wed, 17 Sep 2008)
New Revision: 2277

Added:
   projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessNotFoundException.java
   projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/PersistenceService.java
Modified:
   projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/HibernatePersistenceService.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
   projects/jbpm-spec/trunk/modules/ri/src/test/java/org/jboss/bpm/client/PersistenceServiceTest.java
Log:
More WIP on Persistence

Added: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessNotFoundException.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessNotFoundException.java	                        (rev 0)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessNotFoundException.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -0,0 +1,45 @@
+/*
+ * 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.jboss.bpm;
+
+
+// $Id$
+
+/**
+ * A RuntimeException that is when a process cannot be found in persistent storage.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 18-Sep-2008
+ */
+ at SuppressWarnings("serial")
+public class ProcessNotFoundException extends BPMException
+{
+  public ProcessNotFoundException()
+  {
+    super();
+  }
+
+  public ProcessNotFoundException(String message)
+  {
+    super(message);
+  }
+}


Property changes on: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/ProcessNotFoundException.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Added: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/PersistenceService.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/PersistenceService.java	                        (rev 0)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/PersistenceService.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -0,0 +1,44 @@
+/*
+ * 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.jboss.bpm.client;
+
+// $Id$
+
+import javax.management.ObjectName;
+
+import org.jboss.bpm.model.Process;
+
+/**
+ * The persistence service for a process.
+ * 
+ * @author thomas.diesler at jboss.com
+ * @since 17-Sep-2008
+ */
+public interface PersistenceService
+{
+  void saveProcess(Process proc);
+
+  Process loadProcess(ObjectName procID);
+
+  void deleteProcess(Process proc);
+
+}
\ No newline at end of file


Property changes on: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/PersistenceService.java
___________________________________________________________________
Name: svn:keywords
   + Id Revision
Name: svn:eol-style
   + LF

Modified: projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -52,7 +52,7 @@
  * @author thomas.diesler at jboss.com
  * @since 18-Jun-2008
  */
-public abstract class ProcessManager
+public abstract class ProcessManager implements PersistenceService
 {
   // provide logging
   private static final Log log = LogFactory.getLog(ProcessManager.class);

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/HibernatePersistenceService.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/HibernatePersistenceService.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/client/HibernatePersistenceService.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -33,10 +33,14 @@
 import org.hibernate.classic.Session;
 import org.jboss.bpm.ProcessNotFoundException;
 import org.jboss.bpm.client.PersistenceService;
+import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.Process;
 import org.jboss.bpm.ri.model.impl.AbstractElementImpl;
+import org.jboss.bpm.ri.model.impl.EndEventImpl;
+import org.jboss.bpm.ri.model.impl.FlowObjectImpl;
+import org.jboss.bpm.ri.model.impl.NoneTaskImpl;
 import org.jboss.bpm.ri.model.impl.ProcessImpl;
-import org.jboss.bpm.ri.model.impl.SupportingElementImpl;
+import org.jboss.bpm.ri.model.impl.StartEventImpl;
 
 /**
  * A Hibernate based persistence service for a process.
@@ -89,7 +93,7 @@
     }
     return proc;
   }
-  
+
   public void deleteProcess(Process proc)
   {
     Session session = getSessionFactory().openSession();
@@ -107,16 +111,18 @@
 
   private SessionFactory getSessionFactory()
   {
+    if (hibernateConfig == null)
+      throw new IllegalStateException("Hibernate config property cannot be null");
+
     if (sessionFactory == null)
     {
       AnnotationConfiguration anConfig = new AnnotationConfiguration();
-      for(Class clazz : ProcessImpl.class.getClasses())
-      {
-        System.out.println(clazz);
-      }
+      anConfig.addAnnotatedClass(AbstractElementImpl.class);
+      anConfig.addAnnotatedClass(EndEventImpl.class);
+      anConfig.addAnnotatedClass(FlowObjectImpl.class);
+      anConfig.addAnnotatedClass(NoneTaskImpl.class);
       anConfig.addAnnotatedClass(ProcessImpl.class);
-      anConfig.addAnnotatedClass(SupportingElementImpl.class);
-      anConfig.addAnnotatedClass(AbstractElementImpl.class);
+      anConfig.addAnnotatedClass(StartEventImpl.class);
       sessionFactory = anConfig.configure(hibernateConfig).buildSessionFactory();
     }
     return sessionFactory;

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/AbstractElementImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -26,6 +26,8 @@
 import javax.management.ObjectName;
 import javax.persistence.Column;
 import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
 
 import org.jboss.bpm.model.AbstractElement;
 import org.jboss.bpm.model.Process;
@@ -37,6 +39,7 @@
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
+ at MappedSuperclass
 public abstract class AbstractElementImpl implements AbstractElement
 {
   // provide serial version UID
@@ -67,6 +70,7 @@
   /**
    * Get the ID of this element
    */
+  @Transient
   public abstract ObjectName getID();
   
   /**

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ActivityImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -27,6 +27,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.persistence.Transient;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jboss.bpm.InvalidProcessException;
@@ -73,16 +75,24 @@
     super(name);
   }
 
+  // Persistence ctor
+  protected ActivityImpl()
+  {
+  }
+
+  @Transient
   public int getStartQuantity()
   {
     throw new NotImplementedException("JBPM-1631", "Activity startQuantity");
   }
 
+  @Transient
   public int getCompletionQuantity()
   {
     throw new NotImplementedException("JBPM-1632", "Activity completionQuantity");
   }
 
+  @Transient
   public List<Expression> getIORules()
   {
     return Collections.unmodifiableList(ioRules);
@@ -93,6 +103,7 @@
     ioRules.add(expr);
   }
 
+  @Transient
   public List<InputSet> getInputSets()
   {
     return Collections.unmodifiableList(inputSets);
@@ -103,6 +114,7 @@
     inputSets.add(inputSet);
   }
 
+  @Transient
   public List<OutputSet> getOutputSets()
   {
     return Collections.unmodifiableList(outputSets);
@@ -113,11 +125,13 @@
     outputSets.add(outputSet);
   }
 
+  @Transient
   public LoopType getLoopType()
   {
     throw new NotImplementedException("JBPM-1633", "Activity loopType");
   }
 
+  @Transient
   public List<String> getPerformers()
   {
     throw new NotImplementedException("JBPM-1634", "Activity Performers");
@@ -145,11 +159,13 @@
     return prop != null ? prop.getValue(clazz) : null;
   }
   
+  @Transient
   public List<Property> getProperties()
   {
     return Collections.unmodifiableList(props);
   }
 
+  @Transient
   public List<String> getPropertyNames()
   {
     List<String> names = new ArrayList<String>();
@@ -165,6 +181,7 @@
     props.add(prop);
   }
 
+  @Transient
   public ConnectingObject getInFlow()
   {
     return inFlow;
@@ -175,6 +192,7 @@
     this.inFlow = inFlow;
   }
 
+  @Transient
   public SequenceFlow getOutFlow()
   {
     return outFlow;

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EndEventImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -28,6 +28,9 @@
 import java.util.List;
 
 import javax.management.ObjectName;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -56,6 +59,8 @@
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
+ at Entity
+ at Table(name = "JBPM_END_EVENT")
 public class EndEventImpl extends EventImpl implements EndEvent, SingleInFlowSetterSupport
 {
   // provide logging
@@ -71,7 +76,13 @@
     super(name);
   }
 
+  // Persistence ctor
+  protected EndEventImpl()
+  {
+  }
+
   @Override
+  @Transient
   public ObjectName getID()
   {
     if (id == null)
@@ -83,6 +94,7 @@
     return id;
   }
   
+  @Transient
   public SequenceFlow getInFlow()
   {
     return inFlow;
@@ -101,6 +113,7 @@
     resultSet.add(result);
   }
 
+  @Transient
   public List<EventDetail> getResult()
   {
     return Collections.unmodifiableList(resultSet);
@@ -130,6 +143,7 @@
     exContext.addAttachment(EndSignalCallback.class, new EndSignalCallback(tokenExecutor));
   }
 
+  @Transient
   public SignalHandler getSignalHandler()
   {
     SignalHandler handler = super.getSignalHandler();
@@ -174,11 +188,6 @@
     }
   }
 
-  public String toString()
-  {
-    return "EndEvent[" + getName() + "]";
-  }
-
   /**
    * The callback that destroys the token AFTER the SYSTEM_END_EVENT_EXIT signal
    */
@@ -195,4 +204,9 @@
       tokenExecutor.destroy(token);
     }
   }
+
+  public String toString()
+  {
+    return "EndEvent[" + getName() + "]";
+  }
 }
\ No newline at end of file

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/EventImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -41,4 +41,10 @@
   {
     super(name);
   }
+  
+  // Persistence ctor
+  protected EventImpl()
+  {
+  }
+
 }
\ No newline at end of file

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -51,6 +51,11 @@
     this.targetName = targetName;
   }
 
+  // Persistence ctor
+  protected FlowImpl()
+  {
+  }
+
   public String getName()
   {
     return name;

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/FlowObjectImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -25,6 +25,10 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.persistence.ManyToOne;
+import javax.persistence.MappedSuperclass;
+import javax.persistence.Transient;
+
 import org.jboss.bpm.InvalidProcessException;
 import org.jboss.bpm.NameNotUniqueException;
 import org.jboss.bpm.model.Assignment;
@@ -47,16 +51,17 @@
 //$Id$
 
 /**
- * A Flow Object is one of the set of following graphical objects: Event, Activity, and 
+ * A Flow Object is one of the set of following graphical objects: Event, Activity, and
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
+ at MappedSuperclass
 public abstract class FlowObjectImpl extends GraphicalElementImpl implements FlowObject, HandlerSetterSupport
 {
   // provide serial version UID
   private static final long serialVersionUID = 1L;
-  
+
   private String name;
   private Process proc;
   private FlowHandler flowHandler;
@@ -69,6 +74,13 @@
     this.name = name;
   }
 
+  // Persistence ctor
+  protected FlowObjectImpl()
+  {
+  }
+
+  //@ManyToOne(targetEntity = ProcessImpl.class)
+  @Transient
   public Process getProcess()
   {
     return proc;
@@ -84,6 +96,7 @@
     this.name = name;
   }
 
+  @Transient
   public List<Assignment> getAssignments()
   {
     return Collections.unmodifiableList(assignments);
@@ -94,6 +107,7 @@
     this.assignments.add(assignment);
   }
 
+  @Transient
   public ExecutionHandler getExecutionHandler()
   {
     return executionHandler;
@@ -104,6 +118,7 @@
     this.executionHandler = executionHandler;
   }
 
+  @Transient
   public FlowHandler getFlowHandler()
   {
     return flowHandler;
@@ -114,6 +129,7 @@
     this.flowHandler = flowHandler;
   }
 
+  @Transient
   public SignalHandler getSignalHandler()
   {
     return signalHandler;
@@ -164,7 +180,7 @@
         processAssignment(ass, token);
     }
   }
-  
+
   protected void processAssignment(Assignment ass, Token token)
   {
     Expression expr = ass.getFrom();

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/NoneTaskImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -21,16 +21,20 @@
  */
 package org.jboss.bpm.ri.model.impl;
 
+//$Id$
 
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import javax.persistence.Transient;
 
-//$Id$
-
 /**
  * Task that corresponds to the TaskType.None
  * 
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
+ at Entity
+ at Table(name = "JBPM_NONE_TASK")
 public class NoneTaskImpl extends TaskImpl 
 {
   // provide serial version UID
@@ -41,7 +45,13 @@
     super(name);
   }
   
+  // Persistence ctor
+  protected NoneTaskImpl()
+  {
+  }
+
   @Override
+  @Transient
   public TaskType getTaskType()
   {
     return TaskType.None;

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/ProcessImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -32,10 +32,10 @@
 import java.util.List;
 
 import javax.management.ObjectName;
-import javax.persistence.Column;
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Inheritance;
+import javax.persistence.FetchType;
+import javax.persistence.OneToMany;
 import javax.persistence.Table;
 import javax.persistence.Transient;
 
@@ -99,15 +99,7 @@
   {
   }
 
-  @Id
-  @Column(name = "id")
   @Override
-  public String getKey()
-  {
-    return super.getKey();
-  }
-
-  @Override
   @Transient
   public ObjectName getID()
   {
@@ -276,6 +268,7 @@
     return em.waitForEnd(this, timeout);
   }
 
+  //@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER, mappedBy = "process", targetEntity = FlowObjectImpl.class)
   @Transient
   public List<FlowObject> getFlowObjects()
   {

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SequenceFlowImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -23,6 +23,9 @@
 
 //$Id$
 
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
 import org.jboss.bpm.model.Expression;
 import org.jboss.bpm.model.FlowObject;
 import org.jboss.bpm.model.SequenceFlow;
@@ -34,6 +37,8 @@
  * @author thomas.diesler at jboss.com
  * @since 08-Jul-2008
  */
+ at Entity
+ at Table(name = "JBPM_SEQUENCE_FLOW")
 public class SequenceFlowImpl extends FlowImpl implements SequenceFlow
 {
   // provide serial version UID
@@ -54,6 +59,11 @@
     this.conditionExpression = expr;
   }
 
+  // Persistence ctor
+  protected SequenceFlowImpl()
+  {
+  }
+
   public ConditionType getConditionType()
   {
     return conditionType;

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/StartEventImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -30,6 +30,7 @@
 import javax.management.ObjectName;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -77,7 +78,13 @@
     super(name == null ? "Start" : name);
   }
 
+  // Persistence ctor
+  protected StartEventImpl()
+  {
+  }
+
   @Override
+  @Transient
   public ObjectName getID()
   {
     if (id == null)
@@ -89,6 +96,7 @@
     return id;
   }
   
+  @Transient
   public List<EventDetail> getTrigger()
   {
     return Collections.unmodifiableList(triggers);
@@ -99,6 +107,7 @@
     triggers.add(eventDetail);
   }
 
+  @Transient
   public SequenceFlow getOutFlow()
   {
     return outFlow;
@@ -115,6 +124,7 @@
     tokenExecutor.move(token, getOutFlow());
   }
 
+  @Transient
   public SignalHandler getSignalHandler()
   {
     SignalHandler handler = super.getSignalHandler();

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/SupportingElementImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -24,6 +24,7 @@
 //$Id$
 
 import javax.management.ObjectName;
+import javax.persistence.Transient;
 
 import org.jboss.bpm.model.Constants;
 import org.jboss.bpm.model.ObjectNameFactory;
@@ -42,6 +43,7 @@
   private static final long serialVersionUID = 1L;
   
   @Override
+  @Transient
   public ObjectName getID()
   {
     if (id == null)

Modified: projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/main/java/org/jboss/bpm/ri/model/impl/TaskImpl.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -22,6 +22,7 @@
 package org.jboss.bpm.ri.model.impl;
 
 import javax.management.ObjectName;
+import javax.persistence.Transient;
 
 import org.jboss.bpm.client.SignalManager;
 import org.jboss.bpm.model.Constants;
@@ -53,6 +54,12 @@
     super(name);
   }
 
+  // Persistence ctor
+  protected TaskImpl()
+  {
+  }
+
+  @Transient
   public ActivityType getActivityType()
   {
     return ActivityType.Task;
@@ -61,6 +68,7 @@
   public abstract TaskType getTaskType();
 
   @Override
+  @Transient
   public ObjectName getID()
   {
     if (id == null)
@@ -72,6 +80,7 @@
     return id;
   }
   
+  @Transient
   public SignalHandler getSignalHandler()
   {
     SignalHandler handler = super.getSignalHandler();

Modified: projects/jbpm-spec/trunk/modules/ri/src/test/java/org/jboss/bpm/client/PersistenceServiceTest.java
===================================================================
--- projects/jbpm-spec/trunk/modules/ri/src/test/java/org/jboss/bpm/client/PersistenceServiceTest.java	2008-09-17 15:58:09 UTC (rev 2276)
+++ projects/jbpm-spec/trunk/modules/ri/src/test/java/org/jboss/bpm/client/PersistenceServiceTest.java	2008-09-17 16:04:00 UTC (rev 2277)
@@ -71,7 +71,7 @@
   /**
    * Test execution of a loaded process
    */
-  public void _testStartLoaded() throws Exception
+  public void testStartLoaded() throws Exception
   {
     ProcessManager pm = ProcessManager.locateProcessManager();
 
@@ -84,13 +84,13 @@
       proc = pm.loadProcess(proc.getID());
       
       // Start the process
-      proc.startProcess();
-      proc.waitForEnd();
+      //proc.startProcess();
+      //proc.waitForEnd();
     }
     finally
     {
       // Delete the process
-      pm.deleteProcess(proc);
+      //pm.deleteProcess(proc);
     }
   }
   




More information about the jbpm-commits mailing list