[jbpm-commits] JBoss JBPM SVN: r2477 - in projects/spec/trunk/modules: cts/src/test/java/org/jbpm/test/cts/service/persistence and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-10-04 08:59:53 -0400 (Sat, 04 Oct 2008) New Revision: 2477 Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Assignment.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Participant.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/persistence/PersistenceServiceTest.java projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/AssignmentImpl.java projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/EventImpl.java projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ParticipantImpl.java projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/SendTaskImpl.java Log: All pass Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Assignment.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Assignment.java 2008-10-04 12:30:21 UTC (rev 2476) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Assignment.java 2008-10-04 12:59:53 UTC (rev 2477) @@ -21,6 +21,8 @@ */ package org.jbpm.api.model; +import java.io.Serializable; + //$Id$ /** @@ -30,7 +32,7 @@ * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface Assignment +public interface Assignment extends Serializable { public enum AssignTime { Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java 2008-10-04 12:30:21 UTC (rev 2476) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Expression.java 2008-10-04 12:59:53 UTC (rev 2477) @@ -21,6 +21,8 @@ */ package org.jbpm.api.model; +import java.io.Serializable; + //$Id$ /** @@ -30,7 +32,7 @@ * @author thomas.diesler(a)jboss.com * @since 21-Jul-2008 */ -public interface Expression +public interface Expression extends Serializable { enum ExpressionLanguage { Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Participant.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Participant.java 2008-10-04 12:30:21 UTC (rev 2476) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Participant.java 2008-10-04 12:59:53 UTC (rev 2477) @@ -23,17 +23,17 @@ //$Id$ +import java.io.Serializable; + import javax.management.ObjectName; - - /** * A Participant, which is used in the definition of attributes for a Pool, {@link Message}, and WebService * * @author thomas.diesler(a)jboss.com * @since 21-Jul-2008 */ -public interface Participant +public interface Participant extends Serializable { /** * The name of this participant Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/persistence/PersistenceServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/persistence/PersistenceServiceTest.java 2008-10-04 12:30:21 UTC (rev 2476) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/persistence/PersistenceServiceTest.java 2008-10-04 12:59:53 UTC (rev 2477) @@ -32,6 +32,7 @@ import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Task; import org.jbpm.api.service.PersistenceService; +import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.test.CTSTestCase; import org.jbpm.test.cts.service.process.ProcessCatalog; @@ -85,12 +86,15 @@ */ public void testProcess() throws Exception { + ProcessDefinitionService procDefService = ProcessDefinitionService.locateProcessDefinitionService(); PersistenceService service = PersistenceService.locatePersistenceService(); + // Register (save) the process definition, which is not done implicitly by saveProcess ProcessDefinition procDef = unregisterOnTearDown(ProcessCatalog.getDefaultProcess()); + procDefService.registerProcessDefinition(procDef); + + // Create and save the Process Process proc = procDef.newInstance(); - - // Save the Process service.saveProcess(proc); // Load the process Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/AssignmentImpl.java =================================================================== --- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/AssignmentImpl.java 2008-10-04 12:30:21 UTC (rev 2476) +++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/AssignmentImpl.java 2008-10-04 12:59:53 UTC (rev 2477) @@ -41,6 +41,8 @@ @Entity(name = "Assignment") public class AssignmentImpl implements Assignment { + private static final long serialVersionUID = 1L; + @Enumerated(EnumType.STRING) private AssignTime assignTime; @Embedded Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/EventImpl.java =================================================================== --- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-10-04 12:30:21 UTC (rev 2476) +++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-10-04 12:59:53 UTC (rev 2477) @@ -35,6 +35,7 @@ import org.jbpm.api.model.Event; import org.jbpm.api.model.Message; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.Signal; @@ -202,4 +203,16 @@ procDefImpl.initializeMessageRef(messageRef); } } + + @Override + protected void create(Process proc) + { + super.create(proc); + + if (messageRef != null) + { + ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)proc.getProcessDefinition(); + procDefImpl.initializeMessageRef(messageRef); + } + } } \ No newline at end of file Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ParticipantImpl.java =================================================================== --- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ParticipantImpl.java 2008-10-04 12:30:21 UTC (rev 2476) +++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ParticipantImpl.java 2008-10-04 12:59:53 UTC (rev 2477) @@ -42,6 +42,8 @@ @Entity(name = "Participant") public class ParticipantImpl implements Participant { + private static final long serialVersionUID = 1L; + @Id @GeneratedValue @SuppressWarnings("unused") private int id; Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java =================================================================== --- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-10-04 12:30:21 UTC (rev 2476) +++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-10-04 12:59:53 UTC (rev 2477) @@ -34,6 +34,7 @@ import org.jbpm.api.client.MessageListener; import org.jbpm.api.model.Message; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.ExecutionContext; @@ -209,4 +210,13 @@ ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)procDef; procDefImpl.initializeMessageRef(messageRef); } + + @Override + protected void create(Process proc) + { + super.create(proc); + + ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)proc.getProcessDefinition(); + procDefImpl.initializeMessageRef(messageRef); + } } \ No newline at end of file Modified: projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/SendTaskImpl.java =================================================================== --- projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-10-04 12:30:21 UTC (rev 2476) +++ projects/spec/trunk/modules/impl/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-10-04 12:59:53 UTC (rev 2477) @@ -29,6 +29,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.model.Message; import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.ExecutionHandler; @@ -115,4 +116,13 @@ if (messageRef.getToRef() == null) throw new IllegalArgumentException("Message target cannot be null for: " + this); } + + @Override + protected void create(Process proc) + { + super.create(proc); + + ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)proc.getProcessDefinition(); + procDefImpl.initializeMessageRef(messageRef); + } } \ No newline at end of file