Author: thomas.diesler(a)jboss.com Date: 2008-07-17 16:14:17 -0400 (Thu, 17 Jul 2008) New Revision: 1674 Added: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBConnectingObject.java Removed: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java Modified: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java Log: Modified: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-07-17 19:36:19 UTC (rev 1673) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -34,7 +34,7 @@ import org.jboss.bpm.dialect.api10.model.JAXBComplexGateway; import org.jboss.bpm.dialect.api10.model.JAXBEndEvent; import org.jboss.bpm.dialect.api10.model.JAXBExclusiveGateway; -import org.jboss.bpm.dialect.api10.model.JAXBFlow; +import org.jboss.bpm.dialect.api10.model.JAXBConnectingObject; import org.jboss.bpm.dialect.api10.model.JAXBFlowObject; import org.jboss.bpm.dialect.api10.model.JAXBHandler; import org.jboss.bpm.dialect.api10.model.JAXBInclusiveGateway; @@ -122,28 +122,28 @@ private void adaptExclusiveGateway(ProcessBuilder builder, JAXBExclusiveGateway jaxb) { builder.addExclusiveGateway(jaxb.getName()); - for(JAXBFlow flow : jaxb.getOutFlows()) + for(JAXBConnectingObject flow : jaxb.getOutFlows()) builder.addSequenceFlow(flow.getTargetName()); } private void adaptInclusiveGateway(ProcessBuilder builder, JAXBInclusiveGateway jaxb) { builder.addInclusiveGateway(jaxb.getName()); - for(JAXBFlow flow : jaxb.getOutFlows()) + for(JAXBConnectingObject flow : jaxb.getOutFlows()) builder.addSequenceFlow(flow.getTargetName()); } private void adaptComplexGateway(ProcessBuilder builder, JAXBComplexGateway jaxb) { builder.addComplexGateway(jaxb.getName()); - for(JAXBFlow flow : jaxb.getOutFlows()) + for(JAXBConnectingObject flow : jaxb.getOutFlows()) builder.addSequenceFlow(flow.getTargetName()); } private void adaptParallelGateway(ProcessBuilder builder, JAXBParallelGateway jaxb) { builder.addParallelGateway(jaxb.getName()); - for(JAXBFlow flow : jaxb.getOutFlows()) + for(JAXBConnectingObject flow : jaxb.getOutFlows()) builder.addSequenceFlow(flow.getTargetName()); } Copied: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBConnectingObject.java (from rev 1672, api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java) =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBConnectingObject.java (rev 0) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBConnectingObject.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -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.jboss.bpm.dialect.api10.model; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + +// $Id$ + +/** + * A Flow is a graphical line connecting two objects in a BPD. + * + * There are two types of Flow: Sequence Flow and Message Flow, each with their own line style. Flow is also used in a generic sense (and lowercase) to describe how + * Tokens will traverse Sequence Flow from the Start Event to an End Event. + * + * @author thomas.diesler(a)jboss.com + * @since 08-Jul-2008 + */ +@XmlType(name = "ConnectingObject") +public class JAXBConnectingObject extends JAXBGraphicalElement +{ + private String name; + private String targetName; + + public String getName() + { + return name; + } + + @XmlAttribute(required = false) + public void setName(String name) + { + this.name = name; + } + + public String getTargetName() + { + return targetName; + } + + /** + * Set the target name Note, this MUST NOT leak into the public API. + */ + @XmlAttribute(name = "to", required = true) + public void setTargetName(String targetName) + { + this.targetName = targetName; + } +} \ No newline at end of file Deleted: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java 2008-07-17 19:36:19 UTC (rev 1673) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -1,68 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.dialect.api10.model; - -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -// $Id$ - -/** - * A Flow is a graphical line connecting two objects in a BPD. - * - * There are two types of Flow: Sequence Flow and Message Flow, each with their own line style. Flow is also used in a generic sense (and lowercase) to describe how - * Tokens will traverse Sequence Flow from the Start Event to an End Event. - * - * @author thomas.diesler(a)jboss.com - * @since 08-Jul-2008 - */ -@XmlType(name = "Flow") -public class JAXBFlow extends JAXBSupportingElement -{ - private String name; - private String targetName; - - public String getName() - { - return name; - } - - @XmlAttribute(required = false) - public void setName(String name) - { - this.name = name; - } - - public String getTargetName() - { - return targetName; - } - - /** - * Set the target name Note, this MUST NOT leak into the public API. - */ - @XmlAttribute(name = "to", required = true) - public void setTargetName(String targetName) - { - this.targetName = targetName; - } -} \ No newline at end of file Modified: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java 2008-07-17 19:36:19 UTC (rev 1673) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -50,7 +50,7 @@ @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), @XmlElement(name = "message", type = JAXBMessageFlow.class) }) - private List<JAXBFlow> outFlows = new ArrayList<JAXBFlow>(); + private List<JAXBConnectingObject> outFlows = new ArrayList<JAXBConnectingObject>(); public String getName() { @@ -67,12 +67,12 @@ this.name = name; } - public List<JAXBFlow> getOutFlows() + public List<JAXBConnectingObject> getOutFlows() { return outFlows; } - public void setOutFlow(List<JAXBFlow> outFlow) + public void setOutFlow(List<JAXBConnectingObject> outFlow) { this.outFlows = outFlow; } Modified: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java 2008-07-17 19:36:19 UTC (rev 1673) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -49,7 +49,7 @@ @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), @XmlElement(name = "message", type = JAXBMessageFlow.class) }) - private JAXBFlow outFlow; + private JAXBConnectingObject outFlow; public String getName() { @@ -69,13 +69,13 @@ this.name = name; } - public JAXBFlow getOutFlow() + public JAXBConnectingObject getOutFlow() { return outFlow; } @XmlTransient - public void setOutFlow(JAXBFlow outFlow) + public void setOutFlow(JAXBConnectingObject outFlow) { this.outFlow = outFlow; } Modified: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java 2008-07-17 19:36:19 UTC (rev 1673) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -34,6 +34,6 @@ * @since 08-Jul-2008 */ @XmlType(name="MessageFlow") -public class JAXBMessageFlow extends JAXBFlow +public class JAXBMessageFlow extends JAXBConnectingObject { } \ No newline at end of file Modified: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-07-17 19:36:19 UTC (rev 1673) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -34,6 +34,6 @@ * @since 08-Jul-2008 */ @XmlType(name="SequenceFlow") -public class JAXBSequenceFlow extends JAXBFlow +public class JAXBSequenceFlow extends JAXBConnectingObject { } \ No newline at end of file Modified: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java 2008-07-17 19:36:19 UTC (rev 1673) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -41,15 +41,15 @@ @XmlElements( { @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), @XmlElement(name = "message", type = JAXBMessageFlow.class) }) - private JAXBFlow outFlow; + private JAXBConnectingObject outFlow; - public JAXBFlow getOutFlow() + public JAXBConnectingObject getOutFlow() { return outFlow; } @XmlTransient - public void setOutFlow(JAXBFlow outFlow) + public void setOutFlow(JAXBConnectingObject outFlow) { this.outFlow = outFlow; } Modified: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java 2008-07-17 19:36:19 UTC (rev 1673) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -44,15 +44,15 @@ @XmlElements( { @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), @XmlElement(name = "message", type = JAXBMessageFlow.class) }) - private JAXBFlow outFlow; + private JAXBConnectingObject outFlow; - public JAXBFlow getOutFlow() + public JAXBConnectingObject getOutFlow() { return outFlow; } @XmlTransient - public void setOutFlow(JAXBFlow outFlow) + public void setOutFlow(JAXBConnectingObject outFlow) { this.outFlow = outFlow; } Modified: api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java =================================================================== --- api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java 2008-07-17 19:36:19 UTC (rev 1673) +++ api/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTask.java 2008-07-17 20:14:17 UTC (rev 1674) @@ -21,6 +21,7 @@ */ package org.jboss.bpm.dialect.api10.model; +import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlTransient; @@ -47,19 +48,46 @@ @XmlElements( { @XmlElement(name = "sequence", type = JAXBSequenceFlow.class), @XmlElement(name = "message", type = JAXBMessageFlow.class) }) - private JAXBFlow outFlow; - - public JAXBFlow getOutFlow() + private JAXBConnectingObject outFlow; + + enum TaskType { Service, Receive, Send, User, Script, Manual, Reference, None} + private TaskType taskType; + + // WebService, Java, Other, Unspecified + private String implementation; + + public JAXBConnectingObject getOutFlow() { return outFlow; } @XmlTransient - public void setOutFlow(JAXBFlow outFlow) + public void setOutFlow(JAXBConnectingObject outFlow) { this.outFlow = outFlow; } + public TaskType getTaskType() + { + return taskType; + } + + @XmlAttribute + public void setTaskType(TaskType taskType) + { + this.taskType = taskType; + } + + public String getImplementation() + { + return implementation; + } + + public void setImplementation(String implementation) + { + this.implementation = implementation; + } + /** * Get the ExecutionHandler for this Event */