[jbpm-commits] JBoss JBPM SVN: r2939 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/test and 5 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Sat Nov 15 06:16:48 EST 2008
Author: thomas.diesler at jboss.com
Date: 2008-11-15 06:16:48 -0500 (Sat, 15 Nov 2008)
New Revision: 2939
Modified:
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshallerExt.java
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java
projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java
projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java
Log:
Fix event detail type
Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Event.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -55,9 +55,4 @@
* Get the type of this event
*/
EventType getEventType();
-
- /**
- * Get the detail type fopr this event
- */
- EventDetailType getDetailType();
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/StartEvent.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -21,7 +21,6 @@
*/
package org.jbpm.api.model;
-
// $Id$
/**
@@ -43,4 +42,9 @@
* Get the outgoing SequenceFlow
*/
SequenceFlow getOutFlow();
+
+ /**
+ * Get the detail type fopr this event
+ */
+ EventDetailType getTriggerType();
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -74,12 +74,12 @@
private List<Message> messages = new ArrayList<Message>();
// Unregister this process definition on tearDown
private ProcessDefinition procDef;
-
+
protected ProcessEngine getProcessEngine()
{
return Configuration.getProcessEngine();
}
-
+
protected ProcessDefinition unregisterOnTearDown(ProcessDefinition procDef)
{
this.procDef = procDef;
@@ -90,36 +90,34 @@
protected void setUp() throws Exception
{
super.setUp();
-
+
ProcessEngine engine = getProcessEngine();
-
+
// Setup the SignalListener
- clearAllSignalListeners();
SignalService sigService = engine.getService(SignalService.class);
- sigService.addSignalListener(getSignalListener());
- synchronized (signals)
+ if (sigService != null)
{
- signals.clear();
+ clearAllSignalListeners(sigService);
+ sigService.addSignalListener(getSignalListener());
+ synchronized (signals)
+ {
+ signals.clear();
+ }
}
// Setup the MessageListener
- clearAllMessageListeners();
MessageService msgService = engine.getService(MessageService.class);
- msgService.addMessageListener(getMessageListener());
+ if (msgService != null)
+ {
+ clearAllMessageListeners(msgService);
+ msgService.addMessageListener(getMessageListener());
+ }
}
-
+
@Override
protected void tearDown() throws Exception
{
ProcessEngine engine = getProcessEngine();
-
- // Tear down the SignalListener
- SignalService sigService = engine.getService(SignalService.class);
- sigService.removeSignalListener(getSignalListener());
-
- // Tear down the MessageListener
- MessageService msgService = engine.getService(MessageService.class);
- msgService.removeMessageListener(getTestID());
// Auto unregister
ProcessDefinitionService procDefService = ProcessDefinitionService.locateProcessDefinitionService();
@@ -128,7 +126,7 @@
procDefService.unregisterProcessDefinition(procDef.getKey());
procDef = null;
}
-
+
// Check that there are no registered processes left
Set<ObjectName> procs = procDefService.getProcessDefinitions();
if (procs.size() > 0)
@@ -138,24 +136,38 @@
log.error(logMsg);
}
- // Check that there are no registered signal listeners left
- Set<SignalListener> sigListeners = sigService.getSignalListeners();
- if (sigListeners.size() > 0)
+ // Tear down the SignalListener
+ SignalService sigService = engine.getService(SignalService.class);
+ if (sigService != null)
{
- String logMsg = "Registered signal listeners on tear down of " + getName() + ": " + sigListeners;
- System.out.println(logMsg);
- log.error(logMsg);
+ sigService.removeSignalListener(getSignalListener());
+
+ // Check that there are no registered signal listeners left
+ Set<SignalListener> sigListeners = sigService.getSignalListeners();
+ if (sigListeners.size() > 0)
+ {
+ String logMsg = "Registered signal listeners on tear down of " + getName() + ": " + sigListeners;
+ System.out.println(logMsg);
+ log.error(logMsg);
+ }
}
- // Check that there are no registered message listeners left
- Set<MessageListener> msgListeners = msgService.getMessageListeners();
- if (msgListeners.size() > 0)
+ // Tear down the MessageListener
+ MessageService msgService = engine.getService(MessageService.class);
+ if (msgService != null)
{
- String logMsg = "Registered message listeners on tear down of " + getName() + ": " + msgListeners;
- System.out.println(logMsg);
- log.error(logMsg);
+ msgService.removeMessageListener(getTestID());
+
+ // Check that there are no registered message listeners left
+ Set<MessageListener> msgListeners = msgService.getMessageListeners();
+ if (msgListeners.size() > 0)
+ {
+ String logMsg = "Registered message listeners on tear down of " + getName() + ": " + msgListeners;
+ System.out.println(logMsg);
+ log.error(logMsg);
+ }
}
-
+
super.tearDown();
}
@@ -174,7 +186,7 @@
return Collections.unmodifiableList(messages);
}
}
-
+
protected Signal newSignal(ObjectName fromRef, SignalType signalType, String message)
{
SignalBuilder sigBuilder = getProcessEngine().getService(SignalBuilderService.class).getSignalBuilder();
@@ -194,10 +206,9 @@
return Collections.unmodifiableList(retSignals);
}
}
-
- private void clearAllSignalListeners()
+
+ private void clearAllSignalListeners(SignalService sigService)
{
- SignalService sigService = getProcessEngine().getService(SignalService.class);
Set<SignalListener> sigListeners = sigService.getSignalListeners();
for (SignalListener sigListener : sigListeners)
{
@@ -205,9 +216,8 @@
}
}
- private void clearAllMessageListeners()
+ private void clearAllMessageListeners(MessageService msgService)
{
- MessageService msgService = getProcessEngine().getService(MessageService.class);
Set<MessageListener> msgListeners = msgService.getMessageListeners();
for (MessageListener msgListener : msgListeners)
{
@@ -225,7 +235,7 @@
{
return true;
}
-
+
public void catchSignal(Signal signal)
{
synchronized (signals)
@@ -266,9 +276,10 @@
}
return messageListener;
}
-
+
/**
* Marshall the given process
+ *
* @param out if null, the proces is marshalled to a file
*/
protected String marshallProcess(ProcessDefinition procDef, Writer out)
@@ -308,16 +319,16 @@
}
/**
- * Get the BPM descriptor dialect ID
+ * Get the BPM descriptor dialect ID
*/
protected String getDialect()
{
String dialect = System.getProperty("jbpm.dialect", "api10");
return dialect;
}
-
+
/**
- * Get the BPM descriptor dialect ID
+ * Get the BPM descriptor dialect ID
*/
protected URI getDialectURI()
{
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessBuilderTest.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -63,10 +63,10 @@
public void testNoStartName() throws Exception
{
ProcessBuilder builder = ProcessBuilderService.locateProcessBuilder();
- builder.addProcess("Proc").addStartEvent(null).addSequenceFlow("Task");
- builder.addTask("Task").addSequenceFlow("End").addEndEvent("End");
try
{
+ builder.addProcess("Proc").addStartEvent(null).addSequenceFlow("Task");
+ builder.addTask("Task").addSequenceFlow("End").addEndEvent("End");
builder.getProcessDefinition();
fail("StartEvent name required");
}
@@ -79,10 +79,10 @@
public void testNoTaskName() throws Exception
{
ProcessBuilder builder = ProcessBuilderService.locateProcessBuilder();
- builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
- builder.addTask(null).addSequenceFlow("End").addEndEvent("End");
try
{
+ builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
+ builder.addTask(null).addSequenceFlow("End").addEndEvent("End");
builder.getProcessDefinition();
fail("Task name required");
}
@@ -95,10 +95,10 @@
public void testNoEndName() throws Exception
{
ProcessBuilder builder = ProcessBuilderService.locateProcessBuilder();
- builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
- builder.addTask("Task").addSequenceFlow("End").addEndEvent(null);
try
{
+ builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
+ builder.addTask("Task").addSequenceFlow("End").addEndEvent(null);
builder.getProcessDefinition();
fail("EndEvent name required");
}
@@ -111,9 +111,9 @@
public void testNoStartEvent() throws Exception
{
ProcessBuilder builder = ProcessBuilderService.locateProcessBuilder();
- builder.addProcess("Proc").addTask("Task").addSequenceFlow("End").addEndEvent("End");
try
{
+ builder.addProcess("Proc").addTask("Task").addSequenceFlow("End").addEndEvent("End");
builder.getProcessDefinition();
fail("StartEvent required");
}
@@ -126,10 +126,10 @@
public void testNoEndEvent() throws Exception
{
ProcessBuilder builder = ProcessBuilderService.locateProcessBuilder();
- builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
- builder.addTask("Task");
try
{
+ builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
+ builder.addTask("Task");
builder.getProcessDefinition();
fail("EndEvent required");
}
@@ -142,10 +142,10 @@
public void testUnreachableNode() throws Exception
{
ProcessBuilder builder = ProcessBuilderService.locateProcessBuilder();
- builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task1");
- builder.addTask("Task1").addSequenceFlow("End").addTask("Task2").addSequenceFlow("End").addEndEvent("End");
try
{
+ builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task1");
+ builder.addTask("Task1").addSequenceFlow("End").addTask("Task2").addSequenceFlow("End").addEndEvent("End");
builder.getProcessDefinition();
fail("Unreachable node Task2");
}
@@ -158,10 +158,10 @@
public void testDeadEndNode() throws Exception
{
ProcessBuilder builder = ProcessBuilderService.locateProcessBuilder();
- builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
- builder.addTask("Task").addEndEvent("End");
try
{
+ builder.addProcess("Proc").addStartEvent("Start").addSequenceFlow("Task");
+ builder.addTask("Task").addEndEvent("End");
builder.getProcessDefinition();
fail("Dead end Task");
}
Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/preview/transaction/TxRequiredTest.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -26,7 +26,6 @@
import java.io.IOException;
import java.util.List;
-import org.hibernate.Transaction;
import org.jbpm.api.Constants;
import org.jbpm.api.Constants.TxType;
import org.jbpm.api.client.Token;
@@ -44,7 +43,6 @@
import org.jbpm.preview.model.Group.GroupType;
import org.jbpm.preview.model.builder.ProcessBuilderExt;
import org.jbpm.preview.runtime.ExecutionHandler;
-import org.jbpm.ri.runtime.TransactionAssociation;
/**
* Test two tasks with Tx attribute REQUIRED
@@ -115,10 +113,10 @@
@Override
public void execute(Token token)
{
- Transaction tx = TransactionAssociation.getTransaction();
- Boolean doRollback = token.getAttachments().getAttachment(Boolean.class, "rollback");
- if (doRollback == Boolean.TRUE)
- tx.rollback();
+// Transaction tx = TransactionAssociation.getTransaction();
+// Boolean doRollback = token.getAttachments().getAttachment(Boolean.class, "rollback");
+// if (doRollback == Boolean.TRUE)
+// tx.rollback();
}
@Override
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -115,7 +115,7 @@
jaxbStart.setName(start.getName());
jaxbStart.setOutFlow(getJAXBFlow(start.getOutFlow()));
- EventDetailType detailType = start.getDetailType();
+ EventDetailType detailType = start.getTriggerType();
// if (start.getTriggerType().size() > 1)
// throw new NotImplementedException("JBPM-1660", "StartTrigger Multiple");
@@ -152,7 +152,7 @@
JAXBEndEvent jaxbEnd = new JAXBEndEvent();
jaxbEnd.setName(end.getName());
- EventDetailType detailType = end.getDetailType();
+ EventDetailType detailType = end.getResultType();
// if (end.getResult().size() > 1)
// throw new NotImplementedException("JBPM-1683", "EndEvent Multiple Result");
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshallerExt.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshallerExt.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshallerExt.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -186,7 +186,7 @@
jaxbStart.setName(start.getName());
jaxbStart.setOutFlow(getJAXBFlow(start.getOutFlow()));
- EventDetailType detailType = start.getDetailType();
+ EventDetailType detailType = start.getTriggerType();
// if (start.getTriggerType().size() > 1)
// throw new NotImplementedException("JBPM-1660", "StartTrigger Multiple");
@@ -226,7 +226,7 @@
JAXBEndEvent jaxbEnd = new JAXBEndEvent();
jaxbEnd.setName(end.getName());
- EventDetailType detailType = end.getDetailType();
+ EventDetailType detailType = end.getResultType();
// if (end.getResult().size() > 1)
// throw new NotImplementedException("JBPM-1683", "EndEvent Multiple Result");
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -97,7 +97,6 @@
return eventType;
}
- @Override
public EventDetailType getDetailType()
{
return detailType;
Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java
===================================================================
--- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/EndEventPersistenceTest.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -51,7 +51,7 @@
EndEvent wasNode = loadNode(EndEventImpl.class, nodeID);
assertEquals("End", wasNode.getName());
- assertEquals(EventDetailType.None, wasNode.getDetailType());
+ assertEquals(EventDetailType.None, wasNode.getResultType());
deleteNode(wasNode);
}
@@ -67,7 +67,7 @@
EndEventExt wasNode = (EndEventExt)loadNode(EndEventImpl.class, nodeID);
assertEquals("End", wasNode.getName());
- assertEquals(EventDetailType.Signal, wasNode.getDetailType());
+ assertEquals(EventDetailType.Signal, wasNode.getResultType());
Signal wasSig = wasNode.getSignalRef();
assertEquals(SignalType.USER_SIGNAL, wasSig.getSignalType());
@@ -90,7 +90,7 @@
EndEventExt wasNode = (EndEventExt)loadNode(EndEventImpl.class, nodeID);
assertEquals("End", wasNode.getName());
- assertEquals(EventDetailType.Message, wasNode.getDetailType());
+ assertEquals(EventDetailType.Message, wasNode.getResultType());
Message wasMsg = wasNode.getMessageRef();
assertEquals("outMsg", wasMsg.getName());
Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java
===================================================================
--- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java 2008-11-14 19:16:12 UTC (rev 2938)
+++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/StartEventPersistenceTest.java 2008-11-15 11:16:48 UTC (rev 2939)
@@ -51,7 +51,7 @@
StartEvent wasNode = loadNode(StartEventImpl.class, nodeID);
assertEquals("Start", wasNode.getName());
- assertEquals(EventDetailType.None, wasNode.getDetailType());
+ assertEquals(EventDetailType.None, wasNode.getTriggerType());
deleteNode(wasNode);
}
@@ -67,7 +67,7 @@
StartEventExt wasNode = (StartEventExt)loadNode(StartEventImpl.class, nodeID);
assertEquals("Start", wasNode.getName());
- assertEquals(EventDetailType.Signal, wasNode.getDetailType());
+ assertEquals(EventDetailType.Signal, wasNode.getTriggerType());
Signal wasSig = wasNode.getSignalRef();
assertEquals(SignalType.USER_SIGNAL, wasSig.getSignalType());
@@ -90,7 +90,7 @@
StartEventExt wasNode = (StartEventExt)loadNode(StartEventImpl.class, nodeID);
assertEquals("Start", wasNode.getName());
- assertEquals(EventDetailType.Message, wasNode.getDetailType());
+ assertEquals(EventDetailType.Message, wasNode.getTriggerType());
Message wasMsg = wasNode.getMessageRef();
assertEquals("inMsg", wasMsg.getName());
More information about the jbpm-commits
mailing list