November 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r3055 - projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-24 09:27:07 -0500 (Mon, 24 Nov 2008) New Revision: 3055 Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestCase.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java Log: Expose deploy/undeploy Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestCase.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestCase.java 2008-11-24 14:14:07 UTC (rev 3054) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestCase.java 2008-11-24 14:27:07 UTC (rev 3055) @@ -70,6 +70,16 @@ return delegate.isTargetJBoss422(); } + public void deploy(String archive) throws Exception + { + delegate.deploy(archive); + } + + public void undeploy(String archive) throws Exception + { + delegate.undeploy(archive); + } + public MBeanServerConnection getServer() { return delegate.getServer(); Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java 2008-11-24 14:14:07 UTC (rev 3054) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/IntegrationTestHelper.java 2008-11-24 14:27:07 UTC (rev 3055) @@ -47,18 +47,12 @@ private static String testArchiveDir; private String integrationTarget; - /** - * Deploy the given archive - */ public void deploy(String archive) throws Exception { URL url = getArchiveFile(archive).toURI().toURL(); getDeployer().deploy(url); } - /** - * Undeploy the given archive - */ public void undeploy(String archive) throws Exception { URL url = getArchiveFile(archive).toURI().toURL(); @@ -87,7 +81,6 @@ { if (integrationTarget == null) { - // Read the JBoss SpecificationVersion String jbossVersion; try {

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3054 - in jbpm3/trunk/modules: integration/api and 7 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-24 09:14:07 -0500 (Mon, 24 Nov 2008) New Revision: 3054 Added: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java jbpm3/trunk/modules/integration/api/pom.xml jbpm3/trunk/modules/integration/api/src/ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml jbpm3/trunk/modules/integration/jboss42/src/test/resources/simple/simple-process.xml Log: Add jPDL DialectHandler Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java 2008-11-24 13:59:41 UTC (rev 3053) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java 2008-11-24 14:14:07 UTC (rev 3054) @@ -48,9 +48,9 @@ private static final long serialVersionUID = 1L; - protected List leavingTransitions = null; + protected List<Transition> leavingTransitions = null; transient Map leavingTransitionMap = null; - protected Set arrivingTransitions = null; + protected Set<Transition> arrivingTransitions = null; protected Action action = null; protected SuperState superState = null; protected boolean isAsync = false; @@ -92,10 +92,14 @@ // leaving transitions ////////////////////////////////////////////////////// - public List getLeavingTransitions() { + public List<Transition> getLeavingTransitions() { return leavingTransitions; } + public List<Transition> getLeavingTransitionsList() { + return leavingTransitions; + } + /** * are the leaving {@link Transition}s, mapped by their name (java.lang.String). */ @@ -226,15 +230,11 @@ if ( (leavingTransitions!=null) && (Math.min(oldIndex, newIndex)>=0) && (Math.max(oldIndex, newIndex)<leavingTransitions.size()) ) { - Object o = leavingTransitions.remove(oldIndex); + Transition o = leavingTransitions.remove(oldIndex); leavingTransitions.add(newIndex, o); } } - public List getLeavingTransitionsList() { - return leavingTransitions; - } - // arriving transitions ///////////////////////////////////////////////////// /** Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java 2008-11-24 13:59:41 UTC (rev 3053) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/ProcessDefinition.java 2008-11-24 14:14:07 UTC (rev 3054) @@ -57,7 +57,7 @@ protected int version = -1; protected boolean isTerminationImplicit = false; protected Node startState = null; - protected List nodes = null; + protected List<Node> nodes = null; transient Map nodesMap = null; protected Map actions = null; protected Map definitions = null; @@ -202,7 +202,7 @@ // nodes //////////////////////////////////////////////////////////////////// // javadoc description in NodeCollection - public List getNodes() { + public List<Node> getNodes() { return nodes; } @@ -272,7 +272,7 @@ if ( (nodes!=null) && (Math.min(oldIndex, newIndex)>=0) && (Math.max(oldIndex, newIndex)<nodes.size()) ) { - Object o = nodes.remove(oldIndex); + Node o = nodes.remove(oldIndex); nodes.add(newIndex, o); } else { throw new IndexOutOfBoundsException("couldn't reorder element from index '"+oldIndex+"' to index '"+newIndex+"' in nodeList '"+nodes+"'"); Modified: jbpm3/trunk/modules/integration/api/pom.xml =================================================================== --- jbpm3/trunk/modules/integration/api/pom.xml 2008-11-24 13:59:41 UTC (rev 3053) +++ jbpm3/trunk/modules/integration/api/pom.xml 2008-11-24 14:14:07 UTC (rev 3054) @@ -75,16 +75,39 @@ </dependencies> <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + </testResource> + <testResource> + <directory>src/cts/resources</directory> + </testResource> + </testResources> <plugins> <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-test-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>src/cts</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-clean-plugin</artifactId> <configuration> <filesets> <fileset> - <directory>src/test</directory> - <includes> - <include>java/org/jbpm/test/**</include> - </includes> + <directory>src/cts</directory> </fileset> </filesets> </configuration> @@ -105,7 +128,7 @@ <type>zip</type> </artifactItem> </artifactItems> - <outputDirectory>src/test</outputDirectory> + <outputDirectory>src/cts</outputDirectory> </configuration> </execution> </executions> Property changes on: jbpm3/trunk/modules/integration/api/src ___________________________________________________________________ Name: svn:ignore - test + test cts Added: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java (rev 0) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java 2008-11-24 14:14:07 UTC (rev 3054) @@ -0,0 +1,70 @@ +/* + * 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.integration.jpdl32; + +// $Id$ + +import java.io.IOException; +import java.io.InputStream; +import java.io.Writer; +import java.net.URI; +import java.net.URL; + +import org.jbpm.api.NotImplementedException; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.service.AbstractDialectHandler; +import org.jbpm.api.service.DialectHandler; +import org.jbpm.integration.model.ProcessDefinitionImpl; + +/** + * A jPDL a {@link DialectHandler} + * + * @author thomas.diesler(a)jboss.com + * @since 24-Nov-2008 + */ +public class DialectHandlerImpl extends AbstractDialectHandler +{ + public URI getNamespaceURI() + { + return URI.create("urn:jbpm.org:jpdl-3.2"); + } + + public ProcessDefinition parseProcessDefinition(URL pdXML) throws IOException + { + InputStream inStream = pdXML.openStream(); + org.jbpm.graph.def.ProcessDefinition oldProcDef = org.jbpm.graph.def.ProcessDefinition.parseXmlInputStream(inStream); + ProcessDefinition procDef = new ProcessDefinitionImpl(getProcessEngine(), oldProcDef); + return procDef; + } + + public ProcessDefinition parseProcessDefinition(String pdXML) + { + org.jbpm.graph.def.ProcessDefinition oldProcDef = org.jbpm.graph.def.ProcessDefinition.parseXmlString(pdXML); + ProcessDefinition procDef = new ProcessDefinitionImpl(getProcessEngine(), oldProcDef); + return procDef; + } + + public void marshallProcessDefinition(ProcessDefinition procDef, Writer out) throws IOException + { + throw new NotImplementedException("jPDL marshalling not implemented"); + } +} \ No newline at end of file Property changes on: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/jpdl32/DialectHandlerImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-24 13:59:41 UTC (rev 3053) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-24 14:14:07 UTC (rev 3054) @@ -58,7 +58,6 @@ this.oldNode = oldNode; } - //@Override public ObjectName getKey() { long id = oldNode.getId(); @@ -70,19 +69,16 @@ return oldNode; } - //@Override public String getName() { return oldNode.getName(); } - //@Override public ProcessDefinition getProcessDefinition() { return procDef; } - //@Override public Process getProcess() { return proc; @@ -101,8 +97,11 @@ throw new InvalidProcessException("Cannot obtain target node: " + targetRef); Transition trans = flow.getOldTransition(); - oldNode.addLeavingTransition(trans); - targetNode.getOldNode().addArrivingTransition(trans); + if (oldNode.hasLeavingTransition(trans.getName()) == false) + { + oldNode.addLeavingTransition(trans); + targetNode.getOldNode().addArrivingTransition(trans); + } outFlows.add(flow); } @@ -112,7 +111,6 @@ return Collections.unmodifiableList(outFlows); } - //@Override public String toString() { return oldNode.toString(); Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-24 13:59:41 UTC (rev 3053) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-24 14:14:07 UTC (rev 3054) @@ -31,11 +31,16 @@ import org.jbpm.api.Constants; import org.jbpm.api.InvalidProcessException; +import org.jbpm.api.NotImplementedException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.ObjectNameFactory; +import org.jbpm.graph.def.Transition; +import org.jbpm.graph.node.EndState; +import org.jbpm.graph.node.StartState; +import org.jbpm.graph.node.State; /** * An integration wrapper @@ -53,40 +58,45 @@ public ProcessDefinitionImpl(ProcessEngine engine, String name) { - this.oldProcDef = new org.jbpm.graph.def.ProcessDefinition(name); + this(engine, new org.jbpm.graph.def.ProcessDefinition(name)); + } + + public ProcessDefinitionImpl(ProcessEngine engine, org.jbpm.graph.def.ProcessDefinition oldProcDef) + { + this.oldProcDef = oldProcDef; this.engine = engine; - - if (name == null) + + if (oldProcDef.getName() == null) throw new InvalidProcessException("ProcessDefinition name cannot be null"); + + if (oldProcDef.getNodes() != null) + { + initializeNodes(oldProcDef); + initializeSequenceFlows(oldProcDef); + } } - public org.jbpm.graph.def.ProcessDefinition getOldProcessDefinition() { return oldProcDef; } - - //@Override public ProcessEngine getProcessEngine() { return engine; } - //@Override public ObjectName getKey() { long id = oldProcDef.getId(); return ObjectNameFactory.create(Constants.ID_DOMAIN + ":procdef=" + getName() + ",id=" + id); } - //@Override public String getName() { return oldProcDef.getName(); } - //@Override public Process newInstance() { ProcessImpl procImpl = new ProcessImpl(this); @@ -105,20 +115,17 @@ nodes.put(oldNode.getName(), nodeImpl); } - //@Override public Node getNode(String name) { return nodes.get(name); } - //@Override public List<Node> getNodes() { List<Node> nodeList = new ArrayList<Node>(nodes.values()); return Collections.unmodifiableList(nodeList); } - //@Override @SuppressWarnings("unchecked") public <T extends Node> T getNode(Class<T> clazz, String name) { @@ -130,7 +137,6 @@ return null; } - //@Override @SuppressWarnings("unchecked") public <T extends Node> List<T> getNodes(Class<T> clazz) { @@ -142,4 +148,45 @@ } return retNodes; } + + private void initializeNodes(org.jbpm.graph.def.ProcessDefinition oldProcDef) + { + for(org.jbpm.graph.def.Node oldNode : oldProcDef.getNodes()) + { + NodeImpl nodeImpl; + if (oldNode instanceof StartState) + { + nodeImpl = new StartEventImpl(this, (StartState)oldNode); + } + else if (oldNode instanceof State) + { + nodeImpl = new WaitStateImpl(this, (State)oldNode); + } + else if (oldNode instanceof EndState) + { + nodeImpl = new EndEventImpl(this, (EndState)oldNode); + } + else + { + throw new NotImplementedException("Unsupported node type: " + oldNode); + } + nodes.put(oldNode.getName(), nodeImpl); + } + } + + private void initializeSequenceFlows(org.jbpm.graph.def.ProcessDefinition oldProcDef) + { + for(org.jbpm.graph.def.Node oldNode : oldProcDef.getNodes()) + { + NodeImpl nodeImpl = (NodeImpl)nodes.get(oldNode.getName()); + if (oldNode.getLeavingTransitions() != null) + { + for (Transition trans : oldNode.getLeavingTransitions()) + { + SequenceFlowImpl seqFlow = new SequenceFlowImpl(trans); + nodeImpl.addSequenceFlow(seqFlow); + } + } + } + } } Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-11-24 13:59:41 UTC (rev 3053) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-11-24 14:14:07 UTC (rev 3054) @@ -30,8 +30,8 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Node; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.Process; -import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.api.runtime.Attachments; import org.jbpm.graph.exe.ProcessInstance; Modified: jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-24 13:59:41 UTC (rev 3053) +++ jbpm3/trunk/modules/integration/api/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-24 14:14:07 UTC (rev 3054) @@ -51,25 +51,22 @@ // The set of registered ProcessDefinitions private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>(); - //@Override + @Override public void setProcessEngine(ProcessEngine engine) { super.setProcessEngine(engine); } - //@Override public ProcessDefinition getProcessDefinition(ObjectName procDefID) { return procDefs.get(procDefID); } - //@Override public Set<ObjectName> getProcessDefinitions() { return Collections.unmodifiableSet(procDefs.keySet()); } - //@Override public ObjectName registerProcessDefinition(ProcessDefinition procDef) { if (getProcessDefinition(procDef.getKey()) != null) @@ -84,7 +81,6 @@ return procDefID; } - //@Override public boolean unregisterProcessDefinition(ObjectName procDefID) { boolean removed = false; Modified: jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml =================================================================== --- jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml 2008-11-24 13:59:41 UTC (rev 3053) +++ jbpm3/trunk/modules/integration/api/src/main/resources/jbpm-cfg-beans.xml 2008-11-24 14:14:07 UTC (rev 3054) @@ -33,10 +33,12 @@ <property name="dialectHandlers"> <map keyClass="java.net.URI" valueClass="org.jbpm.api.service.DialectHandler"> <entry><key>urn:jbpm.jboss:api-0.1</key><value><inject bean="jBPMDialectHandlerAPI10"/></value></entry> + <entry><key>urn:jbpm.org:jpdl-3.2</key><value><inject bean="jBPMDialectHandlerJPDL32"/></value></entry> </map> </property> </bean> <bean name="jBPMDialectHandlerAPI10" class="org.jbpm.dialect.api10.DialectHandlerImpl"/> + <bean name="jBPMDialectHandlerJPDL32" class="org.jbpm.integration.jpdl32.DialectHandlerImpl"/>  <bean name="jBPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> Modified: jbpm3/trunk/modules/integration/jboss42/src/test/resources/simple/simple-process.xml =================================================================== --- jbpm3/trunk/modules/integration/jboss42/src/test/resources/simple/simple-process.xml 2008-11-24 13:59:41 UTC (rev 3053) +++ jbpm3/trunk/modules/integration/jboss42/src/test/resources/simple/simple-process.xml 2008-11-24 14:14:07 UTC (rev 3054) @@ -1,4 +1,4 @@ -<process-definition name="timerProcess" xmlns="urn:jbpm.org:jpdl-3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<process-definition name="simpleProcess" xmlns="urn:jbpm.org:jpdl-3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jbpm.org:jpdl-3.2 http://jbpm.org/xsd/jpdl-3.2.xsd"> <start-state name='start'> <transition to='a' />

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3053 - jbpm4/trunk/modules/api.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-24 08:59:41 -0500 (Mon, 24 Nov 2008) New Revision: 3053 Removed: jbpm4/trunk/modules/api/build-xsddoc.xml Modified: jbpm4/trunk/modules/api/pom.xml Log: giving up on xsddoc for the meantime Deleted: jbpm4/trunk/modules/api/build-xsddoc.xml =================================================================== --- jbpm4/trunk/modules/api/build-xsddoc.xml 2008-11-24 13:04:29 UTC (rev 3052) +++ jbpm4/trunk/modules/api/build-xsddoc.xml 2008-11-24 13:59:41 UTC (rev 3053) @@ -1,21 +0,0 @@ -<project name="xsddoc" basedir="."> - - <target name="generate"> - <echo message="compile classpath: ${compile_classpath}"/> - <echo message="runtime classpath: ${runtime_classpath}"/> - <echo message="test classpath: ${test_classpath}"/> - <echo message="plugin classpath: ${plugin_classpath}"/> - - <path id="plugin.classpath"> - <pathelement location="${plugin_classpath}" /> - </path> - - <echo message="basedir: ${basedir}" /> - <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="plugin.classpath" /> - <mkdir dir="target/doc/schemadoc" /> - <xsddoc out="${basedir}/target/doc/schemadoc" title="jBPM 4 Schema's" verbose="false"> - <fileset dir="src/main/resources" /> - </xsddoc> - </target> - -</project> Modified: jbpm4/trunk/modules/api/pom.xml =================================================================== --- jbpm4/trunk/modules/api/pom.xml 2008-11-24 13:04:29 UTC (rev 3052) +++ jbpm4/trunk/modules/api/pom.xml 2008-11-24 13:59:41 UTC (rev 3053) @@ -46,43 +46,6 @@  <build> <plugins> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>generate-schemadocs</id> - <phase>package</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <property name="compile_classpath" refid="maven.compile.classpath"/> - <property name="runtime_classpath" refid="maven.runtime.classpath"/> - <property name="test_classpath" refid="maven.test.classpath"/> - <property name="plugin_classpath" refid="maven.plugin.classpath"/> - - <ant antfile="${basedir}/build-xsddoc.xml"> - <target name="generate"/> - </ant> - </tasks> - </configuration> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>xsddoc</groupId> - <artifactId>xsddoc</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - </dependency> - </dependencies> - </plugin> -  + --> </plugins> </build>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3052 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/model and 13 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-24 08:04:29 -0500 (Mon, 24 Nov 2008) New Revision: 3052 Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java Removed: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java 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/NodeImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java Log: Update API signatures Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -26,7 +26,7 @@ import java.util.Set; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.runtime.Attachments; @@ -55,9 +55,9 @@ ProcessEngine getProcessEngine(); /** - * Get the associated {@link ProcessInstance} + * Get the associated {@link Process} */ - ProcessInstance getProcess(); + Process getProcess(); /** * Get the unique token identity Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -40,7 +40,7 @@ /** * Get the associated process */ - ProcessInstance getProcess(); + Process getProcess(); /** * Get the unique name. Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java (from rev 3051, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -0,0 +1,70 @@ +/* + * 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.api.model; + +//$Id$ + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.client.Token; +import org.jbpm.api.runtime.Attachments; + +/** + * A Process is any Activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface Process extends ProcessStructure +{ + /** + * Defines the status a {@link Process} can be in + */ + public enum ProcessStatus + { + None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed + } + + /** + * Get the associated ProcessEngine + */ + ProcessEngine getProcessEngine(); + + /** + * Get the associated ProcessDefinition + */ + ProcessDefinition getProcessDefinition(); + + /** + * Get the process state + */ + ProcessStatus getProcessStatus(); + + /** + * Start the process + */ + Token startProcess(); + + /** + * Start the process, with a given context data + */ + Token startProcess(Attachments att); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -36,7 +36,7 @@ /** * Create a new instance of this process definition */ - ProcessInstance newInstance(); + Process newInstance(); /** * Get the associated ProcessEngine Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -1,70 +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.api.model; - -//$Id$ - -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Token; -import org.jbpm.api.runtime.Attachments; - -/** - * A Process is any Activity performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface ProcessInstance extends ProcessStructure -{ - /** - * Defines the status a {@link ProcessInstance} can be in - */ - public enum ProcessStatus - { - None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed - } - - /** - * Get the associated ProcessEngine - */ - ProcessEngine getProcessEngine(); - - /** - * Get the associated ProcessDefinition - */ - ProcessDefinition getProcessDefinition(); - - /** - * Get the process state - */ - ProcessStatus getProcessStatus(); - - /** - * Start the process - */ - Token startProcess(); - - /** - * Start the process, with a given context data - */ - Token startProcess(Attachments att); -} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -23,13 +23,13 @@ //$Id$ -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.Task.TaskType; /** - * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. + * The ProcessBuilder can be used to build a {@link Process} dynamically. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 @@ -37,7 +37,7 @@ public interface ProcessBuilder { /** - * Add a {@link ProcessInstance} with a given name + * Add a {@link Process} with a given name */ ProcessBuilder addProcess(String name); Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -0,0 +1,48 @@ +/* + * 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.api.service; + +import org.jbpm.api.client.ProcessEngine; + +//$Id$ + +/** + * The DialectHandler converts a supported dialect to the ProcessDefinition model. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public abstract class AbstractDialectHandler implements DialectHandler +{ + private ProcessEngine engine; + + public ProcessEngine getProcessEngine() + { + return engine; + } + + // Do not expose through the API + protected void setProcessEngine(ProcessEngine engine) + { + this.engine = engine; + } +} Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/AbstractDialectHandler.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -29,7 +29,7 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; /** @@ -72,17 +72,17 @@ /** * Save the Process to persistent storage */ - public abstract ObjectName saveProcess(ProcessInstance proc); + public abstract ObjectName saveProcess(Process proc); /** * Load the Process from persistent storage */ - public abstract ProcessInstance loadProcess(ObjectName procID); + public abstract Process loadProcess(ObjectName procID); /** * Delete the Process from persistent storage */ - public abstract void deleteProcess(ProcessInstance proc); + public abstract void deleteProcess(Process proc); /** * Save the Node to persistent storage Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -25,11 +25,11 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.builder.ProcessBuilder; /** - * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. + * The ProcessBuilder can be used to build a {@link Process} dynamically. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -29,8 +29,8 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessInstance; -import org.jbpm.api.model.ProcessInstance.ProcessStatus; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.Process.ProcessStatus; /** * The ProcessService is the entry point to create, find and otherwise manage processes. @@ -57,7 +57,7 @@ /** * Register a Process. */ - public abstract ObjectName registerProcess(ProcessInstance proc); + public abstract ObjectName registerProcess(Process proc); /** * Unregister a Process. @@ -67,7 +67,7 @@ /** * Get a Process for a given id */ - public abstract ProcessInstance getProcess(ObjectName procID); + public abstract Process getProcess(ObjectName procID); /** * Get the set of registered Processes Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -25,7 +25,7 @@ import javax.management.ObjectName; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.runtime.Attachments; import org.jbpm.incubator.model.ProcessStructureExt; @@ -35,7 +35,7 @@ * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface ProcessExt extends ProcessInstance, ProcessStructureExt +public interface ProcessExt extends Process, ProcessStructureExt { /** * Start the process asynchronously Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -24,7 +24,7 @@ //$Id$ import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; @@ -40,7 +40,7 @@ import org.jbpm.incubator.runtime.SignalHandler; /** - * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. + * The ProcessBuilder can be used to build a {@link Process} dynamically. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -26,9 +26,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.ProcessInstance.ProcessStatus; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.AbstractService; @@ -61,19 +61,19 @@ * @param start The StartEvent that triggers the process * @param att The Attachments in the ExecutionContext */ - public abstract void startProcess(ProcessInstance proc, StartEvent start, Attachments att); + public abstract void startProcess(Process proc, StartEvent start, Attachments att); /** * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The * Process will be in a running state until all Tokens are consumed. This method until the process ends without * timeout. */ - public abstract ProcessStatus waitForEnd(ProcessInstance proc); + public abstract ProcessStatus waitForEnd(Process proc); /** * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The * Process will be in a running state until all Tokens are consumed. This method until the process ends with a * given timeout. */ - public abstract ProcessStatus waitForEnd(ProcessInstance proc, long timeout); + public abstract ProcessStatus waitForEnd(Process proc, long timeout); } Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -35,7 +35,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Event; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.Task; import org.jbpm.api.service.AbstractService; import org.jbpm.api.service.ProcessService; @@ -137,7 +137,7 @@ public void sendMessage(ObjectName procID, String targetName, Message msg) { ProcessService procService = ProcessService.locateProcessService(); - ProcessInstance proc = procService.getProcess(procID); + Process proc = procService.getProcess(procID); if (proc == null) throw new IllegalStateException("Cannot obtain registered process: " + procID); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -27,11 +27,11 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.ProcessInstance.ProcessStatus; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.runtime.BasicAttachments; @@ -50,7 +50,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessInstance proc = procDef.newInstance(); + Process proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -67,7 +67,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessInstance proc = procDef.newInstance(); + Process proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); @@ -84,7 +84,7 @@ public void testInvalidGate() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessInstance proc = procDef.newInstance(); + Process proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "10"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -28,7 +28,7 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessService; @@ -66,7 +66,7 @@ ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); ProcessService procService = engine.getService(ProcessService.class); - ProcessInstance proc = procDef.newInstance(); + Process proc = procDef.newInstance(); assertNotNull("Process not null", proc); assertNull("Process not automatically registered", procService.getProcess(proc.getKey())); assertNull("ProcessDefinition not automatically registered", procDefService.getProcessDefinition(procDef.getKey())); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -25,7 +25,7 @@ import javax.management.ObjectName; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; @@ -47,7 +47,7 @@ ProcessService procService = ProcessService.locateProcessService(); ProcessDefinition procDef = getProcessDefinition(); - ProcessInstance proc = procDef.newInstance(); + Process proc = procDef.newInstance(); assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey())); assertNull("Process not registered automatically", procService.getProcess(proc.getKey())); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -27,9 +27,9 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.ProcessInstance.ProcessStatus; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; @@ -46,7 +46,7 @@ public void testBasicWaitState() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - ProcessInstance proc = procDef.newInstance(); + Process proc = procDef.newInstance(); // Start the Process Token tok = proc.startProcess(); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -31,7 +31,7 @@ import org.hibernate.Session; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.AbstractElement; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; /** @@ -87,22 +87,22 @@ // nothing to do } - protected void create(ProcessInstance proc) + protected void create(Process proc) { // nothing to do } - protected void register(ProcessInstance proc) + protected void register(Process proc) { // nothing to do } - protected void unregister(ProcessInstance proc) + protected void unregister(Process proc) { // nothing to do } - protected void destroy(ProcessInstance proc) + protected void destroy(Process proc) { // nothing to do } 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-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -35,7 +35,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.builder.ObjectNameFactory; @@ -213,7 +213,7 @@ } @Override - protected void create(ProcessInstance proc) + protected void create(Process proc) { super.create(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -48,7 +48,7 @@ import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; @@ -132,7 +132,7 @@ private ProcessDefinition procDef; @ManyToOne(targetEntity = ProcessImpl.class) - private ProcessInstance proc; + private Process proc; @ManyToOne(targetEntity = GroupImpl.class) private Group groupRef; @@ -155,7 +155,7 @@ } @Override - public ProcessInstance getProcess() + public Process getProcess() { return proc; } @@ -399,7 +399,7 @@ } @Override - protected void create(ProcessInstance proc) + protected void create(Process proc) { super.create(proc); this.proc = proc; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -43,7 +43,7 @@ import org.jbpm.api.Constants; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.incubator.model.Assignment; @@ -102,7 +102,7 @@ } @Override - public ProcessInstance newInstance() + public Process newInstance() { // Create a copy of the process structure from raw data ProcessStructureImpl procStructCopy; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -43,7 +43,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Event.EventDetailType; @@ -377,28 +377,28 @@ } @Override - protected void create(ProcessInstance proc) + protected void create(Process proc) { super.create(proc); procStruct.create(proc); } @Override - public void register(ProcessInstance proc) + public void register(Process proc) { super.register(proc); procStruct.register(proc); } @Override - public void unregister(ProcessInstance proc) + public void unregister(Process proc) { super.unregister(proc); procStruct.unregister(proc); } @Override - protected void destroy(ProcessInstance proc) + protected void destroy(Process proc) { super.destroy(proc); procStruct.destroy(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -44,7 +44,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.builder.ObjectNameFactory; @@ -360,7 +360,7 @@ } @Override - protected void create(ProcessInstance proc) + protected void create(Process proc) { super.create(proc); for (Node node : getNodes()) @@ -371,7 +371,7 @@ } @Override - protected void register(ProcessInstance proc) + protected void register(Process proc) { super.register(proc); for (Node node : getNodes()) @@ -382,7 +382,7 @@ } @Override - protected void unregister(ProcessInstance proc) + protected void unregister(Process proc) { super.unregister(proc); for (Node node : getNodes()) @@ -393,7 +393,7 @@ } @Override - protected void destroy(ProcessInstance proc) + protected void destroy(Process proc) { super.destroy(proc); for (Node node : getNodes()) Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -32,7 +32,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; import org.jbpm.api.client.Token; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.Attachments; @@ -165,7 +165,7 @@ } @Override - protected void create(ProcessInstance proc) + protected void create(Process proc) { super.create(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -29,7 +29,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.incubator.model.Message; @@ -119,7 +119,7 @@ } @Override - protected void create(ProcessInstance proc) + protected void create(Process proc) { super.create(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -32,7 +32,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; @@ -191,7 +191,7 @@ // There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event. // That is, a Process Instance SHALL be generated when the Start Event is triggered. - ProcessInstance proc = procDef.newInstance(); + Process proc = procDef.newInstance(); StartEvent startEvent = proc.getNode(StartEvent.class, startEventName); ExecutionService execService = engine.getService(ExecutionService.class); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -34,7 +34,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.client.Token; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.Attachments; @@ -202,7 +202,7 @@ } @Override - protected void create(ProcessInstance proc) + protected void create(Process proc) { super.create(proc); @@ -212,7 +212,7 @@ } @Override - protected void register(ProcessInstance proc) + protected void register(Process proc) { super.register(proc); @@ -227,7 +227,7 @@ } @Override - protected void unregister(ProcessInstance proc) + protected void unregister(Process proc) { super.unregister(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -25,7 +25,7 @@ import org.jbpm.api.NotImplementedException; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; @@ -64,7 +64,7 @@ import org.jbpm.ri.model.WaitStateImpl; /** - * The ProcessBuilder can be used to dynamically build a {@link ProcessInstance}. + * The ProcessBuilder can be used to dynamically build a {@link Process}. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -29,14 +29,14 @@ import java.util.Map; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.runtime.Attachments; import org.jbpm.incubator.model.NodeExt; import org.jbpm.incubator.model.ProcessDefinitionExt; import org.jbpm.incubator.model.Property; /** - * An ExecutionContext that delegates to the current {@link Node} or {@link ProcessInstance} for property rerieval. + * An ExecutionContext that delegates to the current {@link Node} or {@link Process} for property rerieval. * * @author Thomas.Diesler(a)jboss.com * @since 15-Aug-2008 Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -29,7 +29,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.runtime.Attachments; import org.jbpm.incubator.model.NodeExt; @@ -91,7 +91,7 @@ } @Override - public ProcessInstance getProcess() + public Process getProcess() { return delegateToken.getProcess(); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -25,7 +25,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; import org.jbpm.incubator.runtime.TokenExecutor; import org.slf4j.Logger; @@ -43,9 +43,9 @@ final static Logger log = LoggerFactory.getLogger(InProcessTokenExecutor.class); @SuppressWarnings("unused") - private ProcessInstance proc; + private Process proc; - public InProcessTokenExecutor(ProcessInstance proc) + public InProcessTokenExecutor(Process proc) { this.proc = proc; } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -24,8 +24,8 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; -import org.jbpm.api.model.ProcessInstance.ProcessStatus; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.service.ProcessService; import org.jbpm.ri.model.ProcessImpl; import org.jbpm.ri.service.ProcessServiceImpl; @@ -67,7 +67,7 @@ public void run() { - ProcessInstance proc = rtProc.getProcess(); + Process proc = rtProc.getProcess(); try { Node node = token.getCurrentNode(); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -23,13 +23,13 @@ //$Id$ -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.incubator.runtime.TokenExecutor; /** - * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance} + * A RuntimeProcess add runtime behaviour to the {@link Process} * - * To protect the engine from maligious user code it does not extend {@link ProcessInstance} directly. + * To protect the engine from maligious user code it does not extend {@link Process} directly. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 @@ -37,12 +37,12 @@ public interface RuntimeProcess { /** - * Get the associated {@link ProcessInstance} + * Get the associated {@link Process} */ - ProcessInstance getProcess(); + Process getProcess(); /** - * Get the {@link TokenExecutor} for this {@link ProcessInstance} + * Get the {@link TokenExecutor} for this {@link Process} */ ThreadingTokenExecutor getTokenExecutor(); } \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -23,26 +23,26 @@ //$Id$ -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; /** - * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance} + * A RuntimeProcess add runtime behaviour to the {@link Process} * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ public class RuntimeProcessImpl implements RuntimeProcess { - private ProcessInstance proc; + private Process proc; private ThreadingTokenExecutor tokenExecutor; - public RuntimeProcessImpl(ProcessInstance proc) + public RuntimeProcessImpl(Process proc) { this.proc = proc; this.tokenExecutor = new ThreadingTokenExecutor(this); } - public ProcessInstance getProcess() + public Process getProcess() { return proc; } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -34,7 +34,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.ProcessInstance.ProcessStatus; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.incubator.runtime.FlowHandler; import org.jbpm.incubator.runtime.TokenExecutor; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -32,10 +32,10 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.WaitState; -import org.jbpm.api.model.ProcessInstance.ProcessStatus; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.runtime.Attachments.Key; @@ -62,7 +62,7 @@ private SequenceFlow flow; private Attachments att; private TokenStatus status; - private ProcessInstance proc; + private Process proc; private Session session; private Token parentToken; @@ -71,7 +71,7 @@ /** * Construct a Token with given {@link Attachments} */ - public TokenImpl(ProcessInstance proc, Attachments att) + public TokenImpl(Process proc, Attachments att) { this.att = new BasicAttachments(att); this.id = new UID().toString(); @@ -104,7 +104,7 @@ } @Override - public ProcessInstance getProcess() + public Process getProcess() { return proc; } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -33,9 +33,9 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Expression; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.ProcessInstance.ProcessStatus; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ProcessService; import org.jbpm.incubator.client.ProcessExt; @@ -79,12 +79,12 @@ } @Override - public void startProcess(ProcessInstance proc, StartEvent start, Attachments att) + public void startProcess(Process proc, StartEvent start, Attachments att) { startProcessInternal(proc, start, att); } - private synchronized void startProcessInternal(ProcessInstance proc, StartEvent start, Attachments att) + private synchronized void startProcessInternal(Process proc, StartEvent start, Attachments att) { @SuppressWarnings("serial") class InitialFlow extends SequenceFlowImpl @@ -154,12 +154,12 @@ } } - public ProcessStatus waitForEnd(ProcessInstance proc) + public ProcessStatus waitForEnd(Process proc) { return waitForEndInternal(proc, 0); } - public ProcessStatus waitForEnd(ProcessInstance proc, long timeout) + public ProcessStatus waitForEnd(Process proc, long timeout) { return waitForEndInternal(proc, timeout); } @@ -169,7 +169,7 @@ * arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was * aborted this method throws the causing RuntimeException if avaialable. */ - private ProcessStatus waitForEndInternal(ProcessInstance proc, long timeout) + private ProcessStatus waitForEndInternal(Process proc, long timeout) { ProcessImpl procImpl = (ProcessImpl)proc; @@ -234,13 +234,13 @@ return status; } - private boolean isProcessTerminated(ProcessInstance proc) + private boolean isProcessTerminated(Process proc) { ProcessStatus status = proc.getProcessStatus(); return status == ProcessStatus.Cancelled || status == ProcessStatus.Completed || status == ProcessStatus.Aborted; } - private RuntimeProcess getRuntimeProcess(ProcessInstance proc, boolean createNew) + private RuntimeProcess getRuntimeProcess(Process proc, boolean createNew) { RuntimeProcess rtProcess; synchronized (runtimeProcesses) @@ -271,7 +271,7 @@ { ThreadingTokenExecutor tokenExecutor = rtProc.getTokenExecutor(); ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess(); - ProcessInstance proc = rtProc.getProcess(); + Process proc = rtProc.getProcess(); ProcessEngine engine = getProcessEngine(); SignalService sigService = engine.getService(SignalService.class); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -38,7 +38,7 @@ import org.jbpm.api.ProcessNotFoundException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.PersistenceService; import org.jbpm.api.service.Service; @@ -151,7 +151,7 @@ } @Override - public ObjectName saveProcess(ProcessInstance proc) + public ObjectName saveProcess(Process proc) { log.debug("START saveProcess: " + proc.getKey()); Session session = getSessionFactory().openSession(); @@ -170,15 +170,15 @@ } @Override - public ProcessInstance loadProcess(ObjectName procID) + public Process loadProcess(ObjectName procID) { log.debug("START loadProcess: " + procID); - ProcessInstance proc = null; + Process proc = null; Session session = getSessionFactory().openSession(); try { Integer id = Integer.valueOf(procID.getKeyProperty("id")); - proc = (ProcessInstance)session.load(ProcessImpl.class, id); + proc = (Process)session.load(ProcessImpl.class, id); AbstractElementImpl elImpl = (AbstractElementImpl)proc; elImpl.initialize(getProcessEngine(), session); } @@ -195,7 +195,7 @@ } @Override - public void deleteProcess(ProcessInstance proc) + public void deleteProcess(Process proc) { log.debug("START deleteProcess: " + proc); Session session = getSessionFactory().openSession(); @@ -204,7 +204,7 @@ { ObjectName procID = proc.getKey(); Integer id = Integer.valueOf(procID.getKeyProperty("id")); - proc = (ProcessInstance)session.load(ProcessImpl.class, id); + proc = (Process)session.load(ProcessImpl.class, id); session.delete(proc); tx.commit(); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -32,7 +32,7 @@ import org.jbpm.api.ProcessNotFoundException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.PersistenceService; import org.slf4j.Logger; @@ -50,7 +50,7 @@ final Logger log = LoggerFactory.getLogger(InMemoryPersistenceServiceImpl.class); private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>(); - private Map<ObjectName, ProcessInstance> procs = new HashMap<ObjectName, ProcessInstance>(); + private Map<ObjectName, Process> procs = new HashMap<ObjectName, Process>(); private Map<ObjectName, Node> nodes = new HashMap<ObjectName, Node>(); @Override @@ -89,7 +89,7 @@ } @Override - public ObjectName saveProcess(ProcessInstance proc) + public ObjectName saveProcess(Process proc) { procs.put(proc.getKey(), proc); @@ -100,9 +100,9 @@ } @Override - public ProcessInstance loadProcess(ObjectName procID) + public Process loadProcess(ObjectName procID) { - ProcessInstance proc = procs.get(procID); + Process proc = procs.get(procID); if (proc == null) throw new ProcessNotFoundException("Cannot find process: " + procID); @@ -110,7 +110,7 @@ } @Override - public void deleteProcess(ProcessInstance proc) + public void deleteProcess(Process proc) { procs.remove(proc.getKey()); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -24,13 +24,13 @@ // $Id$ import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.incubator.model.builder.ProcessBuilderExt; import org.jbpm.ri.model.builder.ProcessBuilderImpl; /** - * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. + * The ProcessBuilder can be used to build a {@link Process} dynamically. * * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -34,9 +34,9 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.ProcessInstance.ProcessStatus; +import org.jbpm.api.model.Process.ProcessStatus; import org.jbpm.api.service.PersistenceService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessService; @@ -56,7 +56,7 @@ // Provide logging final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class); - private Map<ObjectName, ProcessInstance> registeredProcs = new HashMap<ObjectName, ProcessInstance>(); + private Map<ObjectName, Process> registeredProcs = new HashMap<ObjectName, Process>(); private List<NodeInterceptor> nodeInterceptors = new ArrayList<NodeInterceptor>(); @Override @@ -83,9 +83,9 @@ * Get a Process for a given id */ @Override - public ProcessInstance getProcess(ObjectName procID) + public Process getProcess(ObjectName procID) { - ProcessInstance proc = registeredProcs.get(procID); + Process proc = registeredProcs.get(procID); return proc; } @@ -109,7 +109,7 @@ public Set<ObjectName> getProcesses(String name, ProcessStatus status) { Set<ObjectName> procSet = new HashSet<ObjectName>(); - for (ProcessInstance auxProc : registeredProcs.values()) + for (Process auxProc : registeredProcs.values()) { if (auxProc.getName().equals(name)) { @@ -123,7 +123,7 @@ /** * Register a Process. */ - public ObjectName registerProcess(ProcessInstance proc) + public ObjectName registerProcess(Process proc) { log.debug("registerProcess: " + proc); @@ -160,7 +160,7 @@ public boolean unregisterProcess(ObjectName procID) { boolean removed = false; - ProcessInstance proc = registeredProcs.get(procID); + Process proc = registeredProcs.get(procID); if (proc != null) { log.debug("unregisterProcess: " + proc); Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-24 13:02:51 UTC (rev 3051) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-24 13:04:29 UTC (rev 3052) @@ -28,7 +28,7 @@ import org.jbpm.api.ProcessNotFoundException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.Process; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Task; @@ -59,12 +59,12 @@ procDefService.registerProcessDefinition(procDef); // Create and save the Process - ProcessInstance proc = procDef.newInstance(); + Process proc = procDef.newInstance(); service.saveProcess(proc); // Load the process ObjectName procID = proc.getKey(); - ProcessInstance loadProc = service.loadProcess(procID); + Process loadProc = service.loadProcess(procID); ProcessCatalog.validateDefaultProcess(loadProc.getProcessDefinition()); StartEvent start = loadProc.getNode(StartEvent.class, "Start");

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3051 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/client and 21 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-24 08:02:51 -0500 (Mon, 24 Nov 2008) New Revision: 3051 Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java Removed: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java Modified: projects/spec/trunk/modules/api/.classpath projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandlerService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/Deployment.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateMarshallerTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredMarshallerTest.java projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java 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/NodeImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java Log: wip Modified: projects/spec/trunk/modules/api/.classpath =================================================================== --- projects/spec/trunk/modules/api/.classpath 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/.classpath 2008-11-24 13:02:51 UTC (rev 3051) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="target/classes"/> </classpath> Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Token.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -26,7 +26,7 @@ import java.util.Set; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.runtime.Attachments; @@ -55,9 +55,9 @@ ProcessEngine getProcessEngine(); /** - * Get the associated {@link Process} + * Get the associated {@link ProcessInstance} */ - Process getProcess(); + ProcessInstance getProcess(); /** * Get the unique token identity Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Node.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -40,7 +40,7 @@ /** * Get the associated process */ - Process getProcess(); + ProcessInstance getProcess(); /** * Get the unique name. Deleted: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -1,70 +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.api.model; - -//$Id$ - -import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.client.Token; -import org.jbpm.api.runtime.Attachments; - -/** - * A Process is any Activity performed within a company or organization. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -public interface Process extends ProcessStructure -{ - /** - * Defines the status a {@link Process} can be in - */ - public enum ProcessStatus - { - None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed - } - - /** - * Get the associated ProcessEngine - */ - ProcessEngine getProcessEngine(); - - /** - * Get the associated ProcessDefinition - */ - ProcessDefinition getProcessDefinition(); - - /** - * Get the process state - */ - ProcessStatus getProcessStatus(); - - /** - * Start the process - */ - Token startProcess(); - - /** - * Start the process, with a given context data - */ - Token startProcess(Attachments att); -} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessDefinition.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -36,7 +36,7 @@ /** * Create a new instance of this process definition */ - Process newInstance(); + ProcessInstance newInstance(); /** * Get the associated ProcessEngine Copied: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java (from rev 2972, projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Process.java) =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java (rev 0) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/ProcessInstance.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -0,0 +1,70 @@ +/* + * 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.api.model; + +//$Id$ + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.client.Token; +import org.jbpm.api.runtime.Attachments; + +/** + * A Process is any Activity performed within a company or organization. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +public interface ProcessInstance extends ProcessStructure +{ + /** + * Defines the status a {@link ProcessInstance} can be in + */ + public enum ProcessStatus + { + None, Ready, Active, Cancelled, Aborting, Aborted, Completing, Completed + } + + /** + * Get the associated ProcessEngine + */ + ProcessEngine getProcessEngine(); + + /** + * Get the associated ProcessDefinition + */ + ProcessDefinition getProcessDefinition(); + + /** + * Get the process state + */ + ProcessStatus getProcessStatus(); + + /** + * Start the process + */ + Token startProcess(); + + /** + * Start the process, with a given context data + */ + Token startProcess(Attachments att); +} \ No newline at end of file Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -23,13 +23,13 @@ //$Id$ -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.Gateway.GatewayType; import org.jbpm.api.model.Task.TaskType; /** - * The ProcessBuilder can be used to build a {@link Process} dynamically. + * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 @@ -37,7 +37,7 @@ public interface ProcessBuilder { /** - * Add a {@link Process} with a given name + * Add a {@link ProcessInstance} with a given name */ ProcessBuilder addProcess(String name); Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -28,6 +28,7 @@ import java.net.URI; import java.net.URL; +import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.ProcessDefinition; /** @@ -41,6 +42,11 @@ URI DEFAULT_NAMESPACE_URI = URI.create("urn:jbpm.jboss:api-0.1"); /** + * Get the associated ProcessEngine + */ + ProcessEngine getProcessEngine(); + + /** * Get the the supported namespace from this dialect. */ URI getNamespaceURI(); @@ -48,15 +54,15 @@ /** * Create a ProcessDefinition from a descriptor. */ - ProcessDefinition createProcess(String pXML); + ProcessDefinition parseProcessDefinition(String pdXML); /** * Create a ProcessDefinition from a descriptor URL. */ - ProcessDefinition createProcess(URL pURL) throws IOException; + ProcessDefinition parseProcessDefinition(URL pdURL) throws IOException; /** * Marshall the process definition to the given writer */ - void marshallProcess(ProcessDefinition procDef, Writer out) throws IOException; + void marshallProcessDefinition(ProcessDefinition procDef, Writer out) throws IOException; } Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandlerService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandlerService.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandlerService.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -47,6 +47,12 @@ if (dialectHandler == null) throw new IllegalStateException("No dialect handler registered for: " + nsURI); + if (dialectHandler instanceof AbstractDialectHandler) + { + AbstractDialectHandler absHandler = (AbstractDialectHandler)dialectHandler; + absHandler.setProcessEngine(getProcessEngine()); + } + return dialectHandler; } } Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/PersistenceService.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -29,7 +29,7 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; /** @@ -72,17 +72,17 @@ /** * Save the Process to persistent storage */ - public abstract ObjectName saveProcess(Process proc); + public abstract ObjectName saveProcess(ProcessInstance proc); /** * Load the Process from persistent storage */ - public abstract Process loadProcess(ObjectName procID); + public abstract ProcessInstance loadProcess(ObjectName procID); /** * Delete the Process from persistent storage */ - public abstract void deleteProcess(Process proc); + public abstract void deleteProcess(ProcessInstance proc); /** * Save the Node to persistent storage Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessBuilderService.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -25,11 +25,11 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.builder.ProcessBuilder; /** - * The ProcessBuilder can be used to build a {@link Process} dynamically. + * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -90,7 +90,7 @@ /** * Create a ProcessDefinition from a XML string in one of the supported formats */ - public final ProcessDefinition createProcessDefinition(String pXML) + public final ProcessDefinition parseProcessDefinition(String pXML) { URI nsURI = getNamespaceURI(new ByteArrayInputStream(pXML.getBytes())); DialectHandlerService dhService = getProcessEngine().getService(DialectHandlerService.class); @@ -98,14 +98,14 @@ if (dialectHandler == null) throw new IllegalStateException("Cannot obtain DialectHandler for: " + nsURI); - ProcessDefinition procDef = dialectHandler.createProcess(pXML); + ProcessDefinition procDef = dialectHandler.parseProcessDefinition(pXML); return procDef; } /** * Create a ProcessDefinition from an URL to a XML descritor in one of the supported formats */ - public final ProcessDefinition createProcessDefinition(URL pURL) throws IOException + public final ProcessDefinition parseProcessDefinition(URL pURL) throws IOException { URI nsURI = getNamespaceURI(pURL.openStream()); DialectHandlerService dhService = getProcessEngine().getService(DialectHandlerService.class); @@ -113,7 +113,7 @@ if (dialectHandler == null) throw new IllegalStateException("Cannot obtain DialectHandler for: " + nsURI); - ProcessDefinition procDef = dialectHandler.createProcess(pURL); + ProcessDefinition procDef = dialectHandler.parseProcessDefinition(pURL); return procDef; } Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessService.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -29,8 +29,8 @@ import org.jbpm.api.client.Configuration; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.ProcessInstance.ProcessStatus; /** * The ProcessService is the entry point to create, find and otherwise manage processes. @@ -57,7 +57,7 @@ /** * Register a Process. */ - public abstract ObjectName registerProcess(Process proc); + public abstract ObjectName registerProcess(ProcessInstance proc); /** * Unregister a Process. @@ -67,7 +67,7 @@ /** * Get a Process for a given id */ - public abstract Process getProcess(ObjectName procID); + public abstract ProcessInstance getProcess(ObjectName procID); /** * Get the set of registered Processes 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-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -314,7 +314,7 @@ DialectHandler dialectHandler = dhService.getDialectHandler(getDialectURI()); StringWriter strwr = new StringWriter(); - dialectHandler.marshallProcess(procDef, strwr); + dialectHandler.marshallProcessDefinition(procDef, strwr); return strwr.toString(); } Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/Deployment.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/Deployment.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/Deployment.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -96,7 +96,7 @@ if (dialectHandler == null) throw new IllegalStateException("Cannot obtain DialectHandler for: " + nsURI); - process = dialectHandler.createProcess(procXML); + process = dialectHandler.parseProcessDefinition(procXML); } return process; } Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/client/ProcessExt.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -25,7 +25,7 @@ import javax.management.ObjectName; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.runtime.Attachments; import org.jbpm.incubator.model.ProcessStructureExt; @@ -35,7 +35,7 @@ * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ -public interface ProcessExt extends Process, ProcessStructureExt +public interface ProcessExt extends ProcessInstance, ProcessStructureExt { /** * Start the process asynchronously Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/model/builder/ProcessBuilderExt.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -24,7 +24,7 @@ //$Id$ import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; @@ -40,7 +40,7 @@ import org.jbpm.incubator.runtime.SignalHandler; /** - * The ProcessBuilder can be used to build a {@link Process} dynamically. + * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/ExecutionService.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -26,9 +26,9 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.ProcessInstance.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.AbstractService; @@ -61,19 +61,19 @@ * @param start The StartEvent that triggers the process * @param att The Attachments in the ExecutionContext */ - public abstract void startProcess(Process proc, StartEvent start, Attachments att); + public abstract void startProcess(ProcessInstance proc, StartEvent start, Attachments att); /** * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The * Process will be in a running state until all Tokens are consumed. This method until the process ends without * timeout. */ - public abstract ProcessStatus waitForEnd(Process proc); + public abstract ProcessStatus waitForEnd(ProcessInstance proc); /** * All Tokens that are generated at the Start Event for that Process must eventually arrive at an End Event. The * Process will be in a running state until all Tokens are consumed. This method until the process ends with a * given timeout. */ - public abstract ProcessStatus waitForEnd(Process proc, long timeout); + public abstract ProcessStatus waitForEnd(ProcessInstance proc, long timeout); } Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java =================================================================== --- projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/incubator/service/MessageService.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -35,7 +35,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Event; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.Task; import org.jbpm.api.service.AbstractService; import org.jbpm.api.service.ProcessService; @@ -137,7 +137,7 @@ public void sendMessage(ObjectName procID, String targetName, Message msg) { ProcessService procService = ProcessService.locateProcessService(); - Process proc = procService.getProcess(procID); + ProcessInstance proc = procService.getProcess(procID); if (proc == null) throw new IllegalStateException("Cannot obtain registered process: " + procID); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitMarshallerTest.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -47,6 +47,6 @@ // Recreate the ProcessDefinition from the marshalled ProcessDefinition ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class); - return pdService.createProcessDefinition(procXML); + return pdService.parseProcessDefinition(procXML); } } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/gateway/exclusive/ExclusiveGatewaySplitTest.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -27,11 +27,11 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.Expression.ExpressionLanguage; import org.jbpm.api.model.Gateway.GatewayType; -import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.ProcessInstance.ProcessStatus; import org.jbpm.api.model.builder.GatewayBuilder; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.runtime.BasicAttachments; @@ -50,7 +50,7 @@ public void testGateA() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "5"); @@ -67,7 +67,7 @@ public void testGateB() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "15"); @@ -84,7 +84,7 @@ public void testInvalidGate() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); BasicAttachments att = new BasicAttachments(); att.addAttachment("foo", "10"); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessDefinitionServiceTest.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -28,7 +28,7 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessService; @@ -66,7 +66,7 @@ ProcessDefinitionService procDefService = engine.getService(ProcessDefinitionService.class); ProcessService procService = engine.getService(ProcessService.class); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); assertNotNull("Process not null", proc); assertNull("Process not automatically registered", procService.getProcess(proc.getKey())); assertNull("ProcessDefinition not automatically registered", procDefService.getProcessDefinition(procDef.getKey())); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/service/process/ProcessServiceTest.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -25,7 +25,7 @@ import javax.management.ObjectName; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; @@ -47,7 +47,7 @@ ProcessService procService = ProcessService.locateProcessService(); ProcessDefinition procDef = getProcessDefinition(); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); assertNull("ProcessDefinition not registered automatically", procDefService.getProcessDefinition(procDef.getKey())); assertNull("Process not registered automatically", procService.getProcess(proc.getKey())); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateMarshallerTest.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateMarshallerTest.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -47,6 +47,6 @@ // Recreate the ProcessDefinition from the marshalled ProcessDefinition ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class); - return pdService.createProcessDefinition(procXML); + return pdService.parseProcessDefinition(procXML); } } Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/task/waitstate/WaitStateTest.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -27,9 +27,9 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.ProcessInstance.ProcessStatus; import org.jbpm.api.model.Task.TaskType; import org.jbpm.api.model.builder.ProcessBuilder; import org.jbpm.api.service.ProcessBuilderService; @@ -46,7 +46,7 @@ public void testBasicWaitState() throws Exception { ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition()); - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); // Start the Process Token tok = proc.startProcess(); Modified: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredMarshallerTest.java =================================================================== --- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredMarshallerTest.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/incubator/transaction/TxRequiredMarshallerTest.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -46,6 +46,6 @@ // Recreate the ProcessDefinition from the marshalled ProcessDefinition ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class); - return pdService.createProcessDefinition(procXML); + return pdService.parseProcessDefinition(procXML); } } Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java =================================================================== --- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -34,7 +34,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.DialectHandler; +import org.jbpm.api.service.AbstractDialectHandler; /** * The DialectHandler converts a supported dialect to the internal Process model. @@ -42,7 +42,7 @@ * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 */ -public class DialectHandlerImpl implements DialectHandler +public class DialectHandlerImpl extends AbstractDialectHandler { @Override public URI getNamespaceURI() @@ -51,7 +51,7 @@ } @Override - public ProcessDefinition createProcess(String pXML) + public ProcessDefinition parseProcessDefinition(String pXML) { try { @@ -70,7 +70,7 @@ } @Override - public ProcessDefinition createProcess(URL pURL) throws IOException + public ProcessDefinition parseProcessDefinition(URL pURL) throws IOException { try { @@ -85,7 +85,7 @@ } @Override - public void marshallProcess(ProcessDefinition proc, Writer out) throws IOException + public void marshallProcessDefinition(ProcessDefinition proc, Writer out) throws IOException { try { Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java =================================================================== --- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -35,7 +35,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.DialectHandler; +import org.jbpm.api.service.AbstractDialectHandler; import org.jbpm.dialect.jpdl32.model.JPDL32ProcessDefinition; @@ -45,7 +45,7 @@ * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 */ -public class DialectHandlerImpl implements DialectHandler +public class DialectHandlerImpl extends AbstractDialectHandler { public static final URI NAMESPACE_URI = URI.create("urn:jbpm.org:jpdl-3.2"); @@ -55,7 +55,7 @@ } @Override - public ProcessDefinition createProcess(String pXML) + public ProcessDefinition parseProcessDefinition(String pXML) { try { @@ -71,7 +71,7 @@ } @Override - public ProcessDefinition createProcess(URL pURL) throws IOException + public ProcessDefinition parseProcessDefinition(URL pURL) throws IOException { try { @@ -87,7 +87,7 @@ } @Override - public void marshallProcess(ProcessDefinition proc, Writer out) throws IOException + public void marshallProcessDefinition(ProcessDefinition proc, Writer out) throws IOException { throw new NotImplementedException("JBPM-1638", "DialectHandler jPDL3.2 marshallProcess"); } Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java =================================================================== --- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -34,7 +34,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.DialectHandler; +import org.jbpm.api.service.AbstractDialectHandler; /** * The DialectHandler converts a supported dialect to the internal Process model. @@ -42,16 +42,18 @@ * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 */ -public class DialectHandlerImpl implements DialectHandler +public class DialectHandlerImpl extends AbstractDialectHandler { public static final URI NAMESPACE_URI = URI.create("http://stp.eclipse.org/bpmn"); + @Override public URI getNamespaceURI() { return NAMESPACE_URI; } - public ProcessDefinition createProcess(String pXML) + @Override + public ProcessDefinition parseProcessDefinition(String pXML) { try { @@ -65,7 +67,8 @@ } } - public ProcessDefinition createProcess(URL pURL) throws IOException + @Override + public ProcessDefinition parseProcessDefinition(URL pURL) throws IOException { try { @@ -80,7 +83,7 @@ } @Override - public void marshallProcess(ProcessDefinition proc, Writer out) throws IOException + public void marshallProcessDefinition(ProcessDefinition proc, Writer out) throws IOException { throw new NotImplementedException("JBPM-1639", "DialectHandler STP marshallProcess"); } Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java =================================================================== --- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -35,7 +35,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.service.DialectHandler; +import org.jbpm.api.service.AbstractDialectHandler; import org.jbpm.dialect.xpdl21.model.XPDLWorkflowProcess; /** @@ -44,7 +44,7 @@ * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 */ -public class DialectHandlerImpl implements DialectHandler +public class DialectHandlerImpl extends AbstractDialectHandler { public static final URI NAMESPACE_URI = URI.create("http://www.wfmc.org/2008/XPDL2.1"); @@ -54,7 +54,7 @@ } @Override - public ProcessDefinition createProcess(String pXML) + public ProcessDefinition parseProcessDefinition(String pXML) { try { @@ -70,7 +70,7 @@ } @Override - public ProcessDefinition createProcess(URL pURL) throws IOException + public ProcessDefinition parseProcessDefinition(URL pURL) throws IOException { try { @@ -86,7 +86,7 @@ } @Override - public void marshallProcess(ProcessDefinition proc, Writer out) throws IOException + public void marshallProcessDefinition(ProcessDefinition proc, Writer out) throws IOException { throw new NotImplementedException("JBPM-1640", "DialectHandler XPL2.1 marshallProcess"); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/AbstractElementImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -31,7 +31,7 @@ import org.hibernate.Session; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.AbstractElement; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; /** @@ -87,22 +87,22 @@ // nothing to do } - protected void create(Process proc) + protected void create(ProcessInstance proc) { // nothing to do } - protected void register(Process proc) + protected void register(ProcessInstance proc) { // nothing to do } - protected void unregister(Process proc) + protected void unregister(ProcessInstance proc) { // nothing to do } - protected void destroy(Process proc) + protected void destroy(ProcessInstance proc) { // nothing to do } 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-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/EventImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -35,7 +35,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.builder.ObjectNameFactory; @@ -213,7 +213,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -48,7 +48,7 @@ import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; @@ -132,7 +132,7 @@ private ProcessDefinition procDef; @ManyToOne(targetEntity = ProcessImpl.class) - private Process proc; + private ProcessInstance proc; @ManyToOne(targetEntity = GroupImpl.class) private Group groupRef; @@ -155,7 +155,7 @@ } @Override - public Process getProcess() + public ProcessInstance getProcess() { return proc; } @@ -399,7 +399,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); this.proc = proc; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessDefinitionImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -43,7 +43,7 @@ import org.jbpm.api.Constants; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.builder.ObjectNameFactory; import org.jbpm.incubator.model.Assignment; @@ -102,7 +102,7 @@ } @Override - public Process newInstance() + public ProcessInstance newInstance() { // Create a copy of the process structure from raw data ProcessStructureImpl procStructCopy; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -43,7 +43,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Event.EventDetailType; @@ -377,28 +377,28 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); procStruct.create(proc); } @Override - public void register(Process proc) + public void register(ProcessInstance proc) { super.register(proc); procStruct.register(proc); } @Override - public void unregister(Process proc) + public void unregister(ProcessInstance proc) { super.unregister(proc); procStruct.unregister(proc); } @Override - protected void destroy(Process proc) + protected void destroy(ProcessInstance proc) { super.destroy(proc); procStruct.destroy(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ProcessStructureImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -44,7 +44,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.EndEvent; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.builder.ObjectNameFactory; @@ -360,7 +360,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); for (Node node : getNodes()) @@ -371,7 +371,7 @@ } @Override - protected void register(Process proc) + protected void register(ProcessInstance proc) { super.register(proc); for (Node node : getNodes()) @@ -382,7 +382,7 @@ } @Override - protected void unregister(Process proc) + protected void unregister(ProcessInstance proc) { super.unregister(proc); for (Node node : getNodes()) @@ -393,7 +393,7 @@ } @Override - protected void destroy(Process proc) + protected void destroy(ProcessInstance proc) { super.destroy(proc); for (Node node : getNodes()) Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/ReceiveTaskImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -32,7 +32,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; import org.jbpm.api.client.Token; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.Attachments; @@ -165,7 +165,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/SendTaskImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -29,7 +29,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.incubator.model.Message; @@ -119,7 +119,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/StartEventImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -32,7 +32,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.model.SequenceFlow; @@ -191,7 +191,7 @@ // There MAY be multiple Start Events for a given Process level. Each Start Event is an independent event. // That is, a Process Instance SHALL be generated when the Start Event is triggered. - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); StartEvent startEvent = proc.getNode(StartEvent.class, startEventName); ExecutionService execService = engine.getService(ExecutionService.class); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/UserTaskImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -34,7 +34,7 @@ import org.jbpm.api.InvalidProcessException; import org.jbpm.api.client.Token; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.ProcessStructure; import org.jbpm.api.runtime.Attachments; @@ -202,7 +202,7 @@ } @Override - protected void create(Process proc) + protected void create(ProcessInstance proc) { super.create(proc); @@ -212,7 +212,7 @@ } @Override - protected void register(Process proc) + protected void register(ProcessInstance proc) { super.register(proc); @@ -227,7 +227,7 @@ } @Override - protected void unregister(Process proc) + protected void unregister(ProcessInstance proc) { super.unregister(proc); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/builder/ProcessBuilderImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -25,7 +25,7 @@ import org.jbpm.api.NotImplementedException; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.Event.EventDetailType; import org.jbpm.api.model.Expression.ExpressionLanguage; @@ -64,7 +64,7 @@ import org.jbpm.ri.model.WaitStateImpl; /** - * The ProcessBuilder can be used to dynamically build a {@link Process}. + * The ProcessBuilder can be used to dynamically build a {@link ProcessInstance}. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingAttachments.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -29,14 +29,14 @@ import java.util.Map; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.runtime.Attachments; import org.jbpm.incubator.model.NodeExt; import org.jbpm.incubator.model.ProcessDefinitionExt; import org.jbpm.incubator.model.Property; /** - * An ExecutionContext that delegates to the current {@link Node} or {@link Process} for property rerieval. + * An ExecutionContext that delegates to the current {@link Node} or {@link ProcessInstance} for property rerieval. * * @author Thomas.Diesler(a)jboss.com * @since 15-Aug-2008 Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/DelegatingToken.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -29,7 +29,7 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.runtime.Attachments; import org.jbpm.incubator.model.NodeExt; @@ -91,7 +91,7 @@ } @Override - public Process getProcess() + public ProcessInstance getProcess() { return delegateToken.getProcess(); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/InProcessTokenExecutor.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -25,7 +25,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.SequenceFlow; import org.jbpm.incubator.runtime.TokenExecutor; import org.slf4j.Logger; @@ -43,9 +43,9 @@ final static Logger log = LoggerFactory.getLogger(InProcessTokenExecutor.class); @SuppressWarnings("unused") - private Process proc; + private ProcessInstance proc; - public InProcessTokenExecutor(Process proc) + public InProcessTokenExecutor(ProcessInstance proc) { this.proc = proc; } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RunnableToken.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -24,8 +24,8 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; -import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.ProcessInstance; +import org.jbpm.api.model.ProcessInstance.ProcessStatus; import org.jbpm.api.service.ProcessService; import org.jbpm.ri.model.ProcessImpl; import org.jbpm.ri.service.ProcessServiceImpl; @@ -67,7 +67,7 @@ public void run() { - Process proc = rtProc.getProcess(); + ProcessInstance proc = rtProc.getProcess(); try { Node node = token.getCurrentNode(); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcess.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -23,13 +23,13 @@ //$Id$ -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.incubator.runtime.TokenExecutor; /** - * A RuntimeProcess add runtime behaviour to the {@link Process} + * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance} * - * To protect the engine from maligious user code it does not extend {@link Process} directly. + * To protect the engine from maligious user code it does not extend {@link ProcessInstance} directly. * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 @@ -37,12 +37,12 @@ public interface RuntimeProcess { /** - * Get the associated {@link Process} + * Get the associated {@link ProcessInstance} */ - Process getProcess(); + ProcessInstance getProcess(); /** - * Get the {@link TokenExecutor} for this {@link Process} + * Get the {@link TokenExecutor} for this {@link ProcessInstance} */ ThreadingTokenExecutor getTokenExecutor(); } \ No newline at end of file Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/RuntimeProcessImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -23,26 +23,26 @@ //$Id$ -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; /** - * A RuntimeProcess add runtime behaviour to the {@link Process} + * A RuntimeProcess add runtime behaviour to the {@link ProcessInstance} * * @author thomas.diesler(a)jboss.com * @since 08-Jul-2008 */ public class RuntimeProcessImpl implements RuntimeProcess { - private Process proc; + private ProcessInstance proc; private ThreadingTokenExecutor tokenExecutor; - public RuntimeProcessImpl(Process proc) + public RuntimeProcessImpl(ProcessInstance proc) { this.proc = proc; this.tokenExecutor = new ThreadingTokenExecutor(this); } - public Process getProcess() + public ProcessInstance getProcess() { return proc; } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/ThreadingTokenExecutor.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -34,7 +34,7 @@ import org.jbpm.api.client.Token; import org.jbpm.api.client.Token.TokenStatus; import org.jbpm.api.model.SequenceFlow; -import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.ProcessInstance.ProcessStatus; import org.jbpm.incubator.runtime.FlowHandler; import org.jbpm.incubator.runtime.TokenExecutor; import org.slf4j.Logger; Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/runtime/TokenImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -32,10 +32,10 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.SequenceFlow; import org.jbpm.api.model.WaitState; -import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.ProcessInstance.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.runtime.BasicAttachments; import org.jbpm.api.runtime.Attachments.Key; @@ -62,7 +62,7 @@ private SequenceFlow flow; private Attachments att; private TokenStatus status; - private Process proc; + private ProcessInstance proc; private Session session; private Token parentToken; @@ -71,7 +71,7 @@ /** * Construct a Token with given {@link Attachments} */ - public TokenImpl(Process proc, Attachments att) + public TokenImpl(ProcessInstance proc, Attachments att) { this.att = new BasicAttachments(att); this.id = new UID().toString(); @@ -104,7 +104,7 @@ } @Override - public Process getProcess() + public ProcessInstance getProcess() { return proc; } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ExecutionServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -33,9 +33,9 @@ import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.client.Token; import org.jbpm.api.model.Expression; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.StartEvent; -import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.ProcessInstance.ProcessStatus; import org.jbpm.api.runtime.Attachments; import org.jbpm.api.service.ProcessService; import org.jbpm.incubator.client.ProcessExt; @@ -79,12 +79,12 @@ } @Override - public void startProcess(Process proc, StartEvent start, Attachments att) + public void startProcess(ProcessInstance proc, StartEvent start, Attachments att) { startProcessInternal(proc, start, att); } - private synchronized void startProcessInternal(Process proc, StartEvent start, Attachments att) + private synchronized void startProcessInternal(ProcessInstance proc, StartEvent start, Attachments att) { @SuppressWarnings("serial") class InitialFlow extends SequenceFlowImpl @@ -154,12 +154,12 @@ } } - public ProcessStatus waitForEnd(Process proc) + public ProcessStatus waitForEnd(ProcessInstance proc) { return waitForEndInternal(proc, 0); } - public ProcessStatus waitForEnd(Process proc, long timeout) + public ProcessStatus waitForEnd(ProcessInstance proc, long timeout) { return waitForEndInternal(proc, timeout); } @@ -169,7 +169,7 @@ * arrive at an End Event. The Process will be in a running state until all Tokens are consumed. If the process was * aborted this method throws the causing RuntimeException if avaialable. */ - private ProcessStatus waitForEndInternal(Process proc, long timeout) + private ProcessStatus waitForEndInternal(ProcessInstance proc, long timeout) { ProcessImpl procImpl = (ProcessImpl)proc; @@ -234,13 +234,13 @@ return status; } - private boolean isProcessTerminated(Process proc) + private boolean isProcessTerminated(ProcessInstance proc) { ProcessStatus status = proc.getProcessStatus(); return status == ProcessStatus.Cancelled || status == ProcessStatus.Completed || status == ProcessStatus.Aborted; } - private RuntimeProcess getRuntimeProcess(Process proc, boolean createNew) + private RuntimeProcess getRuntimeProcess(ProcessInstance proc, boolean createNew) { RuntimeProcess rtProcess; synchronized (runtimeProcesses) @@ -271,7 +271,7 @@ { ThreadingTokenExecutor tokenExecutor = rtProc.getTokenExecutor(); ProcessImpl procImpl = (ProcessImpl)rtProc.getProcess(); - Process proc = rtProc.getProcess(); + ProcessInstance proc = rtProc.getProcess(); ProcessEngine engine = getProcessEngine(); SignalService sigService = engine.getService(SignalService.class); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/HibernatePersistenceServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -38,7 +38,7 @@ import org.jbpm.api.ProcessNotFoundException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.PersistenceService; import org.jbpm.api.service.Service; @@ -151,7 +151,7 @@ } @Override - public ObjectName saveProcess(Process proc) + public ObjectName saveProcess(ProcessInstance proc) { log.debug("START saveProcess: " + proc.getKey()); Session session = getSessionFactory().openSession(); @@ -170,15 +170,15 @@ } @Override - public Process loadProcess(ObjectName procID) + public ProcessInstance loadProcess(ObjectName procID) { log.debug("START loadProcess: " + procID); - Process proc = null; + ProcessInstance proc = null; Session session = getSessionFactory().openSession(); try { Integer id = Integer.valueOf(procID.getKeyProperty("id")); - proc = (Process)session.load(ProcessImpl.class, id); + proc = (ProcessInstance)session.load(ProcessImpl.class, id); AbstractElementImpl elImpl = (AbstractElementImpl)proc; elImpl.initialize(getProcessEngine(), session); } @@ -195,7 +195,7 @@ } @Override - public void deleteProcess(Process proc) + public void deleteProcess(ProcessInstance proc) { log.debug("START deleteProcess: " + proc); Session session = getSessionFactory().openSession(); @@ -204,7 +204,7 @@ { ObjectName procID = proc.getKey(); Integer id = Integer.valueOf(procID.getKeyProperty("id")); - proc = (Process)session.load(ProcessImpl.class, id); + proc = (ProcessInstance)session.load(ProcessImpl.class, id); session.delete(proc); tx.commit(); } Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/InMemoryPersistenceServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -32,7 +32,7 @@ import org.jbpm.api.ProcessNotFoundException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.Node; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.PersistenceService; import org.slf4j.Logger; @@ -50,7 +50,7 @@ final Logger log = LoggerFactory.getLogger(InMemoryPersistenceServiceImpl.class); private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>(); - private Map<ObjectName, Process> procs = new HashMap<ObjectName, Process>(); + private Map<ObjectName, ProcessInstance> procs = new HashMap<ObjectName, ProcessInstance>(); private Map<ObjectName, Node> nodes = new HashMap<ObjectName, Node>(); @Override @@ -89,7 +89,7 @@ } @Override - public ObjectName saveProcess(Process proc) + public ObjectName saveProcess(ProcessInstance proc) { procs.put(proc.getKey(), proc); @@ -100,9 +100,9 @@ } @Override - public Process loadProcess(ObjectName procID) + public ProcessInstance loadProcess(ObjectName procID) { - Process proc = procs.get(procID); + ProcessInstance proc = procs.get(procID); if (proc == null) throw new ProcessNotFoundException("Cannot find process: " + procID); @@ -110,7 +110,7 @@ } @Override - public void deleteProcess(Process proc) + public void deleteProcess(ProcessInstance proc) { procs.remove(proc.getKey()); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessBuilderServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -24,13 +24,13 @@ // $Id$ import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.incubator.model.builder.ProcessBuilderExt; import org.jbpm.ri.model.builder.ProcessBuilderImpl; /** - * The ProcessBuilder can be used to build a {@link Process} dynamically. + * The ProcessBuilder can be used to build a {@link ProcessInstance} dynamically. * * @author thomas.diesler(a)jboss.com * @since 18-Jun-2008 Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessServiceImpl.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -34,9 +34,9 @@ import javax.management.ObjectName; import org.jbpm.api.client.ProcessEngine; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; -import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.model.ProcessInstance.ProcessStatus; import org.jbpm.api.service.PersistenceService; import org.jbpm.api.service.ProcessDefinitionService; import org.jbpm.api.service.ProcessService; @@ -56,7 +56,7 @@ // Provide logging final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class); - private Map<ObjectName, Process> registeredProcs = new HashMap<ObjectName, Process>(); + private Map<ObjectName, ProcessInstance> registeredProcs = new HashMap<ObjectName, ProcessInstance>(); private List<NodeInterceptor> nodeInterceptors = new ArrayList<NodeInterceptor>(); @Override @@ -83,9 +83,9 @@ * Get a Process for a given id */ @Override - public Process getProcess(ObjectName procID) + public ProcessInstance getProcess(ObjectName procID) { - Process proc = registeredProcs.get(procID); + ProcessInstance proc = registeredProcs.get(procID); return proc; } @@ -109,7 +109,7 @@ public Set<ObjectName> getProcesses(String name, ProcessStatus status) { Set<ObjectName> procSet = new HashSet<ObjectName>(); - for (Process auxProc : registeredProcs.values()) + for (ProcessInstance auxProc : registeredProcs.values()) { if (auxProc.getName().equals(name)) { @@ -123,7 +123,7 @@ /** * Register a Process. */ - public ObjectName registerProcess(Process proc) + public ObjectName registerProcess(ProcessInstance proc) { log.debug("registerProcess: " + proc); @@ -160,7 +160,7 @@ public boolean unregisterProcess(ObjectName procID) { boolean removed = false; - Process proc = registeredProcs.get(procID); + ProcessInstance proc = registeredProcs.get(procID); if (proc != null) { log.debug("unregisterProcess: " + proc); Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/dialect/stp/sequence/SequenceTest.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -45,7 +45,7 @@ URL procURL = getResourceURL("dialect/stp/sequence/basic-sequence.bpmn"); ProcessDefinitionService pdService = ProcessDefinitionService.locateProcessDefinitionService(); - ProcessDefinition procDef = pdService.createProcessDefinition(procURL); + ProcessDefinition procDef = pdService.parseProcessDefinition(procURL); assertNotNull(procDef); } Modified: projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java =================================================================== --- projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-24 12:51:41 UTC (rev 3050) +++ projects/spec/trunk/modules/ri/src/test/java/org/jbpm/test/ri/service/persistence/ProcessPersistenceTest.java 2008-11-24 13:02:51 UTC (rev 3051) @@ -28,7 +28,7 @@ import org.jbpm.api.ProcessNotFoundException; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.EndEvent; -import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessInstance; import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.model.StartEvent; import org.jbpm.api.model.Task; @@ -59,12 +59,12 @@ procDefService.registerProcessDefinition(procDef); // Create and save the Process - Process proc = procDef.newInstance(); + ProcessInstance proc = procDef.newInstance(); service.saveProcess(proc); // Load the process ObjectName procID = proc.getKey(); - Process loadProc = service.loadProcess(procID); + ProcessInstance loadProc = service.loadProcess(procID); ProcessCatalog.validateDefaultProcess(loadProc.getProcessDefinition()); StartEvent start = loadProc.getNode(StartEvent.class, "Start");

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3050 - jbpm4/trunk/modules/api.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-24 07:51:41 -0500 (Mon, 24 Nov 2008) New Revision: 3050 Added: jbpm4/trunk/modules/api/build-xsddoc.xml Modified: jbpm4/trunk/modules/api/pom.xml Log: try with a separate ant build Added: jbpm4/trunk/modules/api/build-xsddoc.xml =================================================================== --- jbpm4/trunk/modules/api/build-xsddoc.xml (rev 0) +++ jbpm4/trunk/modules/api/build-xsddoc.xml 2008-11-24 12:51:41 UTC (rev 3050) @@ -0,0 +1,21 @@ +<project name="xsddoc" basedir="."> + + <target name="generate"> + <echo message="compile classpath: ${compile_classpath}"/> + <echo message="runtime classpath: ${runtime_classpath}"/> + <echo message="test classpath: ${test_classpath}"/> + <echo message="plugin classpath: ${plugin_classpath}"/> + + <path id="plugin.classpath"> + <pathelement location="${plugin_classpath}" /> + </path> + + <echo message="basedir: ${basedir}" /> + <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="plugin.classpath" /> + <mkdir dir="target/doc/schemadoc" /> + <xsddoc out="${basedir}/target/doc/schemadoc" title="jBPM 4 Schema's" verbose="false"> + <fileset dir="src/main/resources" /> + </xsddoc> + </target> + +</project> Property changes on: jbpm4/trunk/modules/api/build-xsddoc.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/api/pom.xml =================================================================== --- jbpm4/trunk/modules/api/pom.xml 2008-11-24 12:41:33 UTC (rev 3049) +++ jbpm4/trunk/modules/api/pom.xml 2008-11-24 12:51:41 UTC (rev 3050) @@ -50,38 +50,60 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>generate-jpdlxsd-doc</id> + <id>generate-schemadocs</id> <phase>package</phase> <goals> <goal>run</goal> </goals> <configuration> <tasks> - <echo message="basedir: ${basedir}" /> - <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" /> - <mkdir dir="target/doc/schemadoc" /> - <xsddoc out="modules/api/target/doc/schemadoc" title="jBPM 4 Schema's" verbose="false"> - <fileset dir="src/main/resources" /> - </xsddoc> + <property name="compile_classpath" refid="maven.compile.classpath"/> + <property name="runtime_classpath" refid="maven.runtime.classpath"/> + <property name="test_classpath" refid="maven.test.classpath"/> + <property name="plugin_classpath" refid="maven.plugin.classpath"/> + + <ant antfile="${basedir}/build-xsddoc.xml"> + <target name="generate"/> + </ant> </tasks> </configuration> </execution> -  </executions> <dependencies> <dependency> @@ -96,6 +118,7 @@ </dependency> </dependencies> </plugin> + --> </plugins> </build> @@ -111,4 +134,5 @@ </plugin> </plugins> </reporting> + </project> \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3049 - in projects/gwt-console/trunk: server/src/main/java/org/jboss/bpm/console/server/integration and 4 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2008-11-24 07:41:33 -0500 (Mon, 24 Nov 2008) New Revision: 3049 Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3CommandDelegate.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java projects/gwt-console/trunk/war/src/test/java/PreparationTest.java projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java Log: Improve test coverage: deploy test artifacts, first cut Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/ProcessMgmtFacade.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -27,6 +27,7 @@ import org.jboss.bpm.console.client.model.ProcessDefinitionRefWrapper; import org.jboss.bpm.console.client.model.ProcessInstanceRef; import org.jboss.bpm.console.client.model.ProcessInstanceRefWrapper; +import org.jboss.bpm.console.client.model.ProcessDefinitionRef; import org.jboss.bpm.console.server.gson.GsonFactory; import org.jboss.bpm.console.server.integration.JBPM3Extension; import org.jboss.bpm.console.server.integration.ManagementFactory; @@ -82,6 +83,18 @@ return createJsonResponse(wrapper); } + @GET + @Path("definitions/{name}") + @Produces("application/json") + public Response getDefinitionByName( + @PathParam("name") + String name + ) + { + ProcessDefinitionRef def = getProcessDAO().getDefinition(name); + return createJsonResponse(def); + } + @POST @Path("definitions/{id}/remove") @Produces("application/json") Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/ProcessManagement.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -44,4 +44,6 @@ ProcessInstanceRef newInstance(long processId); void signalToken(long tokenId, String signal); + + ProcessDefinitionRef getDefinition(String name); } Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3CommandDelegate.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3CommandDelegate.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3CommandDelegate.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -28,6 +28,7 @@ import org.jbpm.ejb.LocalCommandService; import org.jbpm.ejb.LocalCommandServiceHome; import org.jbpm.graph.def.ProcessDefinition; +import org.jbpm.graph.exe.ProcessInstance; import org.jbpm.taskmgmt.exe.TaskInstance; import javax.ejb.CreateException; @@ -80,17 +81,24 @@ public List<ProcessDefinition> getActualDefinitions() { - List<org.jbpm.graph.def.ProcessDefinition> defs = (List<org.jbpm.graph.def.ProcessDefinition>) + List<ProcessDefinition> defs = (List<ProcessDefinition>) facade.execute( new GetProcessDefinitionsCommand(false) ); return defs; } - public org.jbpm.graph.def.ProcessDefinition getActualDefinition(long processId) + public ProcessDefinition getActualDefinition(String name) { - List<org.jbpm.graph.def.ProcessDefinition> defs = getActualDefinitions(); + ProcessDefinition def = (ProcessDefinition) + facade.execute( new GetProcessDefinitionCommand(name) ); + return def; + } - org.jbpm.graph.def.ProcessDefinition match = null; - for(org.jbpm.graph.def.ProcessDefinition p0 : defs) + public ProcessDefinition getActualDefinition(long processId) + { + List<ProcessDefinition> defs = getActualDefinitions(); + + ProcessDefinition match = null; + for(ProcessDefinition p0 : defs) { if(processId == p0.getId()) { @@ -107,33 +115,33 @@ public void removeActualDefinition(long processId) { - org.jbpm.graph.def.ProcessDefinition def = getActualDefinition(processId); + ProcessDefinition def = getActualDefinition(processId); facade.execute( new DeleteProcessdefinitionCommand(processId)); } public org.jbpm.graph.exe.ProcessInstance getActualInstance(long instanceId) { - org.jbpm.graph.exe.ProcessInstance instance = (org.jbpm.graph.exe.ProcessInstance) + ProcessInstance instance = (ProcessInstance) facade.execute( new GetProcessInstanceCommand(instanceId)); return instance; } - public List<org.jbpm.graph.exe.ProcessInstance> getActualInstances(long processId) + public List<ProcessInstance> getActualInstances(long processId) { - org.jbpm.graph.def.ProcessDefinition p0 = getActualDefinition(processId); + ProcessDefinition p0 = getActualDefinition(processId); GetProcessInstancesCommand command = new GetProcessInstancesCommand(); command.setProcessId(processId); - List<org.jbpm.graph.exe.ProcessInstance> instances = - (List<org.jbpm.graph.exe.ProcessInstance>) facade.execute(command); + List<ProcessInstance> instances = + (List<ProcessInstance>) facade.execute(command); return instances; } - public org.jbpm.graph.exe.ProcessInstance startNewInstance(long processId) + public ProcessInstance startNewInstance(long processId) { - org.jbpm.graph.def.ProcessDefinition p0 = getActualDefinition(processId); - org.jbpm.graph.exe.ProcessInstance instance = (org.jbpm.graph.exe.ProcessInstance) + ProcessDefinition p0 = getActualDefinition(processId); + ProcessInstance instance = (ProcessInstance) facade.execute(new NewProcessInstanceCommand(p0.getName())); return instance; @@ -141,7 +149,7 @@ public ProcessDefinition deploy(byte[] data) { - org.jbpm.graph.def.ProcessDefinition p0 = (org.jbpm.graph.def.ProcessDefinition) + ProcessDefinition p0 = (ProcessDefinition) facade.execute( new DeployProcessCommand(data) ); Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/internal/JBPM3ProcessManagement.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -60,6 +60,13 @@ return Transform.processDefinition(p0); } + + public ProcessDefinitionRef getDefinition(String name) + { + ProcessDefinition p0 = delegate.getActualDefinition(name); + return Transform.processDefinition(p0); + } + public List<ProcessDefinitionRef> removeDefinition(long processId) { delegate.removeActualDefinition(processId); Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/URLBuilder.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -157,4 +157,8 @@ return getBaseUrl() + "/rs/identity/user/"+actorId+"/actors"; } + public String getProcessDefinitionByNameURL(String name) + { + return getBaseUrl() + "/rs/process/definitions/"+name; + } } Modified: projects/gwt-console/trunk/war/src/test/java/PreparationTest.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/PreparationTest.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/war/src/test/java/PreparationTest.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -22,15 +22,13 @@ import junit.framework.Assert; import junit.framework.TestCase; +import org.jboss.bpm.console.client.URLBuilder; import java.io.*; import java.net.HttpURLConnection; import java.net.MalformedURLException; import java.net.URL; -import org.jboss.bpm.console.client.URLBuilder; -import org.jboss.bpm.console.client.GwtTestApplication; - /** * @author Heiko.Braun <heiko.braun(a)jboss.com> */ Modified: projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java =================================================================== --- projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java 2008-11-24 10:12:50 UTC (rev 3048) +++ projects/gwt-console/trunk/war/src/test/java/org/jboss/bpm/console/client/GwtTestApplication.java 2008-11-24 12:41:33 UTC (rev 3049) @@ -25,6 +25,9 @@ import com.google.gwt.http.client.Response; import com.google.gwt.junit.client.GWTTestCase; import com.google.gwt.user.client.Timer; +import com.gwtext.client.widgets.ComponentMgr; +import org.jboss.bpm.console.client.process.ProcessDefinitionList; +import org.jboss.bpm.console.client.process.ProcessDefinitionListEditor; /** * @author Heiko.Braun <heiko.braun(a)jboss.com> @@ -38,7 +41,6 @@ return "org.jboss.bpm.console.Application"; } - protected void gwtSetUp() throws Exception { super.gwtSetUp(); @@ -87,11 +89,14 @@ delayTestFinish(500); } - /*public void testProcessDefList() + public void testProcessDefList() { final MainView view = application.getConsoleView(); assertNotNull("View not initialized", view); + URLBuilder urlBuilder = new URLBuilder("http://localhost:8080", "gwt-console-server"); + final String url = urlBuilder.getProcessDefinitionByNameURL("simple"); + Timer verification = new Timer(){ public void run() @@ -140,6 +145,6 @@ loading.schedule(1000); verification.schedule(1500); - delayTestFinish(2000); - }*/ + delayTestFinish(2000); + } }

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3048 - jbpm4/trunk/modules/api.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-24 05:12:50 -0500 (Mon, 24 Nov 2008) New Revision: 3048 Modified: jbpm4/trunk/modules/api/pom.xml Log: yet another xsddoc attempt Modified: jbpm4/trunk/modules/api/pom.xml =================================================================== --- jbpm4/trunk/modules/api/pom.xml 2008-11-24 10:09:53 UTC (rev 3047) +++ jbpm4/trunk/modules/api/pom.xml 2008-11-24 10:12:50 UTC (rev 3048) @@ -60,8 +60,8 @@ <echo message="basedir: ${basedir}" /> <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" /> <mkdir dir="target/doc/schemadoc" /> - <xsddoc out="${basedir}/target/doc/schemadoc" title="jBPM 4 Schema's" verbose="false"> - <fileset dir="${basedir}/src/main/resources" /> + <xsddoc out="modules/api/target/doc/schemadoc" title="jBPM 4 Schema's" verbose="false"> + <fileset dir="src/main/resources" /> </xsddoc> </tasks> </configuration>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3047 - jbpm4/trunk/modules/api.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-24 05:09:53 -0500 (Mon, 24 Nov 2008) New Revision: 3047 Modified: jbpm4/trunk/modules/api/pom.xml Log: adding basedir to xsddoc referred xsd files Modified: jbpm4/trunk/modules/api/pom.xml =================================================================== --- jbpm4/trunk/modules/api/pom.xml 2008-11-24 09:48:55 UTC (rev 3046) +++ jbpm4/trunk/modules/api/pom.xml 2008-11-24 10:09:53 UTC (rev 3047) @@ -61,7 +61,7 @@ <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" /> <mkdir dir="target/doc/schemadoc" /> <xsddoc out="${basedir}/target/doc/schemadoc" title="jBPM 4 Schema's" verbose="false"> - <fileset dir="src/main/resources" /> + <fileset dir="${basedir}/src/main/resources" /> </xsddoc> </tasks> </configuration>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r3046 - jbpm4/trunk/modules/api.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-24 04:48:55 -0500 (Mon, 24 Nov 2008) New Revision: 3046 Modified: jbpm4/trunk/modules/api/pom.xml Log: reintroduced basedir paths for the xsddoc ant task Modified: jbpm4/trunk/modules/api/pom.xml =================================================================== --- jbpm4/trunk/modules/api/pom.xml 2008-11-24 09:24:16 UTC (rev 3045) +++ jbpm4/trunk/modules/api/pom.xml 2008-11-24 09:48:55 UTC (rev 3046) @@ -60,7 +60,7 @@ <echo message="basedir: ${basedir}" /> <taskdef name="xsddoc" classname="net.sf.xframe.xsddoc.Task" classpathref="maven.plugin.classpath" /> <mkdir dir="target/doc/schemadoc" /> - <xsddoc out="target/doc/schemadoc" title="jBPM 4 Schema's" verbose="false"> + <xsddoc out="${basedir}/target/doc/schemadoc" title="jBPM 4 Schema's" verbose="false"> <fileset dir="src/main/resources" /> </xsddoc> </tasks>

17 years, 5 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits November 2008