[jbpm-commits] JBoss JBPM SVN: r1905 - in jbossbpm/spec/trunk/modules: api/src/main/java/org/jboss/bpm/test and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Aug 15 10:46:03 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-08-15 10:46:03 -0400 (Fri, 15 Aug 2008)
New Revision: 1905
Modified:
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/sequence/SequenceMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeMarshallerTest.java
jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationMarshallerTest.java
Log:
Simplify marshallProcess
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/client/ProcessManager.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -142,7 +142,7 @@
public void registerProcess(Process proc)
{
if (ProcessEngine.locateProcessEngine().isPrepareForShutdown())
- throw new EngineShutdownException("Cannot register process while engine is shutting down");
+ throw new EngineShutdownException("Cannot register a process while engine is shutting down");
log.debug("registerProcess: " + proc);
procs.put(proc.getID(), proc);
@@ -162,6 +162,9 @@
*/
public void startProcess(ObjectName procID, Attachments att)
{
+ if (ProcessEngine.locateProcessEngine().isPrepareForShutdown())
+ throw new EngineShutdownException("Cannot start a process while engine is shutting down");
+
Process proc = getProcessStrict(procID);
ExecutionManager exm = ExecutionManager.locateExecutionManager();
exm.startProcess(proc, att);
Modified: jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java
===================================================================
--- jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/api/src/main/java/org/jboss/bpm/test/AbstractAPITestCase.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -26,6 +26,7 @@
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.StringWriter;
import java.io.Writer;
import java.net.URL;
import java.util.ArrayList;
@@ -216,7 +217,7 @@
* Marshall the given process
* @param out if null, the proces is marshalled to a file
*/
- public void marshallProcess(Process proc, Writer out)
+ public String _marshallProcess(Process proc, Writer out)
{
try
{
@@ -227,13 +228,28 @@
System.out.println("Marshall process to: " + file.getCanonicalPath());
}
- ProcessManager pm = ProcessManager.locateProcessManager();
- DialectHandler dhapi = pm.getDialectHandler(DialectHandler.DEFAULT_NAMESPACE_URI);
- dhapi.marshallProcess(proc, out);
+ String procXML = marshallProcess(proc);
+ out.write(procXML);
+ out.close();
+
+ return procXML;
}
catch (IOException ex)
{
throw new BPMException("Cannot marshall process", ex);
}
}
+
+ /**
+ * Marshall the given process
+ */
+ public String marshallProcess(Process proc) throws IOException
+ {
+ ProcessManager pm = ProcessManager.locateProcessManager();
+ DialectHandler dhapi = pm.getDialectHandler(DialectHandler.DEFAULT_NAMESPACE_URI);
+
+ StringWriter strwr = new StringWriter();
+ dhapi.marshallProcess(proc, strwr);
+ return strwr.toString();
+ }
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,7 +23,7 @@
// $Id$
-import java.io.StringWriter;
+import java.io.IOException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -37,14 +37,12 @@
*/
public class ActivityPropertyMarshallerTest extends ActivityPropertyTest
{
- protected Process getProcess()
+ protected Process getProcess() throws IOException
{
Process proc = super.getProcess();
// Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
+ String procXML = marshallProcess(proc);
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/activity/ActivityPropertyTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,6 +23,7 @@
// $Id$
+import java.io.IOException;
import java.util.Collection;
import org.jboss.bpm.model.ActivityBuilder;
@@ -60,7 +61,7 @@
assertEquals("ActivityProperties.TaskA.foo", key.getNamePart());
}
- protected Process getProcess()
+ protected Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("ActivityProperties").addStartEvent("Start").addSequenceFlow("TaskA");
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/engine/EngineShutdownTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,12 +23,12 @@
// $Id$
-import java.net.URL;
-
import org.jboss.bpm.EngineShutdownException;
import org.jboss.bpm.client.ProcessEngine;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
+import org.jboss.bpm.model.ProcessBuilder;
+import org.jboss.bpm.model.ProcessBuilderFactory;
import org.jboss.bpm.test.DefaultEngineTestCase;
/**
@@ -42,18 +42,18 @@
public void testCreateProcess() throws Exception
{
ProcessEngine engine = ProcessEngine.locateProcessEngine();
- URL jpdlURL = getResourceURL("cts/engine/basic-engine-" + getDialect() + ".xml");
// Create a Process through the ProcessManager
ProcessManager pm = ProcessManager.locateProcessManager();
- Process proc = pm.createProcess(jpdlURL);
+ String procXML = marshallProcess(getProcess());
+ Process proc = pm.createProcess(procXML);
assertNotNull("Process expected", proc);
// Try to create a Process during shutdown
try
{
engine.prepareForShutdown();
- proc = pm.createProcess(jpdlURL);
+ proc = pm.createProcess(procXML);
assertNotNull("Process expected", proc);
}
finally
@@ -65,11 +65,11 @@
public void testRegisterProcess() throws Exception
{
ProcessEngine engine = ProcessEngine.locateProcessEngine();
- URL jpdlURL = getResourceURL("cts/engine/basic-engine-" + getDialect() + ".xml");
// Create a Process through the ProcessManager
ProcessManager pm = ProcessManager.locateProcessManager();
- Process proc = pm.createProcess(jpdlURL);
+ String procXML = marshallProcess(getProcess());
+ Process proc = pm.createProcess(procXML);
assertNotNull("Process expected", proc);
// Try to register a Process during shutdown
@@ -87,4 +87,13 @@
engine.cancelShutdown();
}
}
+
+ private Process getProcess()
+ {
+ ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
+ procBuilder.addProcess("EngineShutdown").addStartEvent("Start").addSequenceFlow("TaskA");
+ procBuilder.addTask("TaskA").addSequenceFlow("End").addEndEvent("End");
+ Process proc = procBuilder.getProcess();
+ return proc;
+ }
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,7 +23,7 @@
// $Id$
-import java.io.StringWriter;
+import java.io.IOException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -37,19 +37,14 @@
public class ExclusiveGatewayMergeMarshallerTest extends ExclusiveGatewayMergeTest
{
@Override
- public Process getProcess()
+ public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewayMergeTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,6 +23,8 @@
// $Id$
+import java.io.IOException;
+
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.EventBuilder;
@@ -127,7 +129,7 @@
assertEquals("TaskA", TaskC.taskValue);
}
- public Process getProcess()
+ public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,7 +23,7 @@
// $Id$
-import java.io.StringWriter;
+import java.io.IOException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -37,19 +37,14 @@
public class ExclusiveGatewaySplitMarshallerTest extends ExclusiveGatewaySplitTest
{
@Override
- public Process getProcess()
+ public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,6 +23,7 @@
// $Id$
+import java.io.IOException;
import java.util.List;
import org.jboss.bpm.model.GatewayBuilder;
@@ -90,7 +91,7 @@
}
}
- public Process getProcess()
+ public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,7 +23,7 @@
// $Id$
-import java.io.StringWriter;
+import java.io.IOException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -37,19 +37,14 @@
public class InclusiveGatewayMergeMarshallerTest extends InclusiveGatewayMergeTest
{
@Override
- public Process getProcess()
+ public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewayMergeTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,6 +23,7 @@
// $Id$
+import java.io.IOException;
import java.util.List;
import org.jboss.bpm.client.SignalListener;
@@ -66,7 +67,7 @@
assertEquals(2, endSignals.size());
}
- public Process getProcess()
+ public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,7 +23,7 @@
// $Id$
-import java.io.StringWriter;
+import java.io.IOException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -37,19 +37,14 @@
public class InclusiveGatewaySplitMarshallerTest extends InclusiveGatewaySplitTest
{
@Override
- public Process getProcess()
+ public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/inclusive/InclusiveGatewaySplitTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,6 +23,7 @@
// $Id$
+import java.io.IOException;
import java.util.List;
import org.jboss.bpm.model.GatewayBuilder;
@@ -71,7 +72,7 @@
assertEquals("EndB", endSignals.get(0).getFromRef());
}
- public Process getProcess()
+ public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split");
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,7 +23,7 @@
//$Id$
-import java.io.StringWriter;
+import java.io.IOException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -38,19 +38,14 @@
public class ParallelGatewayMergeMarshallerTest extends ParallelGatewayMergeTest
{
@Override
- public Process getProcess()
+ public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewayMergeTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,6 +23,8 @@
// $Id$
+import java.io.IOException;
+
import org.jboss.bpm.client.SignalListener;
import org.jboss.bpm.client.SignalManager;
import org.jboss.bpm.model.EventBuilder;
@@ -128,7 +130,7 @@
assertEquals("TaskA:TaskB", TaskC.taskValue);
}
- public Process getProcess()
+ public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
EventBuilder eventBuilder = procBuilder.addProcess(getName()).addStartEvent("StartA");
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,7 +23,7 @@
// $Id$
-import java.io.StringWriter;
+import java.io.IOException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -37,19 +37,14 @@
public class ParallelGatewaySplitMarshallerTest extends ParallelGatewaySplitTest
{
@Override
- public Process getProcess()
+ public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/gateway/parallel/ParallelGatewaySplitTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,6 +23,7 @@
// $Id$
+import java.io.IOException;
import java.util.List;
import org.jboss.bpm.model.Process;
@@ -56,7 +57,7 @@
assertTrue("Unexpected from refs: " + fromRefs, fromRefs.contains("EndB"));
}
- public Process getProcess()
+ public Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
Process proc = procBuilder.addProcess(getName()).addStartEvent("Start").addSequenceFlow("Split").addGateway("Split", GatewayType.Parallel).
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,7 +23,7 @@
// $Id$
-import java.io.StringWriter;
+import java.io.IOException;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -37,19 +37,14 @@
*/
public class ProcessPropertyMarshallerTest extends ProcessPropertyTest
{
- protected Process getProcess()
+ protected Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/cts/process/ProcessPropertyTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -23,6 +23,7 @@
// $Id$
+import java.io.IOException;
import java.util.Collection;
import org.jboss.bpm.model.Process;
@@ -61,7 +62,7 @@
assertEquals("ProcessProperties.foo", key.getNamePart());
}
- protected Process getProcess()
+ protected Process getProcess() throws IOException
{
ProcessBuilder procBuilder = ProcessBuilderFactory.newInstance().newProcessBuilder();
procBuilder.addProcess("ProcessProperties").addStartEvent("Start").addSequenceFlow("TaskA");
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/exclusivechoice/ExclusiveChoiceMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -24,7 +24,6 @@
// $Id$
import java.io.IOException;
-import java.io.StringWriter;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -40,17 +39,12 @@
@Override
public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/multichoice/MultiChoiceMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -24,7 +24,6 @@
// $Id$
import java.io.IOException;
-import java.io.StringWriter;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -40,17 +39,12 @@
@Override
public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
\ No newline at end of file
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/parallelsplit/ParallelSplitMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -24,7 +24,6 @@
// $Id$
import java.io.IOException;
-import java.io.StringWriter;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -40,17 +39,12 @@
@Override
public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/sequence/SequenceMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/sequence/SequenceMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/sequence/SequenceMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -24,7 +24,6 @@
// $Id$
import java.io.IOException;
-import java.io.StringWriter;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -39,17 +38,12 @@
{
public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/simplemerge/SimpleMergeMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -24,7 +24,6 @@
// $Id$
import java.io.IOException;
-import java.io.StringWriter;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -40,17 +39,12 @@
@Override
public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
Modified: jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationMarshallerTest.java
===================================================================
--- jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationMarshallerTest.java 2008-08-15 14:26:02 UTC (rev 1904)
+++ jbossbpm/spec/trunk/modules/testsuite/src/test/java/org/jboss/bpm/pattern/control/synchronization/SynchronizationMarshallerTest.java 2008-08-15 14:46:03 UTC (rev 1905)
@@ -24,7 +24,6 @@
//$Id$
import java.io.IOException;
-import java.io.StringWriter;
import org.jboss.bpm.client.ProcessManager;
import org.jboss.bpm.model.Process;
@@ -41,17 +40,12 @@
@Override
public Process getProcess() throws IOException
{
+ // Marshall the process to a string
Process proc = super.getProcess();
+ String procXML = marshallProcess(proc);
- // Marshall the process to a string
- StringWriter strwr = new StringWriter();
- marshallProcess(proc, strwr);
- String procXML = strwr.toString();
-
// Recreate the process from the marshalled process
ProcessManager procManager = ProcessManager.locateProcessManager();
- proc = procManager.createProcess(procXML);
-
- return proc;
+ return procManager.createProcess(procXML);
}
}
More information about the jbpm-commits
mailing list