November 2008 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r2944 - in projects/spec/trunk/modules: ri and 1 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-17 02:13:29 -0500 (Mon, 17 Nov 2008) New Revision: 2944 Modified: projects/spec/trunk/modules/cts/pom.xml projects/spec/trunk/modules/ri/pom.xml projects/spec/trunk/modules/ri/src/test/resources/log4j.xml Log: Run CTS as part of RI tests Modified: projects/spec/trunk/modules/cts/pom.xml =================================================================== --- projects/spec/trunk/modules/cts/pom.xml 2008-11-16 18:13:33 UTC (rev 2943) +++ projects/spec/trunk/modules/cts/pom.xml 2008-11-17 07:13:29 UTC (rev 2944) @@ -85,38 +85,10 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <excludes> - <exclude>org/jbpm/test/preview/**/*Test.java</exclude> - <exclude>org/jbpm/test/pattern/**/*Test.java</exclude> - </excludes> + <skipTests>true</skipTests> </configuration> </plugin> </plugins> </build> - -  - <profiles> -  - <profile> - <id>impl</id> - <activation> - <property> - <name>impl</name> - <value>ri</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-ri</artifactId> - <version>${version}</version> - <scope>test</scope> - </dependency> - </dependencies> - </profile> - </profiles> - + </project> Modified: projects/spec/trunk/modules/ri/pom.xml =================================================================== --- projects/spec/trunk/modules/ri/pom.xml 2008-11-16 18:13:33 UTC (rev 2943) +++ projects/spec/trunk/modules/ri/pom.xml 2008-11-17 07:13:29 UTC (rev 2944) @@ -89,6 +89,12 @@ <artifactId>jbpm-spec-dialect-xpdl21</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-spec-cts</artifactId> + <version>${version}</version> + <scope>test</scope> + </dependency> <dependency> <groupId>org.hibernate</groupId> @@ -112,8 +118,33 @@ <build> <plugins> <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-spec-cts</artifactId> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>src/test</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> + <excludes> + <exclude>org/jbpm/test/preview/**/*Test.java</exclude> + <exclude>org/jbpm/test/pattern/**/*Test.java</exclude> + </excludes> </configuration> </plugin> </plugins> Modified: projects/spec/trunk/modules/ri/src/test/resources/log4j.xml =================================================================== --- projects/spec/trunk/modules/ri/src/test/resources/log4j.xml 2008-11-16 18:13:33 UTC (rev 2943) +++ projects/spec/trunk/modules/ri/src/test/resources/log4j.xml 2008-11-17 07:13:29 UTC (rev 2944) @@ -33,7 +33,7 @@  <category name="org.hibernate"> - <priority value="DEBUG" /> + <priority value="INFO" /> </category>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2943 - in jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration: service and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-16 13:13:33 -0500 (Sun, 16 Nov 2008) New Revision: 2943 Modified: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java Log: wip Modified: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java 2008-11-16 18:12:36 UTC (rev 2942) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java 2008-11-16 18:13:33 UTC (rev 2943) @@ -38,6 +38,7 @@ private static final long serialVersionUID = 1L; private Transition oldTrans; + private ConditionType condType = ConditionType.None; public SequenceFlowImpl(Transition oldTrans) { @@ -53,7 +54,7 @@ @Override public ConditionType getConditionType() { - throw new NotImplementedException(); + return condType; } @Override Modified: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-16 18:12:36 UTC (rev 2942) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-16 18:13:33 UTC (rev 2943) @@ -23,8 +23,19 @@ // $Id$ +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.management.ObjectName; + import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.ProcessDefinition; import org.jbpm.api.service.ProcessDefinitionService; +import org.jbpm.api.service.ProcessInstanceService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The ProcessDefinitionService is the entry point to create, find and otherwise manage process definitions. @@ -34,9 +45,64 @@ */ public class ProcessDefinitionServiceImpl extends ProcessDefinitionService implements MutableService { + // Provide logging + final static Logger log = LoggerFactory.getLogger(ProcessDefinitionServiceImpl.class); + + // The set of registered ProcessDefinitions + private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>(); + @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) + throw new IllegalStateException("Process definition already registered: " + procDef); + + log.debug("registerProcessDefinition: " + procDef); + + // Save the ProcessDefinition through the PersistenceService + ObjectName procDefID = procDef.getKey(); + procDefs.put(procDefID, procDef); + + return procDefID; + } + + @Override + public boolean unregisterProcessDefinition(ObjectName procDefID) + { + boolean removed = false; + ProcessDefinition procDef = procDefs.get(procDefID); + if (procDef != null) + { + log.debug("unregisterProcessDefinition: " + procDef); + + ProcessEngine engine = getProcessEngine(); + + // Unregister the associated process instances + ProcessInstanceService procService = engine.getService(ProcessInstanceService.class); + for (ObjectName procID : procService.getProcesses(procDef.getName(), null)) + procService.unregisterProcess(procID); + + procDefs.remove(procDefID); + removed = true; + } + return removed; + } } \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2942 - in projects/spec/trunk/modules: ri/src/main/java/org/jbpm/ri/service and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-16 13:12:36 -0500 (Sun, 16 Nov 2008) New Revision: 2942 Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java Log: wip 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-15 14:22:04 UTC (rev 2941) +++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-11-16 18:12:36 UTC (rev 2942) @@ -28,9 +28,6 @@ import java.io.InputStream; import java.net.URI; import java.net.URL; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; import java.util.Set; import javax.management.ObjectName; @@ -56,9 +53,6 @@ // Provide logging final static Logger log = LoggerFactory.getLogger(ProcessDefinitionService.class); - // The set of registered ProcessDefinitions - private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>(); - // Hide public constructor protected ProcessDefinitionService() { @@ -74,6 +68,26 @@ } /** + * Register a ProcessDefinition. + */ + public abstract ObjectName registerProcessDefinition(ProcessDefinition procDef); + + /** + * Unregister a ProcessDefinition. + */ + public abstract boolean unregisterProcessDefinition(ObjectName procDefID); + + /** + * Get a ProcessDefinition for a given id + */ + public abstract ProcessDefinition getProcessDefinition(ObjectName procDefID); + + /** + * Get the set of registered ProcessDefinition names + */ + public abstract Set<ObjectName> getProcessDefinitions(); + + /** * Create a ProcessDefinition from a XML string in one of the supported formats */ public final ProcessDefinition createProcessDefinition(String pXML) @@ -103,66 +117,6 @@ return procDef; } - /** - * Register a ProcessDefinition. - */ - public ObjectName registerProcessDefinition(ProcessDefinition procDef) - { - if (getProcessDefinition(procDef.getKey()) != null) - throw new IllegalStateException("Process definition already registered: " + procDef); - - log.debug("registerProcessDefinition: " + procDef); - - // Save the ProcessDefinition through the PersistenceService - PersistenceService persService = getProcessEngine().getService(PersistenceService.class); - ObjectName procDefID = persService.saveProcessDefinition(procDef); - procDefs.put(procDefID, procDef); - return procDefID; - } - - /** - * Unregister a ProcessDefinition. - */ - public boolean unregisterProcessDefinition(ObjectName procDefID) - { - boolean removed = false; - ProcessDefinition procDef = procDefs.get(procDefID); - if (procDef != null) - { - log.debug("unregisterProcessDefinition: " + procDef); - - ProcessEngine engine = getProcessEngine(); - - // Unregister the associated process instances - ProcessInstanceService procService = engine.getService(ProcessInstanceService.class); - for (ObjectName procID : procService.getProcesses(procDef.getName(), null)) - procService.unregisterProcess(procID); - - // Delete the ProcessDefinition through the PersistenceService - PersistenceService persService = engine.getService(PersistenceService.class); - persService.deleteProcessDefinition(procDef); - procDefs.remove(procDefID); - removed = true; - } - return removed; - } - - /** - * Get a ProcessDefinition for a given id - */ - public ProcessDefinition getProcessDefinition(ObjectName procDefID) - { - return procDefs.get(procDefID); - } - - /** - * Get the set of registered ProcessDefinition names - */ - public Set<ObjectName> getProcessDefinitions() - { - return Collections.unmodifiableSet(procDefs.keySet()); - } - private URI getNamespaceURI(InputStream procXML) { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java =================================================================== --- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java 2008-11-15 14:22:04 UTC (rev 2941) +++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/service/ProcessDefinitionServiceImpl.java 2008-11-16 18:12:36 UTC (rev 2942) @@ -23,12 +23,21 @@ // $Id$ +import java.util.Collections; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + import javax.management.ObjectName; import org.jbpm.api.client.ProcessEngine; import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.service.PersistenceService; import org.jbpm.api.service.ProcessDefinitionService; +import org.jbpm.api.service.ProcessInstanceService; import org.jbpm.ri.model.ProcessDefinitionImpl; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * The ProcessDefinitionService is the entry point to create, find and otherwise manage process definitions. @@ -38,6 +47,12 @@ */ public class ProcessDefinitionServiceImpl extends ProcessDefinitionService implements MutableService { + // Provide logging + final static Logger log = LoggerFactory.getLogger(ProcessDefinitionServiceImpl.class); + + // The set of registered ProcessDefinitions + private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>(); + @Override public void setProcessEngine(ProcessEngine engine) { @@ -45,11 +60,33 @@ } @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) { - ObjectName procDefID = super.registerProcessDefinition(procDef); + if (getProcessDefinition(procDef.getKey()) != null) + throw new IllegalStateException("Process definition already registered: " + procDef); + + log.debug("registerProcessDefinition: " + procDef); + + // Save the ProcessDefinition through the PersistenceService + PersistenceService persService = getProcessEngine().getService(PersistenceService.class); + ObjectName procDefID = persService.saveProcessDefinition(procDef); + procDefs.put(procDefID, procDef); + ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)procDef; procDefImpl.register(procDef); + return procDefID; } @@ -59,7 +96,26 @@ ProcessDefinitionImpl procDefImpl = (ProcessDefinitionImpl)getProcessDefinition(procDefID); if (procDefImpl != null) procDefImpl.unregister(procDefImpl); - - return super.unregisterProcessDefinition(procDefID); + + boolean removed = false; + ProcessDefinition procDef = procDefs.get(procDefID); + if (procDef != null) + { + log.debug("unregisterProcessDefinition: " + procDef); + + ProcessEngine engine = getProcessEngine(); + + // Unregister the associated process instances + ProcessInstanceService procService = engine.getService(ProcessInstanceService.class); + for (ObjectName procID : procService.getProcesses(procDef.getName(), null)) + procService.unregisterProcess(procID); + + // Delete the ProcessDefinition through the PersistenceService + PersistenceService persService = engine.getService(PersistenceService.class); + persService.deleteProcessDefinition(procDef); + procDefs.remove(procDefID); + removed = true; + } + return removed; } } \ No newline at end of file

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2941 - in jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration: model and 1 other directory.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-15 09:22:04 -0500 (Sat, 15 Nov 2008) New Revision: 2941 Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/TokenImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessImpl.java Modified: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java Log: WaitStateTest - ok Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/TokenImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/TokenImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/TokenImpl.java 2008-11-15 14:22:04 UTC (rev 2941) @@ -0,0 +1,136 @@ +/* + * 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.client; + +import java.util.Set; + +import org.jbpm.api.NotImplementedException; +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.SequenceFlow; +import org.jbpm.api.model.Process.ProcessStatus; +import org.jbpm.api.runtime.Attachments; +import org.jbpm.integration.model.ProcessImpl; + +/** + * An integration wrapper + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class TokenImpl implements Token +{ + private static final long serialVersionUID = 1L; + + private org.jbpm.graph.exe.Token oldToken; + private ProcessImpl procImpl; + private Attachments att; + + public TokenImpl(ProcessImpl proc, org.jbpm.graph.exe.Token oldToken, Attachments att) + { + this.oldToken = oldToken; + this.procImpl = proc; + this.att = att; + } + + @Override + public String getTokenID() + { + throw new NotImplementedException(); + } + + @Override + public Process getProcess() + { + return procImpl; + } + + @Override + public ProcessEngine getProcessEngine() + { + return procImpl.getProcessEngine(); + } + + @Override + public Attachments getAttachments() + { + return att; + } + + @Override + public TokenStatus getTokenStatus() + { + TokenStatus status = TokenStatus.Suspended; + if (oldToken.hasEnded()) + { + status = TokenStatus.Destroyed; + } + return status; + } + + @Override + public Set<Token> getChildTokens() + { + throw new NotImplementedException(); + } + + @Override + public Node getCurrentNode() + { + String nodeName = oldToken.getNode().getName(); + return procImpl.getNode(nodeName); + } + + @Override + public SequenceFlow getLastFlow() + { + throw new NotImplementedException(); + } + + @Override + public Token getParentToken() + { + throw new NotImplementedException(); + } + + @Override + public Token getRootToken() + { + throw new NotImplementedException(); + } + + @Override + public void signal() + { + try + { + oldToken.signal(); + } + catch (RuntimeException rte) + { + procImpl.setProcessStatus(ProcessStatus.Aborted); + throw rte; + } + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/TokenImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-15 11:17:46 UTC (rev 2940) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-15 14:22:04 UTC (rev 2941) @@ -23,11 +23,13 @@ import javax.management.ObjectName; +import org.jbpm.api.Constants; import org.jbpm.api.InvalidProcessException; import org.jbpm.api.NotImplementedException; 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; /** @@ -52,7 +54,8 @@ @Override public ObjectName getKey() { - throw new NotImplementedException(); + long id = oldNode.getId(); + return ObjectNameFactory.create(Constants.ID_DOMAIN + ":node=" + getName() + ",id=" + id); } public org.jbpm.graph.def.Node getOldNode() Modified: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-15 11:17:46 UTC (rev 2940) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-15 14:22:04 UTC (rev 2941) @@ -26,12 +26,13 @@ import javax.management.ObjectName; +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.node.EndState; import org.jbpm.graph.node.StartState; import org.jbpm.graph.node.State; @@ -58,6 +59,13 @@ throw new InvalidProcessException("ProcessDefinition name cannot be null"); } + + public org.jbpm.graph.def.ProcessDefinition getOldProcessDefinition() + { + return oldProcDef; + } + + @Override public ProcessEngine getProcessEngine() { @@ -67,7 +75,8 @@ @Override public ObjectName getKey() { - throw new NotImplementedException(); + long id = oldProcDef.getId(); + return ObjectNameFactory.create(Constants.ID_DOMAIN + ":procdef=" + getName() + ",id=" + id); } @Override @@ -79,7 +88,7 @@ @Override public Process newInstance() { - throw new NotImplementedException(); + return new ProcessImpl(this); } public void addNode(NodeImpl nodeImpl) Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessImpl.java 2008-11-15 14:22:04 UTC (rev 2941) @@ -0,0 +1,139 @@ +/* + * 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.model; + +import java.util.List; + +import javax.management.ObjectName; + +import org.jbpm.api.Constants; +import org.jbpm.api.client.ProcessEngine; +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.ProcessDefinition; +import org.jbpm.api.model.builder.ObjectNameFactory; +import org.jbpm.api.runtime.Attachments; +import org.jbpm.graph.exe.ProcessInstance; +import org.jbpm.integration.client.TokenImpl; + +/** + * An integration wrapper + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class ProcessImpl implements Process +{ + private static final long serialVersionUID = 1L; + + private ProcessDefinitionImpl procDef; + private ProcessInstance oldProc; + private ProcessStatus procStatus = ProcessStatus.None; + private Token rootToken; + + public ProcessImpl(ProcessDefinitionImpl procDef) + { + this.procDef = procDef; + } + + @Override + public ObjectName getKey() + { + long id = oldProc != null ? oldProc.getId() : 0; + return ObjectNameFactory.create(Constants.ID_DOMAIN + ":proc=" + getName() + ",id=" + id); + } + + @Override + public ProcessDefinition getProcessDefinition() + { + return procDef; + } + + @Override + public ProcessEngine getProcessEngine() + { + return procDef.getProcessEngine(); + } + + @Override + public ProcessStatus getProcessStatus() + { + if (rootToken.getTokenStatus() == TokenStatus.Destroyed) + procStatus = ProcessStatus.Completed; + + return procStatus; + } + + public void setProcessStatus(ProcessStatus procStatus) + { + this.procStatus = procStatus; + } + + @Override + public Token startProcess() + { + setProcessStatus(ProcessStatus.Ready); + rootToken = startProcess(null); + return rootToken; + } + + @Override + public Token startProcess(Attachments att) + { + oldProc = new ProcessInstance(procDef.getOldProcessDefinition()); + TokenImpl token = new TokenImpl(this, oldProc.getRootToken(), att); + token.signal(); + return token; + } + + @Override + public String getName() + { + return procDef.getName(); + } + + @Override + public <T extends Node> T getNode(Class<T> clazz, String name) + { + return procDef.getNode(clazz, name); + } + + @Override + public Node getNode(String name) + { + return procDef.getNode(name); + } + + @Override + public List<Node> getNodes() + { + return procDef.getNodes(); + } + + @Override + public <T extends Node> List<T> getNodes(Class<T> clazz) + { + return procDef.getNodes(clazz); + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2940 - in jbpm3/branches/tdiesler: modules/integration and 4 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-15 06:17:46 -0500 (Sat, 15 Nov 2008) New Revision: 2940 Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/EndEventImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/StartEventImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/TaskImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/WaitStateImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/builder/ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java Modified: jbpm3/branches/tdiesler/modules/integration/pom.xml jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java jbpm3/branches/tdiesler/pom.xml Log: ProcessBuilderTest - ok Modified: jbpm3/branches/tdiesler/modules/integration/pom.xml =================================================================== --- jbpm3/branches/tdiesler/modules/integration/pom.xml 2008-11-15 11:16:48 UTC (rev 2939) +++ jbpm3/branches/tdiesler/modules/integration/pom.xml 2008-11-15 11:17:46 UTC (rev 2940) @@ -33,15 +33,8 @@ <dependency> <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-spec-api</artifactId> - <scope>provided</scope> </dependency> <dependency> - <groupId>org.jbpm.jbpm4</groupId> - <artifactId>jbpm-spec-cts</artifactId> - <scope>provided</scope> - <type>zip</type> - </dependency> - <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> @@ -52,6 +45,23 @@ <classifier>config</classifier> <version>${version}</version> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-spec-dialect-api10</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-spec-cts</artifactId> + <scope>test</scope> + <type>zip</type> + </dependency> </dependencies> <build> @@ -77,6 +87,15 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <excludes> + <exclude>org/jbpm/test/preview/**/*Test.java</exclude> + <exclude>org/jbpm/test/pattern/**/*Test.java</exclude> + </excludes> + </configuration> + </plugin> </plugins> </build> Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/EndEventImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/EndEventImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/EndEventImpl.java 2008-11-15 11:17:46 UTC (rev 2940) @@ -0,0 +1,57 @@ +/* + * 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.model; + +import org.jbpm.api.model.EndEvent; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.graph.node.EndState; + +/** + * An integration wrapper + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class EndEventImpl extends NodeImpl implements EndEvent +{ + private static final long serialVersionUID = 1L; + + private EndState oldEnd; + + public EndEventImpl(ProcessDefinition procDef, EndState oldEnd) + { + super(procDef, oldEnd); + this.oldEnd = oldEnd; + } + + @Override + public EventDetailType getResultType() + { + return EventDetailType.None; + } + + @Override + public EventType getEventType() + { + return EventType.End; + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/EndEventImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java 2008-11-15 11:17:46 UTC (rev 2940) @@ -0,0 +1,100 @@ +/* + * 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.model; + +import javax.management.ObjectName; + +import org.jbpm.api.InvalidProcessException; +import org.jbpm.api.NotImplementedException; +import org.jbpm.api.model.Node; +import org.jbpm.api.model.Process; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.graph.def.Transition; + +/** + * An integration wrapper + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class NodeImpl implements Node +{ + private static final long serialVersionUID = 1L; + + private ProcessDefinition procDef; + private org.jbpm.graph.def.Node oldNode; + + public NodeImpl(ProcessDefinition procDef, org.jbpm.graph.def.Node oldNode) + { + this.procDef = procDef; + this.oldNode = oldNode; + } + + @Override + public ObjectName getKey() + { + throw new NotImplementedException(); + } + + public org.jbpm.graph.def.Node getOldNode() + { + return oldNode; + } + + @Override + public String getName() + { + return oldNode.getName(); + } + + @Override + public ProcessDefinition getProcessDefinition() + { + return procDef; + } + + @Override + public Process getProcess() + { + throw new NotImplementedException(); + } + + public void addSequenceFlow(String targetName) + { + NodeImpl targetNode = (NodeImpl)procDef.getNode(targetName); + if (targetNode == null) + throw new InvalidProcessException("Cannot obtain target node: " + targetName); + + Transition trans = new Transition(); + trans.setFrom(this.getOldNode()); + trans.setTo(targetNode.getOldNode()); + + oldNode.addLeavingTransition(trans); + targetNode.getOldNode().addArrivingTransition(trans); + } + + @Override + public String toString() + { + return oldNode.toString(); + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/NodeImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java 2008-11-15 11:17:46 UTC (rev 2940) @@ -0,0 +1,160 @@ +/* + * 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.model; + +import java.util.ArrayList; +import java.util.List; + +import javax.management.ObjectName; + +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.graph.node.EndState; +import org.jbpm.graph.node.StartState; +import org.jbpm.graph.node.State; + +/** + * An integration wrapper + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class ProcessDefinitionImpl implements ProcessDefinition +{ + private static final long serialVersionUID = 1L; + + private org.jbpm.graph.def.ProcessDefinition oldProcDef; + private ProcessEngine engine; + + public ProcessDefinitionImpl(ProcessEngine engine, String name) + { + this.oldProcDef = new org.jbpm.graph.def.ProcessDefinition(name); + this.engine = engine; + + if (name == null) + throw new InvalidProcessException("ProcessDefinition name cannot be null"); + } + + @Override + public ProcessEngine getProcessEngine() + { + return engine; + } + + @Override + public ObjectName getKey() + { + throw new NotImplementedException(); + } + + @Override + public String getName() + { + return oldProcDef.getName(); + } + + @Override + public Process newInstance() + { + throw new NotImplementedException(); + } + + public void addNode(NodeImpl nodeImpl) + { + org.jbpm.graph.def.Node oldNode = nodeImpl.getOldNode(); + oldProcDef.addNode(oldNode); + } + + @Override + public Node getNode(String name) + { + org.jbpm.graph.def.Node oldNode = oldProcDef.getNode(name); + return adaptNode(oldNode); + } + + @Override + @SuppressWarnings("unchecked") + public List<Node> getNodes() + { + List<Node> nodes = new ArrayList<Node>(); + List<org.jbpm.graph.def.Node> oldNodes = oldProcDef.getNodes(); + for (org.jbpm.graph.def.Node oldNode : oldNodes) + { + nodes.add(adaptNode(oldNode)); + } + return nodes; + } + + @Override + @SuppressWarnings("unchecked") + public <T extends Node> T getNode(Class<T> clazz, String name) + { + for (Node node : getNodes(clazz)) + { + if (node.getName().equals(name)) + return (T)node; + } + return null; + } + + @Override + @SuppressWarnings("unchecked") + public <T extends Node> List<T> getNodes(Class<T> clazz) + { + List<T> retNodes = new ArrayList<T>(); + for (Node node : getNodes()) + { + if (clazz.isAssignableFrom(node.getClass())) + retNodes.add((T)node); + } + return retNodes; + } + + private NodeImpl adaptNode(org.jbpm.graph.def.Node oldNode) + { + NodeImpl node = null; + if (oldNode != null) + { + if (oldNode instanceof StartState) + { + node = new StartEventImpl(this, (StartState)oldNode); + } + else if (oldNode instanceof State) + { + node = new WaitStateImpl(this, (State)oldNode); + } + else if (oldNode instanceof EndState) + { + node = new EndEventImpl(this, (EndState)oldNode); + } + else + { + node = new TaskImpl(this, oldNode); + } + } + return node; + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/ProcessDefinitionImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java 2008-11-15 11:17:46 UTC (rev 2940) @@ -0,0 +1,72 @@ +/* + * 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.model; + +import org.jbpm.api.NotImplementedException; +import org.jbpm.api.model.Expression; +import org.jbpm.api.model.SequenceFlow; +import org.jbpm.graph.def.Node; +import org.jbpm.graph.def.Transition; + +/** + * An integration wrapper + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class SequenceFlowImpl implements SequenceFlow +{ + private static final long serialVersionUID = 1L; + + private Transition oldTrans; + + public SequenceFlowImpl(Transition oldTrans) + { + this.oldTrans = oldTrans; + } + + @Override + public Expression getConditionExpression() + { + throw new NotImplementedException(); + } + + @Override + public ConditionType getConditionType() + { + throw new NotImplementedException(); + } + + @Override + public String getSourceRef() + { + Node from = oldTrans.getFrom(); + return from != null ? from.getName() : null; + } + + @Override + public String getTargetRef() + { + Node to = oldTrans.getTo(); + return to != null ? to.getName() : null; + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/SequenceFlowImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/StartEventImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/StartEventImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/StartEventImpl.java 2008-11-15 11:17:46 UTC (rev 2940) @@ -0,0 +1,80 @@ +/* + * 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.model; + +import java.util.List; + +import org.jbpm.api.InvalidProcessException; +import org.jbpm.api.NotImplementedException; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.StartEvent; +import org.jbpm.graph.def.Transition; +import org.jbpm.graph.node.StartState; + +/** + * An integration wrapper + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class StartEventImpl extends NodeImpl implements StartEvent +{ + private static final long serialVersionUID = 1L; + + private StartState oldStart; + + public StartEventImpl(ProcessDefinition procDef, StartState oldStart) + { + super(procDef, oldStart); + this.oldStart = oldStart; + + if (oldStart.getName() == null) + throw new InvalidProcessException("StartEvent name cannot be null"); + } + + @Override + public EventDetailType getTriggerType() + { + return EventDetailType.None; + } + + @Override + public EventType getEventType() + { + return EventType.Start; + } + + @Override + @SuppressWarnings("unchecked") + public SequenceFlow getOutFlow() + { + List<Transition> leavingTransitions = oldStart.getLeavingTransitions(); + if (leavingTransitions == null) + throw new IllegalStateException ("No leaving transitions on: " + oldStart); + if (leavingTransitions.size() > 1) + throw new NotImplementedException ("Multiple leaving transitions on: " + oldStart); + + Transition to = leavingTransitions.get(0); + return new SequenceFlowImpl(to); + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/StartEventImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/TaskImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/TaskImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/TaskImpl.java 2008-11-15 11:17:46 UTC (rev 2940) @@ -0,0 +1,82 @@ +/* + * 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.model; + +import java.util.List; +import java.util.Set; + +import org.jbpm.api.NotImplementedException; +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.SequenceFlow; +import org.jbpm.api.model.Task; +import org.jbpm.graph.def.Node; +import org.jbpm.graph.def.Transition; + +/** + * An integration wrapper + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class TaskImpl extends NodeImpl implements Task +{ + private static final long serialVersionUID = 1L; + + public TaskImpl(ProcessDefinition procDef, org.jbpm.graph.def.Node oldNode) + { + super(procDef, oldNode); + } + + @Override + public TaskType getTaskType() + { + return TaskType.None; + } + + @Override + public SequenceFlow getInFlow() + { + Node oldNode = getOldNode(); + Set<Transition> arrivingTransitions = oldNode.getArrivingTransitions(); + if (arrivingTransitions == null) + throw new IllegalStateException("No leaving transitions on: " + oldNode); + if (arrivingTransitions.size() > 1) + throw new NotImplementedException("Multiple leaving transitions on: " + oldNode); + + Transition from = arrivingTransitions.iterator().next(); + return new SequenceFlowImpl(from); + } + + @Override + public SequenceFlow getOutFlow() + { + Node oldNode = getOldNode(); + List<Transition> leavingTransitions = oldNode.getLeavingTransitions(); + if (leavingTransitions == null) + throw new IllegalStateException("No leaving transitions on: " + oldNode); + if (leavingTransitions.size() > 1) + throw new NotImplementedException("Multiple leaving transitions on: " + oldNode); + + Transition to = leavingTransitions.get(0); + return new SequenceFlowImpl(to); + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/TaskImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/WaitStateImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/WaitStateImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/WaitStateImpl.java 2008-11-15 11:17:46 UTC (rev 2940) @@ -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.integration.model; + +import org.jbpm.api.model.ProcessDefinition; +import org.jbpm.api.model.WaitState; +import org.jbpm.graph.node.State; + +/** + * An integration wrapper + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class WaitStateImpl extends TaskImpl implements WaitState +{ + private static final long serialVersionUID = 1L; + + public WaitStateImpl(ProcessDefinition procDef, State oldState) + { + super(procDef, oldState); + } + + @Override + public TaskType getTaskType() + { + return TaskType.Wait; + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/WaitStateImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java 2008-11-15 11:17:46 UTC (rev 2940) @@ -0,0 +1,195 @@ +/* + * 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.model.builder; + +//$Id$ + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.jbpm.api.InvalidProcessException; +import org.jbpm.api.NotImplementedException; +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.ProcessDefinition; +import org.jbpm.api.model.StartEvent; +import org.jbpm.api.model.Gateway.GatewayType; +import org.jbpm.api.model.Task.TaskType; +import org.jbpm.api.model.builder.GatewayBuilder; +import org.jbpm.api.model.builder.ProcessBuilder; +import org.jbpm.graph.node.EndState; +import org.jbpm.graph.node.StartState; +import org.jbpm.graph.node.State; +import org.jbpm.integration.model.EndEventImpl; +import org.jbpm.integration.model.NodeImpl; +import org.jbpm.integration.model.ProcessDefinitionImpl; +import org.jbpm.integration.model.StartEventImpl; +import org.jbpm.integration.model.TaskImpl; +import org.jbpm.integration.model.WaitStateImpl; + +/** + * The ProcessBuilder can be used to dynamically build a {@link Process}. + * + * @author thomas.diesler(a)jboss.com + * @since 15-Nov-2008 + */ +public class ProcessBuilderImpl implements ProcessBuilder +{ + protected ProcessEngine engine; + protected ProcessDefinitionImpl procDefImpl; + protected NodeImpl nodeImpl; + + private List<FlowTuple> flows = new ArrayList<FlowTuple>(); + + public ProcessBuilderImpl(ProcessEngine engine) + { + this.engine = engine; + } + + protected ProcessBuilderImpl(ProcessBuilderImpl procBuilder) + { + this.engine = procBuilder.engine; + this.procDefImpl = procBuilder.procDefImpl; + this.nodeImpl = procBuilder.nodeImpl; + this.flows = procBuilder.flows; + } + + @Override + public ProcessBuilder addProcess(String name) + { + procDefImpl = new ProcessDefinitionImpl(engine, name); + return this; + } + + @Override + public ProcessDefinition getProcessDefinition() + { + // Initialize the flows + for (FlowTuple flow : flows) + { + NodeImpl srcNode = (NodeImpl)procDefImpl.getNode(flow.source); + if (srcNode == null) + throw new InvalidProcessException("Cannot obtain source node: " + flow.source); + + srcNode.addSequenceFlow(flow.target); + } + + // Verify that there is a start event + List<StartEvent> startEvents = procDefImpl.getNodes(StartEvent.class); + if (startEvents.size() == 0) + throw new InvalidProcessException("Cannot obtain a start event"); + + // Verify that there is an end event + List<EndEvent> endEvents = procDefImpl.getNodes(EndEvent.class); + if (endEvents.size() == 0) + throw new InvalidProcessException("Cannot obtain an end event"); + + // Detect unreachable nodes + for (Node node : procDefImpl.getNodes()) + { + NodeImpl nodeImpl = (NodeImpl)node; + Set arriving = nodeImpl.getOldNode().getArrivingTransitions(); + if (!(node instanceof StartEvent) && arriving == null) + throw new InvalidProcessException("Unreachable node: " + node); + } + + // Detect dead end nodes + for (Node node : procDefImpl.getNodes()) + { + NodeImpl nodeImpl = (NodeImpl)node; + List leaving = nodeImpl.getOldNode().getLeavingTransitions(); + if (!(node instanceof EndEvent) && leaving == null) + throw new InvalidProcessException("Dead end node: " + node); + } + return procDefImpl; + } + + @Override + public ProcessBuilder addStartEvent(String name) + { + nodeImpl = new StartEventImpl(procDefImpl, new StartState(name)); + procDefImpl.addNode(nodeImpl); + return this; + } + + @Override + public GatewayBuilder addGateway(String name, GatewayType type) + { + return null; + } + + @Override + public ProcessBuilder addTask(String name) + { + return addTask(name, TaskType.None); + } + + @Override + public ProcessBuilder addTask(String name, TaskType type) + { + if (type == TaskType.None) + { + nodeImpl = new TaskImpl(procDefImpl, new org.jbpm.graph.def.Node(name)); + procDefImpl.addNode(nodeImpl); + } + else if (type == TaskType.Wait) + { + nodeImpl = new WaitStateImpl(procDefImpl, new State(name)); + procDefImpl.addNode(nodeImpl); + } + else + { + throw new NotImplementedException("Unsupported task type: " + type); + } + return this; + } + + @Override + public ProcessBuilder addEndEvent(String name) + { + nodeImpl = new EndEventImpl(procDefImpl, new EndState(name)); + procDefImpl.addNode(nodeImpl); + return this; + } + + @Override + public ProcessBuilder addSequenceFlow(String targetName) + { + flows.add(new FlowTuple(nodeImpl.getName(), targetName)); + return this; + } + + private class FlowTuple + { + String source; + String target; + + public FlowTuple(String source, String target) + { + this.source = source; + this.target = target; + } + } +} \ No newline at end of file Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/model/builder/ProcessBuilderImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java 2008-11-15 11:16:48 UTC (rev 2939) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java 2008-11-15 11:17:46 UTC (rev 2940) @@ -27,7 +27,7 @@ import org.jbpm.api.model.Process; import org.jbpm.api.service.ProcessBuilderService; import org.jbpm.api.model.builder.ProcessBuilder; - +import org.jbpm.integration.model.builder.ProcessBuilderImpl; /** * The ProcessBuilder can be used to build a {@link Process} dynamically. * @@ -45,6 +45,6 @@ @Override public ProcessBuilder getProcessBuilder() { - return null; + return new ProcessBuilderImpl(getProcessEngine()); } } \ No newline at end of file Modified: jbpm3/branches/tdiesler/pom.xml =================================================================== --- jbpm3/branches/tdiesler/pom.xml 2008-11-15 11:16:48 UTC (rev 2939) +++ jbpm3/branches/tdiesler/pom.xml 2008-11-15 11:17:46 UTC (rev 2940) @@ -96,6 +96,11 @@ </dependency> <dependency> <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-spec-dialect-api10</artifactId> + <version>${jbpm.api.version}</version> + </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-spec-cts</artifactId> <version>${jbpm.api.version}</version> <type>zip</type>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2939 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api/test and 5 other directories.

by do-not-reply＠jboss.org

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

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2938 - jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/context/exe.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2008-11-14 14:16:12 -0500 (Fri, 14 Nov 2008) New Revision: 2938 Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/context/exe/CustomSerializable.zip Log: eliminated test dependencies on jdk 5 Modified: jbpm3/branches/jpdl-3.2.3.GA_JBPM-1704/jpdl/jar/src/test/java/org/jbpm/context/exe/CustomSerializable.zip =================================================================== (Binary files differ)

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2937 - in jbpm3/branches/tdiesler: modules/integration and 6 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-14 12:57:12 -0500 (Fri, 14 Nov 2008) New Revision: 2937 Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeInterceptor.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/MutableService.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java jbpm3/branches/tdiesler/modules/integration/src/main/resources/jbpm-cfg-beans.xml jbpm3/branches/tdiesler/modules/integration/src/main/resources/org.jbpm.api.client.ConfigurationProvider Removed: jbpm3/branches/tdiesler/modules/integration/src/main/resources/jbpm-beans.xml Modified: jbpm3/branches/tdiesler/modules/integration/pom.xml jbpm3/branches/tdiesler/modules/integration/src/ jbpm3/branches/tdiesler/pom.xml Log: Add integration layer Modified: jbpm3/branches/tdiesler/modules/integration/pom.xml =================================================================== --- jbpm3/branches/tdiesler/modules/integration/pom.xml 2008-11-14 17:51:14 UTC (rev 2936) +++ jbpm3/branches/tdiesler/modules/integration/pom.xml 2008-11-14 17:57:12 UTC (rev 2937) @@ -36,6 +36,12 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-spec-cts</artifactId> + <scope>provided</scope> + <type>zip</type> + </dependency> + <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jbpm-jpdl</artifactId> <version>${version}</version> @@ -47,5 +53,31 @@ <version>${version}</version> </dependency> </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-spec-cts</artifactId> + <type>zip</type> + </artifactItem> + </artifactItems> + <outputDirectory>src/test</outputDirectory> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Property changes on: jbpm3/branches/tdiesler/modules/integration/src ___________________________________________________________________ Name: svn:ignore + test Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,54 @@ +/* + * 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.client; + +//$Id$ + +import java.util.Set; + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.service.Service; +import org.jbpm.integration.service.MutableService; + +/** + * A process engine with public access + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public class ProcessEngineImpl extends ProcessEngine +{ + public void setServices(Set<Service> services) + { + this.services = services; + + // Set this engine on every mutable service + for (Service service : services) + { + if (service instanceof MutableService) + { + MutableService mutService = (MutableService)service; + mutService.setProcessEngine(this); + } + } + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/client/ProcessEngineImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,41 @@ +/* + * 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.runtime; + +//$Id$ + +import org.jbpm.api.client.Token; + +/** + * An interceptor that invokes the Node.execute + * + * @author thomas.diesler(a)jboss.com + * @since 07-Oct-2008 + */ +public class NodeExecuteInterceptor implements NodeInterceptor +{ + @Override + public void execute(RuntimeContext rtContext) + { + Token token = rtContext.getToken(); + } +} \ No newline at end of file Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeExecuteInterceptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeInterceptor.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeInterceptor.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeInterceptor.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,35 @@ +/* + * 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.runtime; + +//$Id$ + +/** + * A node interceptor + * + * @author thomas.diesler(a)jboss.com + * @since 07-Oct-2008 + */ +public interface NodeInterceptor +{ + void execute (RuntimeContext rtContext); +} \ No newline at end of file Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/NodeInterceptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,68 @@ +/* + * 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.runtime; + +//$Id$ + +import java.util.ArrayList; +import java.util.List; + +import org.jbpm.api.client.Token; + +/** + * A runtime context that passes through a chain of interceptors. + * + * @author thomas.diesler(a)jboss.com + * @since 07-Oct-2008 + */ +public class RuntimeContext +{ + private List<NodeInterceptor> interceptors = new ArrayList<NodeInterceptor>(); + private int itorIndex; + + private Token token; + + public Token getToken() + { + return token; + } + + public void setToken(Token token) + { + this.token = token; + this.itorIndex = 0; + } + + void addInterceptor(NodeInterceptor itor) + { + interceptors.add(itor); + } + + protected void next() + { + if (itorIndex < interceptors.size()) + { + NodeInterceptor itor = interceptors.get(itorIndex++); + itor.execute(this); + } + } +} \ No newline at end of file Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/runtime/RuntimeContext.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,51 @@ +/* + * 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.service; + +// $Id$ + +import java.net.URI; +import java.util.Map; + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.service.DialectHandler; +import org.jbpm.api.service.DialectHandlerService; + +/** + * A registry that maps namespaceURI to a {@link DialectHandler} + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public class DialectHandlerServiceImpl extends DialectHandlerService implements MutableService +{ + @Override + public void setProcessEngine(ProcessEngine engine) + { + super.setProcessEngine(engine); + } + + public void setDialectHandlers(Map<URI, DialectHandler> dialectHandlers) + { + this.dialectHandlers = dialectHandlers; + } +} \ No newline at end of file Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/DialectHandlerServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/MutableService.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/MutableService.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/MutableService.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,38 @@ +/* + * 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.service; + +// $Id$ + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.service.Service; + +/** + * A mutable service + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public interface MutableService extends Service +{ + void setProcessEngine(ProcessEngine engine); +} \ No newline at end of file Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/MutableService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,137 @@ +/* + * 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.service; + +// $Id$ + +import java.util.HashMap; +import java.util.Map; + +import javax.management.ObjectName; + +import org.hibernate.Session; +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.ProcessDefinition; +import org.jbpm.api.service.PersistenceService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * An in-memory persistence service. + * + * @author thomas.diesler(a)jboss.com + * @since 17-Sep-2008 + */ +public class NoopPersistenceServiceImpl extends PersistenceService implements MutableService +{ + // Provide logging + final Logger log = LoggerFactory.getLogger(NoopPersistenceServiceImpl.class); + + private Map<ObjectName, ProcessDefinition> procDefs = new HashMap<ObjectName, ProcessDefinition>(); + private Map<ObjectName, Process> procs = new HashMap<ObjectName, Process>(); + private Map<ObjectName, Node> nodes = new HashMap<ObjectName, Node>(); + + @Override + public void setProcessEngine(ProcessEngine engine) + { + super.setProcessEngine(engine); + } + + @Override + public Session createSession() + { + return null; + } + + @Override + public ObjectName saveProcessDefinition(ProcessDefinition procDef) + { + procDefs.put(procDef.getKey(), procDef); + return procDef.getKey(); + } + + @Override + public ProcessDefinition loadProcessDefinition(ObjectName procDefID) + { + ProcessDefinition procDef = procDefs.get(procDefID); + if (procDef == null) + throw new ProcessNotFoundException("Cannot find process: " + procDefID); + + return procDef; + } + + @Override + public void deleteProcessDefinition(ProcessDefinition procDef) + { + procDefs.remove(procDef.getKey()); + } + + @Override + public ObjectName saveProcess(Process proc) + { + procs.put(proc.getKey(), proc); + + for (Node node : proc.getNodes()) + nodes.put(node.getKey(), node); + + return proc.getKey(); + } + + @Override + public Process loadProcess(ObjectName procID) + { + Process proc = procs.get(procID); + if (proc == null) + throw new ProcessNotFoundException("Cannot find process: " + procID); + + return proc; + } + + @Override + public void deleteProcess(Process proc) + { + procs.remove(proc.getKey()); + + for (Node node : proc.getNodes()) + nodes.remove(node.getKey()); + } + + @Override + public ObjectName saveNode(Session session, Node node) + { + return node.getKey(); + } + + @Override + @SuppressWarnings("unchecked") + public <T extends Node> T loadNode(Session session, Class<T> nodeImpl, ObjectName nodeID) + { + T node = (T)nodes.get(nodeID); + if (node == null) + throw new ProcessNotFoundException("Cannot find node: " + nodeID); + + return node; + } +} Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/NoopPersistenceServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,50 @@ +/* + * 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.service; + +// $Id$ + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.model.Process; +import org.jbpm.api.service.ProcessBuilderService; +import org.jbpm.api.model.builder.ProcessBuilder; + +/** + * The ProcessBuilder can be used to build a {@link Process} dynamically. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public class ProcessBuilderServiceImpl extends ProcessBuilderService implements MutableService +{ + @Override + public void setProcessEngine(ProcessEngine engine) + { + super.setProcessEngine(engine); + } + + @Override + public ProcessBuilder getProcessBuilder() + { + return null; + } +} \ No newline at end of file Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessBuilderServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,42 @@ +/* + * 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.service; + +// $Id$ + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.service.ProcessDefinitionService; + +/** + * The ProcessDefinitionService is the entry point to create, find and otherwise manage process definitions. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public class ProcessDefinitionServiceImpl extends ProcessDefinitionService implements MutableService +{ + @Override + public void setProcessEngine(ProcessEngine engine) + { + super.setProcessEngine(engine); + } +} \ No newline at end of file Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessDefinitionServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,86 @@ +/* + * 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.service; + +// $Id$ + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.jbpm.api.client.ProcessEngine; +import org.jbpm.api.service.ProcessInstanceService; +import org.jbpm.integration.runtime.NodeInterceptor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * The ProcessService is the entry point to create, find and otherwise manage processes. + * + * @author thomas.diesler(a)jboss.com + * @since 18-Jun-2008 + */ +public class ProcessServiceImpl extends ProcessInstanceService implements MutableService +{ + // Provide logging + final static Logger log = LoggerFactory.getLogger(ProcessServiceImpl.class); + + private List<NodeInterceptor> nodeInterceptors = new ArrayList<NodeInterceptor>(); + + @Override + public void setProcessEngine(ProcessEngine engine) + { + super.setProcessEngine(engine); + } + + public void setInterceptors(List<String> itorClassNames) + { + for (String itorClass : itorClassNames) + { + NodeInterceptor itor = loadNodeInterceptor(itorClass); + nodeInterceptors.add(itor); + } + } + + public List<NodeInterceptor> getNodeInterceptors() + { + return Collections.unmodifiableList(nodeInterceptors); + } + + private NodeInterceptor loadNodeInterceptor(String className) + { + NodeInterceptor itor = null; + if (className != null) + { + try + { + ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader(); + itor = (NodeInterceptor)ctxLoader.loadClass(className).newInstance(); + } + catch (Exception ex) + { + log.error("Cannot load interceptor: " + className, ex); + } + } + return itor; + } +} \ No newline at end of file Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/java/org/jbpm/integration/service/ProcessServiceImpl.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Deleted: jbpm3/branches/tdiesler/modules/integration/src/main/resources/jbpm-beans.xml =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/resources/jbpm-beans.xml 2008-11-14 17:51:14 UTC (rev 2936) +++ jbpm3/branches/tdiesler/modules/integration/src/main/resources/jbpm-beans.xml 2008-11-14 17:57:12 UTC (rev 2937) @@ -1,29 +0,0 @@ -<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" - xmlns="urn:jboss:bean-deployer:2.0"> - -  - <bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator"/> - -  - <bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> - <property name="processDefinitionManager"><inject bean="jBPMProcessDefinitionManager"/></property> - <property name="processInstanceManager"><inject bean="jBPMProcessInstanceManager"/></property> - <property name="executionManager"><inject bean="jBPMExecutionManager"/></property> - </bean> - -  - <bean name="jBPMProcessDefinitionManager" class="org.jbpm.integration.client.ProcessDefinitionManagerImpl"> - <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property> - </bean> - -  - <bean name="jBPMProcessInstanceManager" class="org.jbpm.integration.client.ProcessInstanceManagerImpl"> - <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property> - </bean> - -  - <bean name="jBPMExecutionManager" class="org.jbpm.integration.client.ExecutionManagerImpl"> - <property name="processEngine"><inject bean="jBPMProcessEngine" state="Instantiated"/></property> - </bean> - -</deployment> \ No newline at end of file Added: jbpm3/branches/tdiesler/modules/integration/src/main/resources/jbpm-cfg-beans.xml =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/resources/jbpm-cfg-beans.xml (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/resources/jbpm-cfg-beans.xml 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1,45 @@ +<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> + +  + <bean name="KernelLocator" class="org.jboss.kernel.plugins.util.KernelLocator" /> + +  + <bean name="jBPMProcessEngine" class="org.jbpm.integration.client.ProcessEngineImpl"> + <property name="services"> + <set elementClass="org.jbpm.api.service.Service"> + <inject bean="jBPMDialectHandlerService" /> + <inject bean="jBPMProcessBuilderService" /> + <inject bean="jBPMProcessDefinitionService" /> + <inject bean="jBPMProcessService" /> + </set> + </property> + </bean> + +  + <bean name="jBPMPersistenceService" class="org.jbpm.integration.service.NoopPersistenceServiceImpl"/> + +  + <bean name="jBPMProcessService" class="org.jbpm.integration.service.ProcessServiceImpl" > + <property name="interceptors"> + <list elementClass="java.lang.String"> + <value>org.jbpm.integration.runtime.NodeExecuteInterceptor</value> + </list> + </property> + </bean> + +  + <bean name="jBPMDialectHandlerService" class="org.jbpm.integration.service.DialectHandlerServiceImpl" > + <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> + </map> + </property> + </bean> + <bean name="jBPMDialectHandlerAPI10" class="org.jbpm.dialect.api10.DialectHandlerImpl"/> + +  + <bean name="jBPMProcessBuilderService" class="org.jbpm.integration.service.ProcessBuilderServiceImpl" /> + <bean name="jBPMProcessDefinitionService" class="org.jbpm.integration.service.ProcessDefinitionServiceImpl" /> + + </deployment> Property changes on: jbpm3/branches/tdiesler/modules/integration/src/main/resources/jbpm-cfg-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm3/branches/tdiesler/modules/integration/src/main/resources/org.jbpm.api.client.ConfigurationProvider =================================================================== --- jbpm3/branches/tdiesler/modules/integration/src/main/resources/org.jbpm.api.client.ConfigurationProvider (rev 0) +++ jbpm3/branches/tdiesler/modules/integration/src/main/resources/org.jbpm.api.client.ConfigurationProvider 2008-11-14 17:57:12 UTC (rev 2937) @@ -0,0 +1 @@ +org.jbpm.api.client.internal.MicrocontainerConfigurationProvider \ No newline at end of file Modified: jbpm3/branches/tdiesler/pom.xml =================================================================== --- jbpm3/branches/tdiesler/pom.xml 2008-11-14 17:51:14 UTC (rev 2936) +++ jbpm3/branches/tdiesler/pom.xml 2008-11-14 17:57:12 UTC (rev 2937) @@ -95,6 +95,12 @@ <version>${jbpm.api.version}</version> </dependency> <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-spec-cts</artifactId> + <version>${jbpm.api.version}</version> + <type>zip</type> + </dependency> + <dependency> <groupId>org.jbpm.jbpm3</groupId> <artifactId>jsf-console</artifactId> <version>${jbpm.jsf-console.version}</version>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2936 - in projects/spec/trunk: modules/cts and 4 other directories.

by do-not-reply＠jboss.org

Author: thomas.diesler(a)jboss.com Date: 2008-11-14 12:51:14 -0500 (Fri, 14 Nov 2008) New Revision: 2936 Added: projects/spec/trunk/modules/cts/scripts/ projects/spec/trunk/modules/cts/scripts/assembly-testsuite.xml Removed: projects/spec/trunk/modules/cts/src/test/resources/cts/processengine/ projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/ Modified: projects/spec/trunk/modules/cts/pom.xml projects/spec/trunk/modules/samples/airticket/client/pom.xml projects/spec/trunk/modules/samples/airticket/server/pom.xml projects/spec/trunk/profiles.xml.example Log: Add CTS zip Modified: projects/spec/trunk/modules/cts/pom.xml =================================================================== --- projects/spec/trunk/modules/cts/pom.xml 2008-11-14 17:04:18 UTC (rev 2935) +++ projects/spec/trunk/modules/cts/pom.xml 2008-11-14 17:51:14 UTC (rev 2936) @@ -43,6 +43,46 @@ <build> <plugins> <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>testsuite</id> + <phase>package</phase> + <goals> + <goal>single</goal> + </goals> + <configuration> + <appendAssemblyId>false</appendAssemblyId> + <descriptors> + <descriptor>scripts/assembly-testsuite.xml</descriptor> + </descriptors> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-artifacts</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/${project.artifactId}-${project.version}.zip + </file> + <type>zip</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> <excludes> @@ -56,16 +96,16 @@  <profiles> -  <profile> - <id>no-impl</id> + <id>impl</id> <activation> <property> - <name>!impl</name> + <name>impl</name> + <value>ri</value> </property> </activation> <dependencies> @@ -73,10 +113,10 @@ <groupId>org.jbpm.jbpm4</groupId> <artifactId>jbpm-spec-ri</artifactId> <version>${version}</version> + <scope>test</scope> </dependency> </dependencies> </profile> - </profiles> </project> Added: projects/spec/trunk/modules/cts/scripts/assembly-testsuite.xml =================================================================== --- projects/spec/trunk/modules/cts/scripts/assembly-testsuite.xml (rev 0) +++ projects/spec/trunk/modules/cts/scripts/assembly-testsuite.xml 2008-11-14 17:51:14 UTC (rev 2936) @@ -0,0 +1,17 @@ +<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd"> + <id>testsuite</id> + <formats> + <format>zip</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + <fileSets> + <fileSet> + <directory>src/test</directory> + <outputDirectory>/</outputDirectory> + <excludes> + <exclude>resources/jbpm-beans.xml</exclude> + </excludes> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Property changes on: projects/spec/trunk/modules/cts/scripts/assembly-testsuite.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/spec/trunk/modules/samples/airticket/client/pom.xml =================================================================== --- projects/spec/trunk/modules/samples/airticket/client/pom.xml 2008-11-14 17:04:18 UTC (rev 2935) +++ projects/spec/trunk/modules/samples/airticket/client/pom.xml 2008-11-14 17:51:14 UTC (rev 2936) @@ -47,6 +47,18 @@ </dependency> </dependencies> +  + <build> + <plugins> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> +  <profiles> <!-- Modified: projects/spec/trunk/modules/samples/airticket/server/pom.xml =================================================================== --- projects/spec/trunk/modules/samples/airticket/server/pom.xml 2008-11-14 17:04:18 UTC (rev 2935) +++ projects/spec/trunk/modules/samples/airticket/server/pom.xml 2008-11-14 17:51:14 UTC (rev 2936) @@ -56,5 +56,13 @@ <directory>src/main/resources</directory> </resource> </resources> + <plugins> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> </build> </project> \ No newline at end of file Modified: projects/spec/trunk/profiles.xml.example =================================================================== --- projects/spec/trunk/profiles.xml.example 2008-11-14 17:04:18 UTC (rev 2935) +++ projects/spec/trunk/profiles.xml.example 2008-11-14 17:51:14 UTC (rev 2936) @@ -11,9 +11,7 @@ </property> </activation> <properties> - <jboss422.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_2_GA/build/output/jboss-4.2.2.GA</jboss422.home> - <jboss423.home>/home/tdiesler/svn/jbossas/tags/JBoss_4_2_3_GA/build/output/jboss-4.2.3.GA</jboss423.home> - <jboss500.home>/home/tdiesler/svn/jbossas/tags/JBoss_5_0_0_CR2/build/output/jboss-5.0.0.CR2</jboss500.home> + <impl>ri</impl> </properties> </profile>

17 years, 5 months

1
0
0 / 0

JBoss JBPM SVN: r2935 - in jbpm4/trunk: modules/api/src/main/java/org/jbpm and 10 other directories.

by do-not-reply＠jboss.org

Author: tom.baeyens(a)jboss.com Date: 2008-11-14 12:04:18 -0500 (Fri, 14 Nov 2008) New Revision: 2935 Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Task.java jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml jbpm4/trunk/modules/task/src/test/resources/hibernate.properties jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml jbpm4/trunk/modules/task/src/test/resources/logging.properties jbpm4/trunk/modules/task/src/test/resources/org/ jbpm4/trunk/modules/task/src/test/resources/org/jbpm/ jbpm4/trunk/modules/task/src/test/resources/org/jbpm/task/ jbpm4/trunk/modules/task/src/test/resources/org/jbpm/task/impl/ jbpm4/trunk/modules/task/src/test/resources/org/jbpm/task/impl/default.lifecycle.xml Removed: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/default.lifecycle.xml Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskServiceImpl.java jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java jbpm4/trunk/pom.xml Log: added task component Added: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Task.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/Task.java (rev 0) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/Task.java 2008-11-14 17:04:18 UTC (rev 2935) @@ -0,0 +1,49 @@ +/* + * 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; + +import java.io.Serializable; +import java.util.Date; + +/** runtime task. + * + * @author Tom Baeyens + */ +public interface Task extends Serializable { + + String getId(); + + String getName(); + void setName(String name); + + String getDescription(); + void setDescription(String description); + + Date getCreate(); + + int getPriority(); + void setPriority(int priority); + + Date getDueDate(); + void setDueDate(Date dueDate); + +} \ No newline at end of file Property changes on: jbpm4/trunk/modules/api/src/main/java/org/jbpm/Task.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/TaskService.java 2008-11-14 17:04:18 UTC (rev 2935) @@ -21,7 +21,24 @@ */ package org.jbpm; +import java.util.List; public interface TaskService { + Task newTask(String taskId); + Task getTask(String taskId); + void updateTask(Task task); + void submitTask(String taskId); + void deleteTask(String taskId); + + /** retrieves the personal task of the given user, which might be different + * then the current authenticated user. E.g. when a manager wants to + * look at a subordinate's task list. */ + List<Task> getPersonalTaskList(String userId, int firstResult, int maxResults); + + /** retrieves the group task of the given user. + * The user id will be resolved to a set of candidate identities + * by the identity spi. */ + List<Task> getGroupTaskList(String userId, int firstResult, int maxResults); + } Modified: jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java =================================================================== --- jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/modules/pvm/src/test/java/org/jbpm/pvm/api/db/svc/ExecutionServiceTest.java 2008-11-14 17:04:18 UTC (rev 2935) @@ -55,8 +55,12 @@ // deploy process with key 'NCLFU' and version 1 // then we know that the key for this process will be 'NCLFU:1' - ClientProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion").version(1).key("NCLFU").node("initial").initial() - .behaviour(WaitState.class).done(); + ClientProcessDefinition processDefinition = ProcessFactory.build("nuclear fusion") + .version(1) + .key("NCLFU") + .node("initial").initial() + .behaviour(WaitState.class) + .done(); DeploymentImpl deploymentImpl = new DeploymentImpl(processDefinition); processService.deploy(deploymentImpl); Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/cmd/CreateTask.java 2008-11-14 17:04:18 UTC (rev 2935) @@ -26,6 +26,7 @@ import org.jbpm.pvm.env.Environment; import org.jbpm.pvm.internal.model.ExecutionImpl; import org.jbpm.pvm.session.DbSession; +import org.jbpm.task.db.TaskDbSession; import org.jbpm.task.impl.TaskDefinitionImpl; import org.jbpm.task.impl.TaskImpl; @@ -56,7 +57,7 @@ ExecutionImpl execution = null; if (taskDefinitionDbid!=null) { - DbSession dbSession = environment.get(DbSession.class); + TaskDbSession dbSession = environment.get(TaskDbSession.class); taskDefinition = dbSession.get(TaskDefinitionImpl.class, taskDefinitionDbid); } Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskImpl.java 2008-11-14 17:04:18 UTC (rev 2935) @@ -65,6 +65,7 @@ protected long dbid; protected int dbversion; + protected String id; protected String name; protected String description; @@ -401,4 +402,10 @@ public Integer getProgress() { return progress; } + public String getId() { + return id; + } + public void setId(String id) { + this.id = id; + } } Modified: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskServiceImpl.java =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskServiceImpl.java 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/TaskServiceImpl.java 2008-11-14 17:04:18 UTC (rev 2935) @@ -88,4 +88,43 @@ public void setCommandService(CommandService commandService) { this.commandService = commandService; } + + public void deleteTask(String taskId) { + // TODO Auto-generated method stub + + } + + public List<Task> getGroupTaskList(List<String> identityIds, int firstResult, int maxResults) { + // TODO Auto-generated method stub + return null; + } + + public List<Task> getPersonalTaskList(int firstResult, int maxResults) { + // TODO Auto-generated method stub + return null; + } + + public List<Task> getPersonalTaskList(String userId, int firstResult, int maxResults) { + // TODO Auto-generated method stub + return null; + } + + public Task getTask(String taskId) { + // TODO Auto-generated method stub + return null; + } + + public Task newTask(String taskId) { + // TODO Auto-generated method stub + return null; + } + + public void submitTask(String taskId) { + // TODO Auto-generated method stub + } + + public List<Task> getGroupTaskList(String userId, int firstResult, int maxResults) { + // TODO Auto-generated method stub + return null; + } } Deleted: jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/default.lifecycle.xml =================================================================== --- jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/default.lifecycle.xml 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/default.lifecycle.xml 2008-11-14 17:04:18 UTC (rev 2935) @@ -1,13 +0,0 @@ -<task-lifecycle initial="open"> - <state name="open"> - <transition name="complete" to="completed" /> - <transition name="suspend" to="suspended" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="suspended"> - <transition name="resume" to="open" /> - <transition name="cancel" to="cancelled" /> - </state> - <state name="cancelled" /> - <state name="completed" /> -</task-lifecycle> Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskDbTest.java 2008-11-14 17:04:18 UTC (rev 2935) @@ -47,6 +47,10 @@ */ public class TaskDbTest extends EnvironmentDbTestCase { + public void testNothing() { + } + + /* public void testTask() { Date now = new Date(); Date inFiveMinutes = new Date(now.getTime()+ (5*60*1000)); @@ -70,6 +74,7 @@ assertEquals(now, task.getCreate()); assertEquals(inFiveMinutes, task.getDueDate()); assertEquals(Priority.HIGHEST, task.getPriority()); + } public void testTaskAssignment() { @@ -234,7 +239,6 @@ assertEquals(0, task.getAllRoles().size()); } - /* public void testTaskComment() { EnvironmentFactory environmentFactory = EnvironmentFactory.parseXmlString("<environment/>"); TaskImpl task = TaskImpl.create(); Modified: jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java =================================================================== --- jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/modules/task/src/test/java/org/jbpm/task/TaskServiceTest.java 2008-11-14 17:04:18 UTC (rev 2935) @@ -38,6 +38,7 @@ public class TaskServiceTest extends DbTestCase { public void testTaskService() { + /* Task task = taskService.createTask(); task.setName("doing the dishes"); Date now = new Date(); @@ -61,6 +62,7 @@ return null; } }); + */ } } Added: jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml (rev 0) +++ jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml 2008-11-14 17:04:18 UTC (rev 2935) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> + + <environment-factory> + + <deployer-manager> + <language name="api"> + <check-version /> + <create-id /> + <save-process /> + </language> + </deployer-manager> + + <process-service /> + <execution-service /> + <management-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> + <properties resource="hibernate.properties" /> + <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> + <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" + usage="nonstrict-read-write" /> + </hibernate-configuration> + + <hibernate-session-factory /> + + <job-executor auto-start="false" /> + <job-test-helper /> + + <id-generator /> + <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </environment-factory> + + <environment> + <hibernate-session /> + <transaction /> + <pvm-db-session /> + <job-db-session /> + <message-session /> + <timer-session /> + </environment> + +</contexts> Property changes on: jbpm4/trunk/modules/task/src/test/resources/environment.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/task/src/test/resources/hibernate.properties =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/hibernate.properties (rev 0) +++ jbpm4/trunk/modules/task/src/test/resources/hibernate.properties 2008-11-14 17:04:18 UTC (rev 2935) @@ -0,0 +1,11 @@ +hibernate.dialect org.hibernate.dialect.HSQLDialect +hibernate.connection.driver_class org.hsqldb.jdbcDriver +hibernate.connection.url jdbc:hsqldb:mem:. +hibernate.connection.username sa +hibernate.connection.password +hibernate.hbm2ddl.auto create-drop +hibernate.cache.use_second_level_cache true +hibernate.cache.provider_class org.hibernate.cache.HashtableCacheProvider +# hibernate.show_sql true +hibernate.format_sql true +hibernate.use_sql_comments true Added: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml (rev 0) +++ jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml 2008-11-14 17:04:18 UTC (rev 2935) @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<contexts xmlns="http://jbpm.org/pvm/1.0/wire"> + + <environment-factory> + + <deployer-manager> + <language name="api"> + <check-version /> + <create-id /> + <save-process /> + </language> + </deployer-manager> + + <process-service /> + <execution-service /> + <management-service /> + + <command-service> + <retry-interceptor /> + <environment-interceptor /> + <standard-transaction-interceptor /> + </command-service> + + <hibernate-configuration> + <properties resource="hibernate.properties" /> + <mappings resource="org/jbpm/pvm/pvm.hibernate.mappings.xml" /> + <cache-configuration resource="org/jbpm/pvm/pvm.cache.xml" + usage="nonstrict-read-write" /> + </hibernate-configuration> + + <hibernate-session-factory /> + + <job-executor auto-start="false" /> + <job-test-helper /> + + <id-generator /> + <variable-types resource="org/jbpm/pvm/pvm.types.xml" /> + + <business-calendar> + <monday hours="9:00-12:00 and 12:30-17:00"/> + <tuesday hours="9:00-12:00 and 12:30-17:00"/> + <wednesday hours="9:00-12:00 and 12:30-17:00"/> + <thursday hours="9:00-12:00 and 12:30-17:00"/> + <friday hours="9:00-12:00 and 12:30-17:00"/> + <holiday period="01/07/2008 - 31/08/2008"/> + </business-calendar> + + </environment-factory> + + <environment> + <hibernate-session /> + <transaction /> + <pvm-db-session /> + <job-db-session /> + <message-session /> + <timer-session /> + </environment> + +</contexts> Property changes on: jbpm4/trunk/modules/task/src/test/resources/jbpm.cfg.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: jbpm4/trunk/modules/task/src/test/resources/logging.properties =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/logging.properties (rev 0) +++ jbpm4/trunk/modules/task/src/test/resources/logging.properties 2008-11-14 17:04:18 UTC (rev 2935) @@ -0,0 +1,28 @@ +handlers= java.util.logging.ConsoleHandler +# to add the error triggered file handler +# handlers= java.util.logging.ConsoleHandler org.jbpm.util.ErrorTriggeredFileHandler + +redirect.commons.logging = enabled + +java.util.logging.ConsoleHandler.level = FINEST +java.util.logging.ConsoleHandler.formatter = org.jbpm.log.LogFormatter + +# org.jbpm.util.ErrorTriggeredFileHandler.size = 500 +# org.jbpm.util.ErrorTriggeredFileHandler.push = OFF +# org.jbpm.util.ErrorTriggeredFileHandler.pattern = %h/jbpm%u.log + +# For example, set the com.xyz.foo logger to only log SEVERE messages: +# com.xyz.foo.level = SEVERE + +org.jbpm.level=FINEST +org.jbpm.pvm.internal.tx.level=FINE +org.jbpm.pvm.internal.wire.level=FINE +org.jbpm.pvm.internal.util.level=FINE + +org.hibernate.cfg.HbmBinder.level=SEVERE +org.hibernate.cfg.SettingsFactory.level=SEVERE +# org.hibernate.level=FINE +# org.hibernate.SQL.level=FINEST +# org.hibernate.type.level=FINEST +# org.hibernate.tool.hbm2ddl.SchemaExport.level=FINEST +# org.hibernate.transaction.level=FINEST Copied: jbpm4/trunk/modules/task/src/test/resources/org/jbpm/task/impl/default.lifecycle.xml (from rev 2908, jbpm4/trunk/modules/task/src/main/java/org/jbpm/task/impl/default.lifecycle.xml) =================================================================== --- jbpm4/trunk/modules/task/src/test/resources/org/jbpm/task/impl/default.lifecycle.xml (rev 0) +++ jbpm4/trunk/modules/task/src/test/resources/org/jbpm/task/impl/default.lifecycle.xml 2008-11-14 17:04:18 UTC (rev 2935) @@ -0,0 +1,13 @@ +<task-lifecycle initial="open"> + <state name="open"> + <transition name="complete" to="completed" /> + <transition name="suspend" to="suspended" /> + <transition name="cancel" to="cancelled" /> + </state> + <state name="suspended"> + <transition name="resume" to="open" /> + <transition name="cancel" to="cancelled" /> + </state> + <state name="cancelled" /> + <state name="completed" /> +</task-lifecycle> Property changes on: jbpm4/trunk/modules/task/src/test/resources/org/jbpm/task/impl/default.lifecycle.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:mergeinfo + Name: svn:eol-style + LF Modified: jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java =================================================================== --- jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/modules/test-base/src/main/java/org/jbpm/test/DbTestCase.java 2008-11-14 17:04:18 UTC (rev 2935) @@ -26,6 +26,7 @@ import org.jbpm.ManagementService; import org.jbpm.ProcessEngine; import org.jbpm.ProcessService; +import org.jbpm.TaskService; /** @@ -38,6 +39,7 @@ protected ProcessService processService; protected ExecutionService executionService; protected ManagementService managementService; + protected TaskService taskService; public void setUp() throws Exception { super.setUp(); Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2008-11-14 13:10:05 UTC (rev 2934) +++ jbpm4/trunk/pom.xml 2008-11-14 17:04:18 UTC (rev 2935) @@ -38,6 +38,7 @@ <module>modules/log</module> <module>modules/manual</module> <module>modules/pvm</module> + <module>modules/task</module> <module>modules/test-base</module> <module>modules/test-db</module> <module>modules/test-load</module> @@ -78,6 +79,11 @@ <artifactId>jbpm-test-base</artifactId> <version>${version}</version> </dependency> + <dependency> + <groupId>org.jbpm.jbpm4</groupId> + <artifactId>jbpm-pvm</artifactId> + <version>${version}</version> + </dependency>  <dependency>

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