JBoss JBPM SVN: r2680 - in jbpm4/trunk/modules/enterprise/src: test/java/org/jbpm/enterprise/test and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-10-30 11:03:04 -0400 (Thu, 30 Oct 2008)
New Revision: 2680
Modified:
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseLocalCommandService.java
jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java
jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java
Log:
unification api proposals
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseLocalCommandService.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseLocalCommandService.java 2008-10-30 15:02:48 UTC (rev 2679)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseLocalCommandService.java 2008-10-30 15:03:04 UTC (rev 2680)
@@ -26,7 +26,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jbpm.pvm.PvmException;
+import org.jbpm.PvmException;
import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.CommandService;
Modified: jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java 2008-10-30 15:02:48 UTC (rev 2679)
+++ jbpm4/trunk/modules/enterprise/src/main/java/org/jbpm/enterprise/internal/ejb/EnterpriseTimerSession.java 2008-10-30 15:03:04 UTC (rev 2680)
@@ -24,7 +24,7 @@
import javax.ejb.FinderException;
import javax.ejb.RemoveException;
-import org.jbpm.pvm.PvmException;
+import org.jbpm.PvmException;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.internal.log.Log;
import org.jbpm.pvm.job.Timer;
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java 2008-10-30 15:02:48 UTC (rev 2679)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/EnterpriseTimerSessionTest.java 2008-10-30 15:03:04 UTC (rev 2680)
@@ -28,12 +28,12 @@
import javax.naming.InitialContext;
import org.apache.cactus.ServletTestCase;
+import org.jbpm.Execution;
import org.jbpm.enterprise.internal.ejb.EnterpriseTimerSession;
import org.jbpm.enterprise.internal.ejb.LocalCommandExecutor;
import org.jbpm.enterprise.internal.ejb.LocalCommandExecutorHome;
import org.jbpm.enterprise.test.custom.HappyActivity;
-import org.jbpm.pvm.Execution;
-import org.jbpm.pvm.Deployment;
+import org.jbpm.pvm.DeploymentImpl;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.DeployCmd;
@@ -77,7 +77,7 @@
.event("timeout")
.listener(new ObjectDescriptor(HappyActivity.class))
.done();
- commandExecutor.execute(new DeployCmd(new Deployment(processDefinition)));
+ commandExecutor.execute(new DeployCmd(new DeploymentImpl(processDefinition)));
}
protected void tearDown() throws Exception {
Modified: jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java
===================================================================
--- jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java 2008-10-30 15:02:48 UTC (rev 2679)
+++ jbpm4/trunk/modules/enterprise/src/test/java/org/jbpm/enterprise/test/TimerTest.java 2008-10-30 15:03:04 UTC (rev 2680)
@@ -36,7 +36,7 @@
import org.jbpm.enterprise.internal.ejb.TimerEB;
import org.jbpm.enterprise.test.custom.HappyActivity;
import org.jbpm.enterprise.test.custom.NoisyActivity;
-import org.jbpm.pvm.Deployment;
+import org.jbpm.pvm.DeploymentImpl;
import org.jbpm.pvm.env.Environment;
import org.jbpm.pvm.internal.cmd.Command;
import org.jbpm.pvm.internal.cmd.DeployCmd;
@@ -110,7 +110,7 @@
*/
public void testHappyTimer() throws CreateException {
activityDescriptor.setClassName(HappyActivity.class.getName());
- commandExecutor.execute(new DeployCmd(new Deployment(processDefinition)));
+ commandExecutor.execute(new DeployCmd(new DeploymentImpl(processDefinition)));
ExecutionImpl execution = (ExecutionImpl) commandExecutor.execute(new StartExecutionCmd(processDefinition.getName(), null, null));
@@ -141,7 +141,7 @@
*/
public void testNoisyTimer() throws CreateException {
activityDescriptor.setClassName(NoisyActivity.class.getName());
- commandExecutor.execute(new DeployCmd(new Deployment(processDefinition)));
+ commandExecutor.execute(new DeployCmd(new DeploymentImpl(processDefinition)));
ExecutionImpl execution = (ExecutionImpl) commandExecutor.execute(new StartExecutionCmd(processDefinition.getName(), null, null));
@@ -179,7 +179,7 @@
*/
public void testCyclicTimer() throws CreateException {
activityDescriptor.setClassName(HappyActivity.class.getName());
- commandExecutor.execute(new DeployCmd(new Deployment(processDefinition)));
+ commandExecutor.execute(new DeployCmd(new DeploymentImpl(processDefinition)));
ExecutionImpl execution = (ExecutionImpl) commandExecutor.execute(new StartExecutionCmd(processDefinition.getName(), null, null));
15 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2679 - in jbpm4/trunk/modules/api: src/main/java and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-10-30 11:02:48 -0400 (Thu, 30 Oct 2008)
New Revision: 2679
Removed:
jbpm4/trunk/modules/api/src/main/java/org/
Modified:
jbpm4/trunk/modules/api/pom.xml
Log:
unification api proposals
Modified: jbpm4/trunk/modules/api/pom.xml
===================================================================
--- jbpm4/trunk/modules/api/pom.xml 2008-10-30 15:02:36 UTC (rev 2678)
+++ jbpm4/trunk/modules/api/pom.xml 2008-10-30 15:02:48 UTC (rev 2679)
@@ -29,34 +29,16 @@
<!-- Properties -->
<properties>
- <jboss.microcontainer.version>2.0.0.Beta15</jboss.microcontainer.version>
</properties>
<!-- DependencyManagement -->
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${jboss.microcontainer.version}</version>
- </dependency>
</dependencies>
</dependencyManagement>
<!-- Dependencies -->
<dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
</dependencies>
<!-- Plugins -->
15 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2678 - in projects/spec/trunk/modules: api/src/main/java/org/jbpm/api and 16 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-10-30 11:02:36 -0400 (Thu, 30 Oct 2008)
New Revision: 2678
Added:
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Group.java
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GroupBuilder.java
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxMarshallerTest.java
projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxTest.java
projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/
projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.bpmn
projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.bpmn_diagram
projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.png
Modified:
projects/spec/trunk/modules/api/.classpath
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/Constants.java
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Deployment.java
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java
projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java
projects/spec/trunk/modules/cts/.project
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/package-info.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java
projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java
Log:
WIP - TxGroup
Modified: projects/spec/trunk/modules/api/.classpath
===================================================================
--- projects/spec/trunk/modules/api/.classpath 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/api/.classpath 2008-10-30 15:02:36 UTC (rev 2678)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/Constants.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/Constants.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/Constants.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -32,5 +32,12 @@
*/
public interface Constants
{
- static final String ID_DOMAIN = "jboss.jbpm";
+ /** The default objcet name domain */
+ String ID_DOMAIN = "jboss.jbpm";
+
+ /** The key for the Tx attribute property in a TxGroup */
+ String TX_ATTRIBUTE = "jbpm.tx.attribute";
+
+ /** The enumeration of Tx types */
+ enum TxType { MANDATORY, NEVER, NOTSUPPORTED, REQUIRED, REQUIRESNEW, SUPPORTS }
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Deployment.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Deployment.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/client/Deployment.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -95,7 +95,7 @@
if (dialectHandler == null)
throw new IllegalStateException("Cannot obtain DialectHandler for: " + nsURI);
- process = dialectHandler.createProcessDefinition(procXML);
+ process = dialectHandler.createProcess(procXML);
}
return process;
}
Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Group.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Group.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Group.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -0,0 +1,55 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.api.model;
+
+//$Id$
+
+import java.io.Serializable;
+
+import org.jbpm.api.model.internal.PropertySupport;
+
+/**
+ * The Group object is an Artifact that provides a visual mechanism to group elements of a diagram informally. The
+ * grouping is tied to the Category supporting element (which is an attribute of all BPMN elements). That is, a Group is a
+ * visual depiction of a single Category. The graphical elements within the Group will be assigned the Category of the
+ * Group.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 30-Oct-2008
+ */
+public interface Group extends PropertySupport, Serializable
+{
+ /**
+ * The supported group types
+ */
+ enum GroupType { Transaction };
+
+ /**
+ * Name is an attribute that is text description of the Group.
+ */
+ String getName();
+
+ /**
+ * Get the group type for this group
+ */
+ GroupType getGroupType();
+}
Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/Group.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GroupBuilder.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GroupBuilder.java (rev 0)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GroupBuilder.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -0,0 +1,46 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jbpm.api.model.builder;
+
+//$Id$
+
+import org.jbpm.api.model.Group;
+
+
+/**
+ * A GroupBuilder can be used to build a {@link Group} dynamically.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public interface GroupBuilder
+{
+ /**
+ * Add a message property
+ */
+ GroupBuilder addProperty(String name, Object value);
+
+ /**
+ * Get the Group
+ */
+ Group getGroup();
+}
\ No newline at end of file
Property changes on: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/GroupBuilder.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/model/builder/ProcessBuilder.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -32,6 +32,7 @@
import org.jbpm.api.model.Event.EventDetailType;
import org.jbpm.api.model.Expression.ExpressionLanguage;
import org.jbpm.api.model.Gateway.GatewayType;
+import org.jbpm.api.model.Group.GroupType;
import org.jbpm.api.model.Task.TaskType;
import org.jbpm.api.runtime.ExecutionHandler;
import org.jbpm.api.runtime.FlowHandler;
@@ -141,4 +142,14 @@
* Add an {@link SignalHandler} with a given Class
*/
<T extends SignalHandler> ProcessBuilder addSignalHandler(Class<T> clazz);
+
+ /**
+ * Add a group reference for the current node
+ */
+ ProcessBuilder addGroupRef(String name);
+
+ /**
+ * Add a Process group
+ */
+ GroupBuilder addGroup(GroupType type, String name);
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java
===================================================================
--- projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/DialectHandler.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -28,7 +28,6 @@
import java.net.URI;
import java.net.URL;
-import org.jbpm.api.model.Process;
import org.jbpm.api.model.ProcessDefinition;
/**
@@ -49,15 +48,15 @@
/**
* Create a ProcessDefinition from a descriptor.
*/
- ProcessDefinition createProcessDefinition(String pXML);
+ ProcessDefinition createProcess(String pXML);
/**
* Create a ProcessDefinition from a descriptor URL.
*/
- ProcessDefinition createProcessDefinition(URL pURL) throws IOException;
+ ProcessDefinition createProcess(URL pURL) throws IOException;
/**
- * Marshall the process to the given writer
+ * Marshall the process definition to the given writer
*/
- void marshallProcess(Process proc, Writer out) throws IOException;
+ void marshallProcess(ProcessDefinition procDef, Writer out) throws IOException;
}
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-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/service/ProcessDefinitionService.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -84,7 +84,7 @@
if (dialectHandler == null)
throw new IllegalStateException("Cannot obtain DialectHandler for: " + nsURI);
- ProcessDefinition procDef = dialectHandler.createProcessDefinition(pXML);
+ ProcessDefinition procDef = dialectHandler.createProcess(pXML);
return procDef;
}
@@ -99,7 +99,7 @@
if (dialectHandler == null)
throw new IllegalStateException("Cannot obtain DialectHandler for: " + nsURI);
- ProcessDefinition procDef = dialectHandler.createProcessDefinition(pURL);
+ ProcessDefinition procDef = dialectHandler.createProcess(pURL);
return procDef;
}
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-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/api/src/main/java/org/jbpm/api/test/CTSTestCase.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -21,6 +21,12 @@
*/
package org.jbpm.api.test;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -28,6 +34,7 @@
import javax.management.ObjectName;
+import org.jbpm.api.BPMException;
import org.jbpm.api.client.MessageListener;
import org.jbpm.api.client.ProcessEngine;
import org.jbpm.api.client.SignalListener;
@@ -36,6 +43,8 @@
import org.jbpm.api.model.Signal;
import org.jbpm.api.model.Signal.SignalType;
import org.jbpm.api.model.builder.SignalBuilder;
+import org.jbpm.api.service.DialectHandler;
+import org.jbpm.api.service.DialectHandlerService;
import org.jbpm.api.service.MessageService;
import org.jbpm.api.service.ProcessDefinitionService;
import org.jbpm.api.service.SignalBuilderService;
@@ -256,4 +265,62 @@
}
return messageListener;
}
+
+ /**
+ * Marshall the given process
+ * @param out if null, the proces is marshalled to a file
+ */
+ protected String marshallProcess(ProcessDefinition procDef, Writer out)
+ {
+ try
+ {
+ if (out == null)
+ {
+ File file = new File("target/" + getName() + "-" + getDialect() + ".xml");
+ out = new FileWriter(file);
+ System.out.println("Marshall process to: " + file.getCanonicalPath());
+ }
+
+ String procXML = marshallProcess(procDef);
+ out.write(procXML);
+ out.close();
+
+ return procXML;
+ }
+ catch (IOException ex)
+ {
+ throw new BPMException("Cannot marshall process", ex);
+ }
+ }
+
+ /**
+ * Marshall the given process definition
+ */
+ public String marshallProcess(ProcessDefinition procDef) throws IOException
+ {
+ DialectHandlerService dhService = getProcessEngine().getService(DialectHandlerService.class);
+ DialectHandler dialectHandler = dhService.getDialectHandler(getDialectURI());
+
+ StringWriter strwr = new StringWriter();
+ dialectHandler.marshallProcess(procDef, strwr);
+ return strwr.toString();
+ }
+
+ /**
+ * Get the BPM descriptor dialect ID
+ */
+ protected String getDialect()
+ {
+ String dialect = System.getProperty("jbpm.dialect", "api10");
+ return dialect;
+ }
+
+ /**
+ * Get the BPM descriptor dialect ID
+ */
+ protected URI getDialectURI()
+ {
+ String dialect = System.getProperty("jbpm.dialect.uri", DialectHandler.DEFAULT_NAMESPACE_URI.toString());
+ return URI.create(dialect);
+ }
}
Modified: projects/spec/trunk/modules/cts/.project
===================================================================
--- projects/spec/trunk/modules/cts/.project 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/cts/.project 2008-10-30 15:02:36 UTC (rev 2678)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jbpm-cts</name>
+ <name>jbpm-spec-cts</name>
<comment></comment>
<projects>
</projects>
@@ -15,9 +15,15 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>org.eclipse.stp.bpmn.validation.BatchValidationBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.stp.bpmn.validation.BatchValidationBuildAbleNature</nature>
</natures>
</projectDescription>
Added: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxMarshallerTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxMarshallerTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxMarshallerTest.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -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.test.cts.transaction;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.service.ProcessDefinitionService;
+
+/**
+ * Test two tasks with Tx attribute REQUIRES
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 30-Oct-2008
+ */
+public class RequiresTxMarshallerTest extends RequiresTxTest
+{
+ protected ProcessDefinition getProcessDefinition() throws IOException
+ {
+ // Marshall the process to a string
+ ProcessDefinition procDef = super.getProcessDefinition();
+ String procXML = marshallProcess(procDef);
+
+ // System.out.println(procXML);
+
+ // Recreate the ProcessDefinition from the marshalled ProcessDefinition
+ ProcessDefinitionService pdService = getProcessEngine().getService(ProcessDefinitionService.class);
+ return pdService.createProcessDefinition(procXML);
+ }
+}
Property changes on: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxMarshallerTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxTest.java
===================================================================
--- projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxTest.java (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxTest.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -0,0 +1,64 @@
+/*
+ * 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.test.cts.transaction;
+
+// $Id$
+
+import java.io.IOException;
+
+import org.jbpm.api.Constants;
+import org.jbpm.api.Constants.TxType;
+import org.jbpm.api.model.Process;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.Group.GroupType;
+import org.jbpm.api.model.builder.ProcessBuilder;
+import org.jbpm.api.service.ProcessBuilderService;
+import org.jbpm.api.test.CTSTestCase;
+
+/**
+ * Test two tasks with Tx attribute REQUIRES
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 30-Oct-2008
+ */
+public class RequiresTxTest extends CTSTestCase
+{
+ public void testUserTask() throws Exception
+ {
+ ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ Process proc = procDef.newInstance();
+
+ proc.startProcess();
+ proc.waitForEnd(1000);
+ }
+
+ protected ProcessDefinition getProcessDefinition() throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder();
+ procBuilder.addProcess("RequiresTxTest");
+ procBuilder.addStartEvent("Start").addSequenceFlow("TaskA");
+ procBuilder.addTask("TaskA").addSequenceFlow("TaskB");
+ procBuilder.addTask("TaskB").addSequenceFlow("End").addEndEvent("End");
+ procBuilder.addGroup(GroupType.Transaction, "TxRequired").addProperty(Constants.TX_ATTRIBUTE, TxType.REQUIRED);
+ return procBuilder.getProcessDefinition();
+ }
+}
Property changes on: projects/spec/trunk/modules/cts/src/test/java/org/jbpm/test/cts/transaction/RequiresTxTest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.bpmn
===================================================================
--- projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.bpmn (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.bpmn 2008-10-30 15:02:36 UTC (rev 2678)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:BpmnDiagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmi:id="_Q_I4EKaNEd2GaYuuIrSLcA" iD="_Q_Hp8KaNEd2GaYuuIrSLcA">
+ <artifacts xmi:type="bpmn:Group" xmi:id="_gxR7IaaNEd2GaYuuIrSLcA" iD="_gxR7IKaNEd2GaYuuIrSLcA"/>
+ <pools xmi:type="bpmn:Pool" xmi:id="_RAQSYaaNEd2GaYuuIrSLcA" iD="_RAQSYKaNEd2GaYuuIrSLcA" name="Pool">
+ <vertices xmi:type="bpmn:Activity" xmi:id="_RBYTwKaNEd2GaYuuIrSLcA" iD="_RBXssKaNEd2GaYuuIrSLcA" outgoingEdges="_X18-4aaNEd2GaYuuIrSLcA" incomingEdges="_UUJsEaaNEd2GaYuuIrSLcA" name="TaskA" activityType="Task"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_TXzYkaaNEd2GaYuuIrSLcA" iD="_TXzYkKaNEd2GaYuuIrSLcA" outgoingEdges="_UUJsEaaNEd2GaYuuIrSLcA" activityType="EventStartEmpty"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_X1z08aaNEd2GaYuuIrSLcA" iD="_X1z08KaNEd2GaYuuIrSLcA" outgoingEdges="_dJnQ4aaNEd2GaYuuIrSLcA" incomingEdges="_X18-4aaNEd2GaYuuIrSLcA" name="TaskB" activityType="Task"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_cwqlYKaNEd2GaYuuIrSLcA" iD="_cwp-UKaNEd2GaYuuIrSLcA" incomingEdges="_dJnQ4aaNEd2GaYuuIrSLcA" activityType="EventEndEmpty"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_UUJsEaaNEd2GaYuuIrSLcA" iD="_UUJsEKaNEd2GaYuuIrSLcA" source="_TXzYkaaNEd2GaYuuIrSLcA" target="_RBYTwKaNEd2GaYuuIrSLcA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_X18-4aaNEd2GaYuuIrSLcA" iD="_X18-4KaNEd2GaYuuIrSLcA" source="_RBYTwKaNEd2GaYuuIrSLcA" target="_X1z08aaNEd2GaYuuIrSLcA"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_dJnQ4aaNEd2GaYuuIrSLcA" iD="_dJnQ4KaNEd2GaYuuIrSLcA" source="_X1z08aaNEd2GaYuuIrSLcA" target="_cwqlYKaNEd2GaYuuIrSLcA"/>
+ </pools>
+</bpmn:BpmnDiagram>
Added: projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.bpmn_diagram
===================================================================
--- projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.bpmn_diagram (rev 0)
+++ projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.bpmn_diagram 2008-10-30 15:02:36 UTC (rev 2678)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:bpmn="http://stp.eclipse.org/bpmn" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmi:id="_Q_k88KaNEd2GaYuuIrSLcA" type="Bpmn" name="tx-required.bpmn_diagram" measurementUnit="Pixel">
+ <children xmi:type="notation:Node" xmi:id="_RBoLYKaNEd2GaYuuIrSLcA" type="1001">
+ <children xmi:type="notation:Node" xmi:id="_RBtD4KaNEd2GaYuuIrSLcA" type="4008"/>
+ <children xmi:type="notation:Node" xmi:id="_RBu5EKaNEd2GaYuuIrSLcA" type="5001">
+ <children xmi:type="notation:Node" xmi:id="_RBx8YKaNEd2GaYuuIrSLcA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_RBzKgKaNEd2GaYuuIrSLcA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_RBx8YaaNEd2GaYuuIrSLcA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_RBx8YqaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_RBx8Y6aNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_RBx8ZKaNEd2GaYuuIrSLcA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="tx-required.bpmn#_RBYTwKaNEd2GaYuuIrSLcA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RBzKgaaNEd2GaYuuIrSLcA" x="84" y="48" width="111" height="61"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_TX7UYKaNEd2GaYuuIrSLcA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_TX9JkKaNEd2GaYuuIrSLcA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_TX7UYaaNEd2GaYuuIrSLcA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_TX77cKaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_TX77caaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_TX77cqaNEd2GaYuuIrSLcA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="tx-required.bpmn#_TXzYkaaNEd2GaYuuIrSLcA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TX77c6aNEd2GaYuuIrSLcA" x="12" y="60"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_X11qIKaNEd2GaYuuIrSLcA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_X12RMKaNEd2GaYuuIrSLcA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_X11qIaaNEd2GaYuuIrSLcA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_X11qIqaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_X11qI6aNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_X11qJKaNEd2GaYuuIrSLcA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="tx-required.bpmn#_X1z08aaNEd2GaYuuIrSLcA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_X11qJaaNEd2GaYuuIrSLcA" x="228" y="48"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_cwrzgKaNEd2GaYuuIrSLcA" type="2001">
+ <children xmi:type="notation:Node" xmi:id="_cwsakKaNEd2GaYuuIrSLcA" type="4001"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_cwrzgaaNEd2GaYuuIrSLcA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_cwrzgqaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_cwrzg6aNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_cwrzhKaNEd2GaYuuIrSLcA" lineColor="0"/>
+ <element xmi:type="bpmn:Activity" href="tx-required.bpmn#_cwqlYKaNEd2GaYuuIrSLcA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_cwrzhaaNEd2GaYuuIrSLcA" x="384" y="60"/>
+ </children>
+ <styles xmi:type="notation:DrawerStyle" xmi:id="_RBu5EaaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_RBu5EqaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_RBu5E6aNEd2GaYuuIrSLcA"/>
+ </children>
+ <styles xmi:type="notation:FontStyle" xmi:id="_RBoLYaaNEd2GaYuuIrSLcA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_RBoLYqaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_RBoLY6aNEd2GaYuuIrSLcA" fillColor="16771304"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_RBoLZKaNEd2GaYuuIrSLcA" lineColor="11119017"/>
+ <element xmi:type="bpmn:Pool" href="tx-required.bpmn#_RAQSYaaNEd2GaYuuIrSLcA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_RBvgIKaNEd2GaYuuIrSLcA" x="16" y="16" width="477" height="165"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_gxTwUKaNEd2GaYuuIrSLcA" type="1004">
+ <children xmi:type="notation:Node" xmi:id="_gxU-cKaNEd2GaYuuIrSLcA" type="4011"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_gxTwUaaNEd2GaYuuIrSLcA" fontName="Arial"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_gxTwUqaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:FillStyle" xmi:id="_gxTwU6aNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_gxTwVKaNEd2GaYuuIrSLcA" lineColor="0"/>
+ <element xmi:type="bpmn:Group" href="tx-required.bpmn#_gxR7IaaNEd2GaYuuIrSLcA"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_gxTwVaaNEd2GaYuuIrSLcA" x="108" y="48" width="301" height="97"/>
+ </children>
+ <styles xmi:type="notation:PageStyle" xmi:id="_Q_k88aaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:GuideStyle" xmi:id="_Q_k88qaNEd2GaYuuIrSLcA"/>
+ <styles xmi:type="notation:DescriptionStyle" xmi:id="_Q_k886aNEd2GaYuuIrSLcA"/>
+ <element xmi:type="bpmn:BpmnDiagram" href="tx-required.bpmn#_Q_I4EKaNEd2GaYuuIrSLcA"/>
+ <edges xmi:type="notation:Edge" xmi:id="_UUNWcKaNEd2GaYuuIrSLcA" type="3001" source="_TX7UYKaNEd2GaYuuIrSLcA" target="_RBx8YKaNEd2GaYuuIrSLcA">
+ <children xmi:type="notation:Node" xmi:id="_UdFloKaNEd2GaYuuIrSLcA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_UdFloaaNEd2GaYuuIrSLcA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_UdFloqaNEd2GaYuuIrSLcA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_UdFlo6aNEd2GaYuuIrSLcA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_UUNWcaaNEd2GaYuuIrSLcA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_UUNWcqaNEd2GaYuuIrSLcA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_UUNWc6aNEd2GaYuuIrSLcA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="tx-required.bpmn#_UUJsEaaNEd2GaYuuIrSLcA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_UUNWdKaNEd2GaYuuIrSLcA" points="[15, 1, -82, -8]$[44, 0, -53, -9]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_X1-0EKaNEd2GaYuuIrSLcA" type="3001" source="_RBx8YKaNEd2GaYuuIrSLcA" target="_X11qIKaNEd2GaYuuIrSLcA">
+ <children xmi:type="notation:Node" xmi:id="_X2ACMKaNEd2GaYuuIrSLcA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_X2ACMaaNEd2GaYuuIrSLcA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_X2ACMqaNEd2GaYuuIrSLcA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_X2ACM6aNEd2GaYuuIrSLcA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_X1-0EaaNEd2GaYuuIrSLcA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_X1-0EqaNEd2GaYuuIrSLcA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_X1-0E6aNEd2GaYuuIrSLcA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="tx-required.bpmn#_X18-4aaNEd2GaYuuIrSLcA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_X1-0FKaNEd2GaYuuIrSLcA" points="[-35, -28, 92, 74]$[-125, -100, 2, 2]"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_dJpGEKaNEd2GaYuuIrSLcA" type="3001" source="_X11qIKaNEd2GaYuuIrSLcA" target="_cwrzgKaNEd2GaYuuIrSLcA">
+ <children xmi:type="notation:Node" xmi:id="_dJqUMKaNEd2GaYuuIrSLcA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_dJqUMaaNEd2GaYuuIrSLcA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_dJqUMqaNEd2GaYuuIrSLcA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_dJqUM6aNEd2GaYuuIrSLcA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_dJpGEaaNEd2GaYuuIrSLcA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_dJpGEqaNEd2GaYuuIrSLcA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_dJpGE6aNEd2GaYuuIrSLcA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="tx-required.bpmn#_dJnQ4aaNEd2GaYuuIrSLcA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_dJptIKaNEd2GaYuuIrSLcA" points="[54, 3, -89, -8]$[128, 9, -15, -2]"/>
+ </edges>
+</notation:Diagram>
Added: projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.png
===================================================================
(Binary files differ)
Property changes on: projects/spec/trunk/modules/cts/src/test/resources/cts/transaction/tx-required.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -33,7 +33,6 @@
import javax.xml.bind.JAXBException;
import org.jbpm.api.InvalidProcessException;
-import org.jbpm.api.model.Process;
import org.jbpm.api.model.ProcessDefinition;
import org.jbpm.api.service.DialectHandler;
@@ -52,7 +51,7 @@
}
@Override
- public ProcessDefinition createProcessDefinition(String pXML)
+ public ProcessDefinition createProcess(String pXML)
{
try
{
@@ -71,7 +70,7 @@
}
@Override
- public ProcessDefinition createProcessDefinition(URL pURL) throws IOException
+ public ProcessDefinition createProcess(URL pURL) throws IOException
{
try
{
@@ -85,7 +84,8 @@
}
}
- public void marshallProcess(Process proc, Writer out) throws IOException
+ @Override
+ public void marshallProcess(ProcessDefinition proc, Writer out) throws IOException
{
try
{
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-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -45,7 +45,7 @@
import org.jbpm.api.model.OutputSet;
import org.jbpm.api.model.ParallelGateway;
import org.jbpm.api.model.Participant;
-import org.jbpm.api.model.Process;
+import org.jbpm.api.model.ProcessDefinition;
import org.jbpm.api.model.Property;
import org.jbpm.api.model.ReceiveTask;
import org.jbpm.api.model.SendTask;
@@ -94,9 +94,9 @@
*/
public class ProcessMarshaller
{
- public void marshallProcess(Process proc, Writer out) throws JAXBException, IOException
+ public void marshallProcess(ProcessDefinition procDef, Writer out) throws JAXBException, IOException
{
- JAXBProcess jaxbProc = adaptProcess(proc);
+ JAXBProcess jaxbProc = adaptProcess(procDef);
JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
Marshaller marshaller = jaxbContext.createMarshaller();
marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
@@ -105,28 +105,28 @@
marshaller.marshal(jaxbProc, out);
}
- private JAXBProcess adaptProcess(Process proc)
+ private JAXBProcess adaptProcess(ProcessDefinition procDef)
{
JAXBProcess jaxbProc = new JAXBProcess();
- jaxbProc.setName(proc.getName());
+ jaxbProc.setName(procDef.getName());
- for (Message msg : proc.getMessages())
+ for (Message msg : procDef.getMessages())
{
JAXBMessage jaxbMsg = adaptMessage(msg);
jaxbProc.getMessages().add(jaxbMsg);
}
- for (Property prop : proc.getProperties())
+ for (Property prop : procDef.getProperties())
{
JAXBProperty jaxbProp = getJaxbProperty(prop);
jaxbProc.getProperties().add(jaxbProp);
}
- for (Assignment ass : proc.getAssignments())
+ for (Assignment ass : procDef.getAssignments())
{
JAXBAssignment jaxbAss = getJaxbAssignment(ass);
jaxbProc.getAssignments().add(jaxbAss);
}
- for (Node flowObject : proc.getNodes())
+ for (Node flowObject : procDef.getNodes())
{
JAXBFlowObject jaxbNode;
if (flowObject instanceof Event)
@@ -172,8 +172,12 @@
// if (start.getTriggerType().size() > 1)
// throw new NotImplementedException("JBPM-1660", "StartTrigger Multiple");
- if (detailType == EventDetailType.Message)
+ if (detailType == EventDetailType.None)
{
+ // nothing to do
+ }
+ else if (detailType == EventDetailType.Message)
+ {
throw new NotImplementedException("JBPM-1657", "StartTrigger Message");
}
else if (detailType == EventDetailType.Timer)
@@ -207,8 +211,12 @@
// if (end.getResult().size() > 1)
// throw new NotImplementedException("JBPM-1683", "EndEvent Multiple Result");
- if (detailType == EventDetailType.Message)
+ if (detailType == EventDetailType.None)
{
+ // nothing to do
+ }
+ else if (detailType == EventDetailType.Message)
+ {
Message message = end.getMessageRef();
JAXBMessageRef jaxbMessageRef = adaptMessageRef(jaxbProc, message);
JAXBMessageEventDetail jaxbResult = new JAXBMessageEventDetail();
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -181,11 +181,11 @@
return ObjectNameFactory.create(objName);
}
- private void adaptJAXBEvent(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBEvent jaxb)
+ private void adaptJAXBEvent(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBEvent jaxbEvent)
{
- if (jaxb instanceof JAXBStartEvent)
+ if (jaxbEvent instanceof JAXBStartEvent)
{
- JAXBStartEvent jaxbStart = (JAXBStartEvent)jaxb;
+ JAXBStartEvent jaxbStart = (JAXBStartEvent)jaxbEvent;
EventBuilder eventBuilder = procBuilder.addStartEvent(jaxbStart.getName());
addOutFlow(procBuilder, jaxbStart.getOutFlow());
@@ -218,13 +218,13 @@
}
}
}
- else if (jaxb instanceof JAXBIntermediateEvent)
+ else if (jaxbEvent instanceof JAXBIntermediateEvent)
{
throw new NotImplementedException("JBPM-1661", "IntermediateEvent");
}
- else if (jaxb instanceof JAXBEndEvent)
+ else if (jaxbEvent instanceof JAXBEndEvent)
{
- JAXBEndEvent jaxbEnd = (JAXBEndEvent)jaxb;
+ JAXBEndEvent jaxbEnd = (JAXBEndEvent)jaxbEvent;
EventBuilder eventBuilder = procBuilder.addEndEvent(jaxbEnd.getName());
if (jaxbEnd.getResult().size() > 1)
@@ -266,11 +266,11 @@
}
else
{
- throw new IllegalStateException("Unsupported Event: " + jaxb);
+ throw new IllegalStateException("Unsupported Event: " + jaxbEvent);
}
- procBuilder.addExecutionHandler(loadHandler(ExecutionHandler.class, jaxb.getExecutionHandler()));
- procBuilder.addFlowHandler(loadHandler(FlowHandler.class, jaxb.getFlowHandler()));
- procBuilder.addSignalHandler(loadHandler(SignalHandler.class, jaxb.getSignalHandler()));
+ procBuilder.addExecutionHandler(loadHandler(ExecutionHandler.class, jaxbEvent.getExecutionHandler()));
+ procBuilder.addFlowHandler(loadHandler(FlowHandler.class, jaxbEvent.getFlowHandler()));
+ procBuilder.addSignalHandler(loadHandler(SignalHandler.class, jaxbEvent.getSignalHandler()));
}
private void adaptTask(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBTask jaxbTask)
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -43,8 +43,7 @@
* @author thomas.diesler(a)jboss.com
* @since 08-Jul-2008
*/
-@XmlType(name = "Task", propOrder = { "outFlow", "implementation", "executionHandler", "flowHandler", "signalHandler",
- "messageRef", "inputSets", "outputSets" })
+@XmlType(name = "Task", propOrder = { "outFlow", "executionHandler", "flowHandler", "signalHandler", "messageRef", "inputSets", "outputSets" })
public class JAXBTask extends JAXBActivity
{
private Task.TaskType taskType;
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/package-info.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/package-info.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/package-info.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-@XmlSchema(namespace="urn:bpm.jboss:pdl-0.1")
+@XmlSchema(namespace = "urn:jbpm.jboss:api-0.1")
package org.jbpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlSchema;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -34,7 +34,6 @@
import org.jbpm.api.InvalidProcessException;
import org.jbpm.api.NotImplementedException;
-import org.jbpm.api.model.Process;
import org.jbpm.api.model.ProcessDefinition;
import org.jbpm.api.service.DialectHandler;
import org.jbpm.dialect.jpdl32.model.JPDL32ProcessDefinition;
@@ -56,7 +55,7 @@
}
@Override
- public ProcessDefinition createProcessDefinition(String pXML)
+ public ProcessDefinition createProcess(String pXML)
{
try
{
@@ -72,7 +71,7 @@
}
@Override
- public ProcessDefinition createProcessDefinition(URL pURL) throws IOException
+ public ProcessDefinition createProcess(URL pURL) throws IOException
{
try
{
@@ -87,7 +86,8 @@
}
}
- public void marshallProcess(Process proc, Writer out) throws IOException
+ @Override
+ public void marshallProcess(ProcessDefinition proc, Writer out) throws IOException
{
throw new NotImplementedException("JBPM-1638", "DialectHandler jPDL3.2 marshallProcess");
}
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -34,7 +34,6 @@
import org.jbpm.api.InvalidProcessException;
import org.jbpm.api.NotImplementedException;
import org.jbpm.api.model.ProcessDefinition;
-import org.jbpm.api.model.Process;
import org.jbpm.api.service.DialectHandler;
/**
@@ -52,7 +51,7 @@
return NAMESPACE_URI;
}
- public ProcessDefinition createProcessDefinition(String pXML)
+ public ProcessDefinition createProcess(String pXML)
{
try
{
@@ -66,7 +65,7 @@
}
}
- public ProcessDefinition createProcessDefinition(URL pURL) throws IOException
+ public ProcessDefinition createProcess(URL pURL) throws IOException
{
try
{
@@ -80,7 +79,8 @@
}
}
- public void marshallProcess(Process proc, Writer out) throws IOException
+ @Override
+ public void marshallProcess(ProcessDefinition proc, Writer out) throws IOException
{
throw new NotImplementedException("JBPM-1639", "DialectHandler STP marshallProcess");
}
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -35,7 +35,6 @@
import org.jbpm.api.InvalidProcessException;
import org.jbpm.api.NotImplementedException;
import org.jbpm.api.model.ProcessDefinition;
-import org.jbpm.api.model.Process;
import org.jbpm.api.service.DialectHandler;
import org.jbpm.dialect.xpdl21.model.XPDLWorkflowProcess;
@@ -55,7 +54,7 @@
}
@Override
- public ProcessDefinition createProcessDefinition(String pXML)
+ public ProcessDefinition createProcess(String pXML)
{
try
{
@@ -71,7 +70,7 @@
}
@Override
- public ProcessDefinition createProcessDefinition(URL pURL) throws IOException
+ public ProcessDefinition createProcess(URL pURL) throws IOException
{
try
{
@@ -87,7 +86,7 @@
}
@Override
- public void marshallProcess(Process proc, Writer out) throws IOException
+ public void marshallProcess(ProcessDefinition proc, Writer out) throws IOException
{
throw new NotImplementedException("JBPM-1640", "DialectHandler XPL2.1 marshallProcess");
}
Modified: projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java
===================================================================
--- projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-10-30 13:20:37 UTC (rev 2677)
+++ projects/spec/trunk/modules/ri/src/main/java/org/jbpm/ri/model/NodeImpl.java 2008-10-30 15:02:36 UTC (rev 2678)
@@ -237,17 +237,17 @@
public <T extends ExecutionHandler> void setExecutionHandler(Class<T> clazz)
{
- this.execHandler = clazz.getName();
+ this.execHandler = clazz != null ? clazz.getName() : null;
}
public <T extends FlowHandler> void setFlowHandler(Class<T> clazz)
{
- this.flowHandler = clazz.getName();
+ this.flowHandler = clazz != null ? clazz.getName() : null;
}
public <T extends SignalHandler> void setSignalHandler(Class<T> clazz)
{
- this.sigHandler = clazz.getName();
+ this.sigHandler = clazz != null ? clazz.getName() : null;
}
@Override
15 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2677 - in projects/spec/trunk/modules/samples/airticket/server/src: main/java/org/jboss/bpm/samples/airticket/server and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-10-30 09:20:37 -0400 (Thu, 30 Oct 2008)
New Revision: 2677
Modified:
projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
projects/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn
projects/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn_diagram
Log:
Migrate AirticketTest to UserTask callback
Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-10-30 12:48:25 UTC (rev 2676)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/AirticketProcessBuilder.java 2008-10-30 13:20:37 UTC (rev 2677)
@@ -26,11 +26,11 @@
import javax.management.ObjectName;
import org.jbpm.api.model.Expression;
-import org.jbpm.api.model.Gateway;
import org.jbpm.api.model.ProcessDefinition;
-import org.jbpm.api.model.Task;
import org.jbpm.api.model.Assignment.AssignTime;
import org.jbpm.api.model.Expression.ExpressionLanguage;
+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.api.model.builder.TaskBuilder;
@@ -57,11 +57,10 @@
public static final String TASK_BOOKING = "Booking";
public static final String TASK_CHECK_AVAILABLE = "CheckAvailable";
public static final String TASK_CREDIT_CARD = "CreditCard";
- public static final String TASK_RECEIVE_ORDER = "ReceiveOrder";
public static final String TASK_RECEIVE_REQUEST = "ReceiveReq";
public static final String TASK_SEND_CONFIRM = "SendConfirm";
public static final String TASK_SEND_NOT_AVAILABLE = "SendNotAvailable";
- public static final String TASK_SEND_OFFER = "SendOffer";
+ public static final String TASK_MAKE_OFFER = "MakeOffer";
public static final String TASK_SEND_INVALID = "SendInvalid";
public static final String TASK_VALIDATE = "Validate";
@@ -102,13 +101,13 @@
procBuilder.addStartEvent("Start").addSequenceFlow(TASK_RECEIVE_REQUEST);
// Build the ReceiveReqTask
- TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, Task.TaskType.Receive);
+ TaskBuilder taskBuilder = procBuilder.addTask(TASK_RECEIVE_REQUEST, TaskType.Receive);
taskBuilder.addInMessageRef(MESSAGE_REQ_DATA).
addNodeAssignment(AssignTime.End, ExpressionLanguage.MVEL, getValidationExpression(), PROPERTY_IS_VALID_REQUEST).
addSequenceFlow(GATEWAY_IS_VALID);
// Build the ValidateGateway
- GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, Gateway.GatewayType.Exclusive);
+ GatewayBuilder gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_VALID, GatewayType.Exclusive);
gatewayBuilder.addConditionalGate(TASK_CHECK_AVAILABLE, Expression.ExpressionLanguage.MVEL, PROPERTY_IS_VALID_REQUEST + " == true").
addDefaultGate(TASK_SEND_INVALID);
@@ -119,37 +118,32 @@
addSequenceFlow(GATEWAY_IS_AVAILABLE);
// Build the SendInvalidTask
- taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, Task.TaskType.Send);
+ taskBuilder = procBuilder.addTask(TASK_SEND_INVALID, TaskType.Send);
taskBuilder.addOutMessageRef(MESSAGE_INVALID_DATA).
addSequenceFlow(TASK_RECEIVE_REQUEST);
// Build the AvailabilityGateway
- gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, Gateway.GatewayType.Exclusive);
- gatewayBuilder.addConditionalGate(TASK_SEND_OFFER, Expression.ExpressionLanguage.MVEL, PROPERTY_IS_AVAILABLE + " == true").
+ gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_AVAILABLE, GatewayType.Exclusive);
+ gatewayBuilder.addConditionalGate(TASK_MAKE_OFFER, Expression.ExpressionLanguage.MVEL, PROPERTY_IS_AVAILABLE + " == true").
addDefaultGate(TASK_SEND_NOT_AVAILABLE);
// Build the SendOfferTask
- taskBuilder = procBuilder.addTask(TASK_SEND_OFFER, Task.TaskType.Send);
- taskBuilder.addOutMessageRef(MESSAGE_OFFER).
- addSequenceFlow(TASK_RECEIVE_ORDER);
+ taskBuilder = procBuilder.addTask(TASK_MAKE_OFFER, TaskType.User);
+ taskBuilder.addOutMessageRef(MESSAGE_OFFER).addInMessageRef(MESSAGE_ACCEPT_OFFER).
+ addSequenceFlow(GATEWAY_IS_ACCEPTED);
// Build the SendNotAvailableTask
- taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, Task.TaskType.Send);
+ taskBuilder = procBuilder.addTask(TASK_SEND_NOT_AVAILABLE, TaskType.Send);
taskBuilder.addOutMessageRef(MESSAGE_NOT_AVAILABLE).
addSequenceFlow(TASK_RECEIVE_REQUEST);
- // Build the ReceiveReqTask
- taskBuilder = procBuilder.addTask(TASK_RECEIVE_ORDER, Task.TaskType.Receive);
- taskBuilder.addInMessageRef(MESSAGE_ACCEPT_OFFER).
- addSequenceFlow(GATEWAY_IS_ACCEPTED);
-
// Build the AcceptOfferGateway
- gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, Gateway.GatewayType.Exclusive);
+ gatewayBuilder = procBuilder.addGateway(GATEWAY_IS_ACCEPTED, GatewayType.Exclusive);
gatewayBuilder.addConditionalGate(GATEWAY_SPLIT, Expression.ExpressionLanguage.MVEL, PROPERTY_IS_OFFER_ACCEPTED + " == true").
addDefaultGate(TASK_RECEIVE_REQUEST);
// Build the AcceptOfferGateway
- gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, Gateway.GatewayType.Parallel);
+ gatewayBuilder = procBuilder.addGateway(GATEWAY_SPLIT, GatewayType.Parallel);
gatewayBuilder.addGate(TASK_CREDIT_CARD).
addGate(TASK_BOOKING);
@@ -172,11 +166,11 @@
addSequenceFlow(GATEWAY_SYNC_JOIN);
// Build the SynchronizedJoinGateway
- gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, Gateway.GatewayType.Parallel);
+ gatewayBuilder = procBuilder.addGateway(GATEWAY_SYNC_JOIN, GatewayType.Parallel);
gatewayBuilder.addGate(TASK_SEND_CONFIRM);
// Build the SendConfirmTask
- taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, Task.TaskType.Send);
+ taskBuilder = procBuilder.addTask(TASK_SEND_CONFIRM, TaskType.Send);
taskBuilder.addOutMessageRef(MESSAGE_CONFIRM).
addSequenceFlow(EVENT_END);
Modified: projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-10-30 12:48:25 UTC (rev 2676)
+++ projects/spec/trunk/modules/samples/airticket/server/src/main/java/org/jboss/bpm/samples/airticket/server/AirticketServiceImpl.java 2008-10-30 13:20:37 UTC (rev 2677)
@@ -79,7 +79,7 @@
else if (gwtMsg instanceof OrderMessage)
{
Message msg = getOrderMessage((OrderMessage)gwtMsg);
- mm.sendMessage(procID, AirticketProcessBuilder.TASK_RECEIVE_ORDER, msg);
+ mm.sendMessage(procID, AirticketProcessBuilder.TASK_MAKE_OFFER, msg);
}
else
{
Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-10-30 12:48:25 UTC (rev 2676)
+++ projects/spec/trunk/modules/samples/airticket/server/src/test/java/org/jboss/bpm/samples/airticket/AirticketTest.java 2008-10-30 13:20:37 UTC (rev 2677)
@@ -23,16 +23,17 @@
// $Id$
-import java.io.IOException;
-
import javax.management.ObjectName;
import org.jbpm.api.client.MessageListener;
+import org.jbpm.api.client.UserTaskCallback;
import org.jbpm.api.model.Message;
import org.jbpm.api.model.Process;
import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.UserTask;
import org.jbpm.api.model.builder.MessageBuilder;
import org.jbpm.api.model.builder.ObjectNameFactory;
+import org.jbpm.api.runtime.Attachments;
import org.jbpm.api.service.MessageBuilderService;
import org.jbpm.api.service.MessageService;
import org.jbpm.api.test.CTSTestCase;
@@ -56,11 +57,22 @@
public void testValidData() throws Exception
{
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ AirticketProcessBuilder builder = new AirticketProcessBuilder(getTestID());
+ ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition());
+
+ // Create the process instance
proc = procDef.newInstance();
+
+ // Attach the callback to the UserTask
+ UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER);
+ userTask.setUserTaskCallback(new UserTaskCallbackImpl());
+
+ // Start the process and send the request message
proc.startProcess();
+ Message reqMessage = getValidRequestMessage();
+ messageManager.sendMessage(proc.getKey(), AirticketProcessBuilder.TASK_RECEIVE_REQUEST, reqMessage);
- messageManager.sendMessage(proc.getKey(), AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getValidRequestMessage());
+ // Wait for the process to end
proc.waitForEnd();
Message confirmMessage = msgListener.getConfirmMessage();
@@ -71,11 +83,22 @@
public void testInvalidData() throws Exception
{
- ProcessDefinition procDef = unregisterOnTearDown(getProcessDefinition());
+ AirticketProcessBuilder builder = new AirticketProcessBuilder(getTestID());
+ ProcessDefinition procDef = unregisterOnTearDown(builder.buildProcessDefinition());
+
+ // Create the process instance
proc = procDef.newInstance();
+
+ // Attach the callback to the UserTask
+ UserTask userTask = proc.getNode(UserTask.class, AirticketProcessBuilder.TASK_MAKE_OFFER);
+ userTask.setUserTaskCallback(new UserTaskCallbackImpl());
+
+ // Start the process and send the request message
proc.startProcess();
+ Message reqMessage = getInvalidRequestMessage();
+ messageManager.sendMessage(proc.getKey(), AirticketProcessBuilder.TASK_RECEIVE_REQUEST, reqMessage);
- messageManager.sendMessage(proc.getKey(), AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getInvalidRequestMessage());
+ // Wait for the process to end
proc.waitForEnd();
Message confirmMessage = msgListener.getConfirmMessage();
@@ -104,49 +127,23 @@
super.tearDown();
}
- private Message getValidRequestMessage()
+ /**
+ * A UserTask callback that is associated with the MAKE_OFFER task
+ */
+ public static class UserTaskCallbackImpl extends UserTaskCallback
{
- MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
- Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_REQ_DATA).
- addProperty(AirticketProcessBuilder.PROPERTY_NAME, "Kermit").
- addProperty(AirticketProcessBuilder.PROPERTY_FROM, "MUC").
- addProperty(AirticketProcessBuilder.PROPERTY_TO, "NYC").
- addProperty(AirticketProcessBuilder.PROPERTY_DATE, "25-Jul-2008").
- addProperty(AirticketProcessBuilder.PROPERTY_SEATS, "2").getMessage();
- return msg;
+ @Override
+ public void callback(Attachments att)
+ {
+ att.addAttachment(AirticketProcessBuilder.PROPERTY_CREDIT_CARD, "1234-1234-1234-1234");
+ att.addAttachment(AirticketProcessBuilder.PROPERTY_EXPIRE, "25-Jul-2012");
+ att.addAttachment(AirticketProcessBuilder.PROPERTY_IS_OFFER_ACCEPTED, "true");
+ }
}
-
- private Message getInvalidRequestMessage()
- {
- MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
- Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_REQ_DATA).
- addProperty(AirticketProcessBuilder.PROPERTY_NAME, "Kermit").
- addProperty(AirticketProcessBuilder.PROPERTY_FROM, "MUC").
- addProperty(AirticketProcessBuilder.PROPERTY_TO, "NYC").
- addProperty(AirticketProcessBuilder.PROPERTY_DATE, "25-Jul-2008").
- addProperty(AirticketProcessBuilder.PROPERTY_SEATS, "0"). // Invalid number of seats
- getMessage();
- return msg;
- }
-
- private Message getAcceptOfferMessage()
- {
- MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
- Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_ACCEPT_OFFER).
- addProperty(AirticketProcessBuilder.PROPERTY_CREDIT_CARD, "1234-1234-1234-1234").
- addProperty(AirticketProcessBuilder.PROPERTY_EXPIRE, "25-Jul-2012").
- addProperty(AirticketProcessBuilder.PROPERTY_IS_OFFER_ACCEPTED, "true").
- getMessage();
- return msg;
- }
-
- protected ProcessDefinition getProcessDefinition() throws IOException
- {
- AirticketProcessBuilder builder = new AirticketProcessBuilder(getTestID());
- return builder.buildProcessDefinition();
- }
-
+ /**
+ * A message listener messages sent by the Airticket process
+ */
class AirticketMessageListener implements MessageListener
{
private ObjectName listenerID;
@@ -171,14 +168,44 @@
public void catchMessage(Message msg)
{
log.debug("catchMessage: " + msg);
+
+ MessageService mm = MessageService.locateMessageService();
ObjectName procID = proc.getKey();
- MessageService mm = MessageService.locateMessageService();
- if (msg.getName().equals(AirticketProcessBuilder.MESSAGE_INVALID_DATA))
+
+ String msgName = msg.getName();
+ if (msgName.equals(AirticketProcessBuilder.MESSAGE_INVALID_DATA) || msgName.equals(AirticketProcessBuilder.MESSAGE_NOT_AVAILABLE))
+ {
mm.sendMessage(procID, AirticketProcessBuilder.TASK_RECEIVE_REQUEST, getValidRequestMessage());
- else if (msg.getName().equals(AirticketProcessBuilder.MESSAGE_OFFER))
- mm.sendMessage(procID, AirticketProcessBuilder.TASK_RECEIVE_ORDER, getAcceptOfferMessage());
- else if (msg.getName().equals(AirticketProcessBuilder.MESSAGE_CONFIRM))
+ }
+ else if (msgName.equals(AirticketProcessBuilder.MESSAGE_CONFIRM))
+ {
confirmMessage = msg;
+ }
}
}
+
+ private Message getValidRequestMessage()
+ {
+ MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
+ Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_REQ_DATA).
+ addProperty(AirticketProcessBuilder.PROPERTY_NAME, "Kermit").
+ addProperty(AirticketProcessBuilder.PROPERTY_FROM, "MUC").
+ addProperty(AirticketProcessBuilder.PROPERTY_TO, "NYC").
+ addProperty(AirticketProcessBuilder.PROPERTY_DATE, "25-Jul-2008").
+ addProperty(AirticketProcessBuilder.PROPERTY_SEATS, "2").getMessage();
+ return msg;
+ }
+
+ private Message getInvalidRequestMessage()
+ {
+ MessageBuilder msgBuilder = MessageBuilderService.locateMessageBuilder();
+ Message msg = msgBuilder.newMessage(AirticketProcessBuilder.MESSAGE_REQ_DATA).
+ addProperty(AirticketProcessBuilder.PROPERTY_NAME, "Kermit").
+ addProperty(AirticketProcessBuilder.PROPERTY_FROM, "MUC").
+ addProperty(AirticketProcessBuilder.PROPERTY_TO, "NYC").
+ addProperty(AirticketProcessBuilder.PROPERTY_DATE, "25-Jul-2008").
+ addProperty(AirticketProcessBuilder.PROPERTY_SEATS, "0"). // Invalid number of seats
+ getMessage();
+ return msg;
+ }
}
\ No newline at end of file
Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn 2008-10-30 12:48:25 UTC (rev 2676)
+++ projects/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn 2008-10-30 13:20:37 UTC (rev 2677)
@@ -6,8 +6,8 @@
<vertices xmi:type="bpmn:Activity" xmi:id="_rsQa8VhtEd2aHsyOaYt_3g" iD="_rsQa8FhtEd2aHsyOaYt_3g" outgoingEdges="_zUIyUFhtEd2aHsyOaYt_3g _ApdYMVhvEd2aHsyOaYt_3g" incomingEdges="_nZeo4W4_Ed2iTb26rib3kA" name="IsValid" activityType="GatewayDataBasedExclusive"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_zUDSwVhtEd2aHsyOaYt_3g" iD="_zUDSwFhtEd2aHsyOaYt_3g" outgoingEdges="_9Q4IQVhtEd2aHsyOaYt_3g" incomingEdges="_zUIyUFhtEd2aHsyOaYt_3g" name="CheckAvailable" activityType="Task"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_9Q1sAFhtEd2aHsyOaYt_3g" iD="_9Q1E8FhtEd2aHsyOaYt_3g" outgoingEdges="_BdGREVhuEd2aHsyOaYt_3g _fHP64VhwEd2aHsyOaYt_3g" incomingEdges="_9Q4IQVhtEd2aHsyOaYt_3g" name="IsAvailable" activityType="GatewayDataBasedExclusive"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_BdDNwVhuEd2aHsyOaYt_3g" iD="_BdDNwFhuEd2aHsyOaYt_3g" outgoingEdges="_tT3_YVh1Ed2aHsyOaYt_3g" incomingEdges="_BdGREVhuEd2aHsyOaYt_3g" name="SendOffer" activityType="Task"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_D-IqcVhuEd2aHsyOaYt_3g" iD="_D-IqcFhuEd2aHsyOaYt_3g" outgoingEdges="_lVOK8VhuEd2aHsyOaYt_3g _1UWrsVhvEd2aHsyOaYt_3g" incomingEdges="_waDtMVh1Ed2aHsyOaYt_3g" name="IsAccepted" activityType="GatewayDataBasedExclusive"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_BdDNwVhuEd2aHsyOaYt_3g" iD="_BdDNwFhuEd2aHsyOaYt_3g" outgoingEdges="_vJRx4aaBEd2r29fC0iIfDA" incomingEdges="_BdGREVhuEd2aHsyOaYt_3g" name="MakeOffer" activityType="Task"/>
+ <vertices xmi:type="bpmn:Activity" xmi:id="_D-IqcVhuEd2aHsyOaYt_3g" iD="_D-IqcFhuEd2aHsyOaYt_3g" outgoingEdges="_lVOK8VhuEd2aHsyOaYt_3g _1UWrsVhvEd2aHsyOaYt_3g" incomingEdges="_vJRx4aaBEd2r29fC0iIfDA" name="IsAccepted" activityType="GatewayDataBasedExclusive"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_T7iiUVhuEd2aHsyOaYt_3g" iD="_T7iiUFhuEd2aHsyOaYt_3g" outgoingEdges="_efVRMVhuEd2aHsyOaYt_3g" incomingEdges="_ApdYMVhvEd2aHsyOaYt_3g" name="SendInvalid" activityType="Task"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_lVLHoVhuEd2aHsyOaYt_3g" iD="_lVLHoFhuEd2aHsyOaYt_3g" outgoingEdges="_VtHYMVhvEd2aHsyOaYt_3g _Ypm-gVhvEd2aHsyOaYt_3g" incomingEdges="_lVOK8VhuEd2aHsyOaYt_3g" name="Split" activityType="GatewayParallel"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_VtDt0VhvEd2aHsyOaYt_3g" iD="_VtDt0FhvEd2aHsyOaYt_3g" outgoingEdges="_Fj6DgVhwEd2aHsyOaYt_3g" incomingEdges="_VtHYMVhvEd2aHsyOaYt_3g" name="CreditCard" activityType="Task"/>
@@ -16,7 +16,6 @@
<vertices xmi:type="bpmn:Activity" xmi:id="_LXbhUVhwEd2aHsyOaYt_3g" iD="_LXbhUFhwEd2aHsyOaYt_3g" outgoingEdges="_QQQ4gVhwEd2aHsyOaYt_3g" incomingEdges="_LXfLsVhwEd2aHsyOaYt_3g" name="SendConfirm" activityType="Task"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_QQMAAVhwEd2aHsyOaYt_3g" iD="_QQMAAFhwEd2aHsyOaYt_3g" incomingEdges="_QQQ4gVhwEd2aHsyOaYt_3g" name="End" activityType="EventEndEmpty"/>
<vertices xmi:type="bpmn:Activity" xmi:id="_fHKbUVhwEd2aHsyOaYt_3g" iD="_fHKbUFhwEd2aHsyOaYt_3g" outgoingEdges="_r-90MVhwEd2aHsyOaYt_3g" incomingEdges="_fHP64VhwEd2aHsyOaYt_3g" name="SendNotAvailable" activityType="Task"/>
- <vertices xmi:type="bpmn:Activity" xmi:id="_tTzG4Fh1Ed2aHsyOaYt_3g" iD="_tTyf0Fh1Ed2aHsyOaYt_3g" outgoingEdges="_waDtMVh1Ed2aHsyOaYt_3g" incomingEdges="_tT3_YVh1Ed2aHsyOaYt_3g" name="ReceiveOrder" activityType="Task"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_iyzG8VhtEd2aHsyOaYt_3g" iD="_iyzG8FhtEd2aHsyOaYt_3g" source="_huULIVhtEd2aHsyOaYt_3g" target="_lMlo0VhtEd2aHsyOaYt_3g"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_zUIyUFhtEd2aHsyOaYt_3g" iD="_zUILQFhtEd2aHsyOaYt_3g" source="_rsQa8VhtEd2aHsyOaYt_3g" target="_zUDSwVhtEd2aHsyOaYt_3g"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_9Q4IQVhtEd2aHsyOaYt_3g" iD="_9Q4IQFhtEd2aHsyOaYt_3g" source="_zUDSwVhtEd2aHsyOaYt_3g" target="_9Q1sAFhtEd2aHsyOaYt_3g"/>
@@ -33,8 +32,7 @@
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_QQQ4gVhwEd2aHsyOaYt_3g" iD="_QQQ4gFhwEd2aHsyOaYt_3g" source="_LXbhUVhwEd2aHsyOaYt_3g" target="_QQMAAVhwEd2aHsyOaYt_3g"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_fHP64VhwEd2aHsyOaYt_3g" iD="_fHP64FhwEd2aHsyOaYt_3g" source="_9Q1sAFhtEd2aHsyOaYt_3g" target="_fHKbUVhwEd2aHsyOaYt_3g"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_r-90MVhwEd2aHsyOaYt_3g" iD="_r-90MFhwEd2aHsyOaYt_3g" source="_fHKbUVhwEd2aHsyOaYt_3g" target="_lMlo0VhtEd2aHsyOaYt_3g"/>
- <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_tT3_YVh1Ed2aHsyOaYt_3g" iD="_tT3_YFh1Ed2aHsyOaYt_3g" source="_BdDNwVhuEd2aHsyOaYt_3g" target="_tTzG4Fh1Ed2aHsyOaYt_3g"/>
- <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_waDtMVh1Ed2aHsyOaYt_3g" iD="_waDtMFh1Ed2aHsyOaYt_3g" source="_tTzG4Fh1Ed2aHsyOaYt_3g" target="_D-IqcVhuEd2aHsyOaYt_3g"/>
<sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_nZeo4W4_Ed2iTb26rib3kA" iD="_nZeo4G4_Ed2iTb26rib3kA" source="_lMlo0VhtEd2aHsyOaYt_3g" target="_rsQa8VhtEd2aHsyOaYt_3g"/>
+ <sequenceEdges xmi:type="bpmn:SequenceEdge" xmi:id="_vJRx4aaBEd2r29fC0iIfDA" iD="_vJRx4KaBEd2r29fC0iIfDA" source="_BdDNwVhuEd2aHsyOaYt_3g" target="_D-IqcVhuEd2aHsyOaYt_3g"/>
</pools>
</bpmn:BpmnDiagram>
Modified: projects/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn_diagram
===================================================================
--- projects/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn_diagram 2008-10-30 12:48:25 UTC (rev 2676)
+++ projects/spec/trunk/modules/samples/airticket/server/src/test/resources/samples/airticket/airticket.bpmn_diagram 2008-10-30 13:20:37 UTC (rev 2677)
@@ -13,7 +13,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_huUyM1htEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_huUyNFhtEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_huULIVhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_huUyNVhtEd2aHsyOaYt_3g" x="24" y="36"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_huUyNVhtEd2aHsyOaYt_3g" y="60"/>
</children>
<children xmi:type="notation:Node" xmi:id="_lMmP4FhtEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_lMm28FhtEd2aHsyOaYt_3g" type="4001"/>
@@ -22,7 +22,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_lMmP41htEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_lMmP5FhtEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_lMlo0VhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lMmP5VhtEd2aHsyOaYt_3g" x="96" y="60"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lMmP5VhtEd2aHsyOaYt_3g" x="60" y="72"/>
</children>
<children xmi:type="notation:Node" xmi:id="_rsRCAFhtEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_rsRpEFhtEd2aHsyOaYt_3g" type="4001"/>
@@ -31,7 +31,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_rsRCA1htEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_rsRCBFhtEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_rsQa8VhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rsRCBVhtEd2aHsyOaYt_3g" x="264" y="60"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_rsRCBVhtEd2aHsyOaYt_3g" x="192" y="72"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zUEg4FhtEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_zUEg5lhtEd2aHsyOaYt_3g" type="4001"/>
@@ -40,7 +40,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_zUEg41htEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_zUEg5FhtEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_zUDSwVhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUEg5VhtEd2aHsyOaYt_3g" x="336"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUEg5VhtEd2aHsyOaYt_3g" x="264" y="12"/>
</children>
<children xmi:type="notation:Node" xmi:id="_9Q1sAVhtEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_9Q2TEFhtEd2aHsyOaYt_3g" type="4001"/>
@@ -49,7 +49,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_9Q1sBFhtEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_9Q1sBVhtEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_9Q1sAFhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q1sBlhtEd2aHsyOaYt_3g" x="480" y="72"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_9Q1sBlhtEd2aHsyOaYt_3g" x="408" y="84"/>
</children>
<children xmi:type="notation:Node" xmi:id="_BdD00FhuEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_BdD01lhuEd2aHsyOaYt_3g" type="4001"/>
@@ -58,7 +58,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_BdD001huEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_BdD01FhuEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_BdDNwVhuEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BdD01VhuEd2aHsyOaYt_3g" x="552"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_BdD01VhuEd2aHsyOaYt_3g" x="480" y="12"/>
</children>
<children xmi:type="notation:Node" xmi:id="_D-J4kFhuEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_D-KfoFhuEd2aHsyOaYt_3g" type="4001"/>
@@ -67,7 +67,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_D-J4k1huEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_D-J4lFhuEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_D-IqcVhuEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-J4lVhuEd2aHsyOaYt_3g" x="838" y="132"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_D-J4lVhuEd2aHsyOaYt_3g" x="646" y="132"/>
</children>
<children xmi:type="notation:Node" xmi:id="_T7jwcFhuEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_T7kXgFhuEd2aHsyOaYt_3g" type="4001"/>
@@ -76,7 +76,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_T7jwc1huEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_T7jwdFhuEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_T7iiUVhuEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7jwdVhuEd2aHsyOaYt_3g" x="336" y="120"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_T7jwdVhuEd2aHsyOaYt_3g" x="264" y="132"/>
</children>
<children xmi:type="notation:Node" xmi:id="_lVLHolhuEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_lVLuslhuEd2aHsyOaYt_3g" type="4001"/>
@@ -85,7 +85,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_lVLHpVhuEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_lVLusFhuEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_lVLHoVhuEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lVLusVhuEd2aHsyOaYt_3g" x="444" y="420" width="50" height="50"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lVLusVhuEd2aHsyOaYt_3g" x="732" y="72" width="50" height="50"/>
</children>
<children xmi:type="notation:Node" xmi:id="_VtE78FhvEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_VtFjAFhvEd2aHsyOaYt_3g" type="4001"/>
@@ -94,7 +94,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_VtE781hvEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_VtE79FhvEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_VtDt0VhvEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtE79VhvEd2aHsyOaYt_3g" x="540" y="324" width="111" height="61"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_VtE79VhvEd2aHsyOaYt_3g" x="792" y="12" width="111" height="61"/>
</children>
<children xmi:type="notation:Node" xmi:id="_YpkiQFhvEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_YpkiRlhvEd2aHsyOaYt_3g" type="4001"/>
@@ -103,7 +103,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_YpkiQ1hvEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_YpkiRFhvEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_Ypj7MVhvEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YpkiRVhvEd2aHsyOaYt_3g" x="540" y="492" width="111" height="61"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_YpkiRVhvEd2aHsyOaYt_3g" x="792" y="144" width="111" height="61"/>
</children>
<children xmi:type="notation:Node" xmi:id="_Fj1yEFhwEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_Fj2ZIFhwEd2aHsyOaYt_3g" type="4001"/>
@@ -112,7 +112,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_Fj1yE1hwEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_Fj1yFFhwEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_Fj1LAVhwEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fj1yFVhwEd2aHsyOaYt_3g" x="684" y="420" width="50" height="50"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Fj1yFVhwEd2aHsyOaYt_3g" x="912" y="72" width="50" height="50"/>
</children>
<children xmi:type="notation:Node" xmi:id="_LXcvcFhwEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_LXdWgFhwEd2aHsyOaYt_3g" type="4001"/>
@@ -121,7 +121,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_LXcvc1hwEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_LXcvdFhwEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_LXbhUVhwEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LXcvdVhwEd2aHsyOaYt_3g" x="780" y="420" width="111" height="61"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LXcvdVhwEd2aHsyOaYt_3g" x="984" y="72" width="111" height="61"/>
</children>
<children xmi:type="notation:Node" xmi:id="_QQMnEFhwEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_QQNOIFhwEd2aHsyOaYt_3g" type="4001"/>
@@ -130,7 +130,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_QQMnE1hwEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_QQMnFFhwEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_QQMAAVhwEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QQMnFVhwEd2aHsyOaYt_3g" x="924" y="432" width="30" height="30"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_QQMnFVhwEd2aHsyOaYt_3g" x="1116" y="84" width="30" height="30"/>
</children>
<children xmi:type="notation:Node" xmi:id="_fHLpcFhwEd2aHsyOaYt_3g" type="2001">
<children xmi:type="notation:Node" xmi:id="_fHMQgFhwEd2aHsyOaYt_3g" type="4001"/>
@@ -139,17 +139,8 @@
<styles xmi:type="notation:FillStyle" xmi:id="_fHLpc1hwEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:LineStyle" xmi:id="_fHLpdFhwEd2aHsyOaYt_3g" lineColor="0"/>
<element xmi:type="bpmn:Activity" href="airticket.bpmn#_fHKbUVhwEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHLpdVhwEd2aHsyOaYt_3g" x="552" y="120"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_fHLpdVhwEd2aHsyOaYt_3g" x="480" y="132"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tTzt8Fh1Ed2aHsyOaYt_3g" type="2001">
- <children xmi:type="notation:Node" xmi:id="_tT0VAFh1Ed2aHsyOaYt_3g" type="4001"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_tTzt8Vh1Ed2aHsyOaYt_3g" fontName="Arial"/>
- <styles xmi:type="notation:DescriptionStyle" xmi:id="_tTzt8lh1Ed2aHsyOaYt_3g"/>
- <styles xmi:type="notation:FillStyle" xmi:id="_tTzt81h1Ed2aHsyOaYt_3g"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_tTzt9Fh1Ed2aHsyOaYt_3g" lineColor="0"/>
- <element xmi:type="bpmn:Activity" href="airticket.bpmn#_tTzG4Fh1Ed2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tTzt9Vh1Ed2aHsyOaYt_3g" x="708"/>
- </children>
<styles xmi:type="notation:DrawerStyle" xmi:id="_dhSKAVhtEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:SortingStyle" xmi:id="_dhSKAlhtEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_dhSKA1htEd2aHsyOaYt_3g"/>
@@ -159,7 +150,7 @@
<styles xmi:type="notation:FillStyle" xmi:id="_dhRi8VhtEd2aHsyOaYt_3g" fillColor="16771304"/>
<styles xmi:type="notation:LineStyle" xmi:id="_dhRi8lhtEd2aHsyOaYt_3g" lineColor="11119017"/>
<element xmi:type="bpmn:Pool" href="airticket.bpmn#_dhOfoVhtEd2aHsyOaYt_3g"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dhRi81htEd2aHsyOaYt_3g" x="16" y="24" width="1271" height="565"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dhRi81htEd2aHsyOaYt_3g" x="16" y="24" width="1209" height="289"/>
</children>
<styles xmi:type="notation:PageStyle" xmi:id="_iZDcIVhrEd2aHsyOaYt_3g"/>
<styles xmi:type="notation:GuideStyle" xmi:id="_iZDcIlhrEd2aHsyOaYt_3g"/>
@@ -357,30 +348,6 @@
<element xmi:type="bpmn:SequenceEdge" href="airticket.bpmn#_r-90MVhwEd2aHsyOaYt_3g"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_r_A3hFhwEd2aHsyOaYt_3g" points="[-53, -6, 391, 54]$[-415, -31, 29, 29]"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_tT5NgFh1Ed2aHsyOaYt_3g" type="3001" source="_BdD00FhuEd2aHsyOaYt_3g" target="_tTzt8Fh1Ed2aHsyOaYt_3g">
- <children xmi:type="notation:Node" xmi:id="_tT5NhVh1Ed2aHsyOaYt_3g" type="4012">
- <styles xmi:type="notation:FillStyle" xmi:id="_tT5Nhlh1Ed2aHsyOaYt_3g" fillColor="16776959"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_tT5Nh1h1Ed2aHsyOaYt_3g" lineColor="16776959"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tT5NiFh1Ed2aHsyOaYt_3g" y="-10"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_tT5NgVh1Ed2aHsyOaYt_3g" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_tT5Nglh1Ed2aHsyOaYt_3g" fontName="Arial"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_tT5Ng1h1Ed2aHsyOaYt_3g" lineColor="0"/>
- <element xmi:type="bpmn:SequenceEdge" href="airticket.bpmn#_tT3_YVh1Ed2aHsyOaYt_3g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tT5NhFh1Ed2aHsyOaYt_3g" points="[-53, -3, 650, 27]$[-701, -30, 2, 0]"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_waE7UFh1Ed2aHsyOaYt_3g" type="3001" source="_tTzt8Fh1Ed2aHsyOaYt_3g" target="_D-J4kFhuEd2aHsyOaYt_3g">
- <children xmi:type="notation:Node" xmi:id="_waFiYFh1Ed2aHsyOaYt_3g" type="4012">
- <styles xmi:type="notation:FillStyle" xmi:id="_waFiYVh1Ed2aHsyOaYt_3g" fillColor="16776959"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_waFiYlh1Ed2aHsyOaYt_3g" lineColor="16776959"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_waFiY1h1Ed2aHsyOaYt_3g" y="-10"/>
- </children>
- <styles xmi:type="notation:RoutingStyle" xmi:id="_waE7UVh1Ed2aHsyOaYt_3g" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_waE7Ulh1Ed2aHsyOaYt_3g" fontName="Arial"/>
- <styles xmi:type="notation:LineStyle" xmi:id="_waE7U1h1Ed2aHsyOaYt_3g" lineColor="0"/>
- <element xmi:type="bpmn:SequenceEdge" href="airticket.bpmn#_waDtMVh1Ed2aHsyOaYt_3g"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_waE7VFh1Ed2aHsyOaYt_3g" points="[-8, 29, 8, -100]$[-40, 128, -24, -1]"/>
- </edges>
<edges xmi:type="notation:Edge" xmi:id="_nZiTQG4_Ed2iTb26rib3kA" type="3001" source="_lMmP4FhtEd2aHsyOaYt_3g" target="_rsRCAFhtEd2aHsyOaYt_3g">
<children xmi:type="notation:Node" xmi:id="_nZlWkG4_Ed2iTb26rib3kA" type="4012">
<styles xmi:type="notation:FillStyle" xmi:id="_nZlWkW4_Ed2iTb26rib3kA" fillColor="16776959"/>
@@ -393,4 +360,16 @@
<element xmi:type="bpmn:SequenceEdge" href="airticket.bpmn#_nZeo4W4_Ed2iTb26rib3kA"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_nZiTRG4_Ed2iTb26rib3kA" points="[54, 0, -206, 3]$[245, 7, -15, 10]"/>
</edges>
+ <edges xmi:type="notation:Edge" xmi:id="_vJXRcKaBEd2r29fC0iIfDA" type="3001" source="_BdD00FhuEd2aHsyOaYt_3g" target="_D-J4kFhuEd2aHsyOaYt_3g">
+ <children xmi:type="notation:Node" xmi:id="_vJbi4KaBEd2r29fC0iIfDA" type="4012">
+ <styles xmi:type="notation:FillStyle" xmi:id="_vJbi4aaBEd2r29fC0iIfDA" fillColor="16776959"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_vJbi4qaBEd2r29fC0iIfDA" lineColor="16776959"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_vJbi46aBEd2r29fC0iIfDA" y="-10"/>
+ </children>
+ <styles xmi:type="notation:RoutingStyle" xmi:id="_vJXRcaaBEd2r29fC0iIfDA" routing="Rectilinear" smoothness="Normal" closestDistance="true"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_vJXRcqaBEd2r29fC0iIfDA" fontName="Arial"/>
+ <styles xmi:type="notation:LineStyle" xmi:id="_vJXRc6aBEd2r29fC0iIfDA" lineColor="0"/>
+ <element xmi:type="bpmn:SequenceEdge" href="airticket.bpmn#_vJRx4aaBEd2r29fC0iIfDA"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vJXRdKaBEd2r29fC0iIfDA" points="[51, 29, -209, -100]$[242, 136, -18, 7]"/>
+ </edges>
</notation:Diagram>
15 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2676 - in projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client: process and 1 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-10-30 08:48:25 -0400 (Thu, 30 Oct 2008)
New Revision: 2676
Modified:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java
Log:
Parse TaskRefernces upon store.load() in TaskList
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-10-30 11:19:39 UTC (rev 2675)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-10-30 12:48:25 UTC (rev 2676)
@@ -72,34 +72,39 @@
for (int i = 0; i < array.size(); ++i)
{
JSONObject item = array.get(i).isObject();
- long id = JSONWalk.on(item).next("id").asLong();
- long tokenId = JSONWalk.on(item).next("tokenId").asLong();
- long instanceId = JSONWalk.on(item).next("processInstanceId").asLong();
- String name = JSONWalk.on(item).next("name").asString();
- String actor = JSONWalk.on(item).next("actor").asString();
- boolean isBlocking = JSONWalk.on(item).next("isBlocking").asBool();
- boolean isSignalling = JSONWalk.on(item).next("isSignalling").asBool();
-
- TaskReference ref = new TaskReference(
- id, tokenId, instanceId,
- name, actor,
- isSignalling, isBlocking
- );
+ TaskReference ref = parseTaskReference(item);
+ results.add(ref);
+ }
- if(isSignalling)
+ return results;
+ }
+
+ public static TaskReference parseTaskReference(JSONObject item)
+ {
+ long id = JSONWalk.on(item).next("id").asLong();
+ long tokenId = JSONWalk.on(item).next("tokenId").asLong();
+ long instanceId = JSONWalk.on(item).next("processInstanceId").asLong();
+ String name = JSONWalk.on(item).next("name").asString();
+ String actor = JSONWalk.on(item).next("actor").asString();
+ boolean isBlocking = JSONWalk.on(item).next("isBlocking").asBool();
+ boolean isSignalling = JSONWalk.on(item).next("isSignalling").asBool();
+
+ TaskReference ref = new TaskReference(
+ id, tokenId, instanceId,
+ name, actor,
+ isSignalling, isBlocking
+ );
+
+ if(isSignalling)
+ {
+ JSONArray arr = JSONWalk.on(item).next("transitionNames").asArray();
+ for (int k = 0; k < arr.size(); ++k)
{
- JSONArray arr = JSONWalk.on(item).next("transitionNames").asArray();
- for (int k = 0; k < arr.size(); ++k)
- {
- JSONString t = arr.get(k).isString();
- ref.getTransitionNames().add(t.stringValue());
- }
+ JSONString t = arr.get(k).isString();
+ ref.getTransitionNames().add(t.stringValue());
}
-
- results.add(ref);
-
}
- return results;
+ return ref;
}
}
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-30 11:19:39 UTC (rev 2675)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-30 12:48:25 UTC (rev 2676)
@@ -161,7 +161,7 @@
i++;
}
- System.out.println("Loaded " + row2ProcessMap.size() + " records");
+ System.out.println("Loaded " + row2ProcessMap.size() + " process definitions");
}
public List<ProcessDefinition> getAvailableProcessDefinitions()
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-10-30 11:19:39 UTC (rev 2675)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-10-30 12:48:25 UTC (rev 2676)
@@ -21,17 +21,26 @@
*/
package org.jboss.bpm.console.client.task;
-import org.jboss.bpm.console.client.widgets.RemoteListView;
-import org.jboss.bpm.console.client.MainView;
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.json.client.JSONObject;
import com.gwtext.client.data.*;
+import com.gwtext.client.widgets.grid.ColumnConfig;
import com.gwtext.client.widgets.grid.ColumnModel;
-import com.gwtext.client.widgets.grid.ColumnConfig;
+import org.jboss.bpm.console.client.MainView;
+import org.jboss.bpm.console.client.model.DTOParser;
+import org.jboss.bpm.console.client.model.TaskReference;
+import org.jboss.bpm.console.client.widgets.RemoteListView;
+import java.util.Map;
+import java.util.HashMap;
+
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class TaskList extends RemoteListView
{
+ private Map<Integer,TaskReference> row2taskref = new HashMap<Integer,TaskReference>();
+
public TaskList(String titleName, final MainView view)
{
super(titleName, view,
@@ -59,7 +68,17 @@
protected void onRecordsLoaded(Record[] records)
{
+ int i=0;
+ for(Record r : records)
+ {
+ JavaScriptObject js = r.getDataAsJsObject();
+ JSONObject jso = new JSONObject(js);
+ TaskReference ref = DTOParser.parseTaskReference(jso);
+ row2taskref.put(i, ref);
+ i++;
+ }
+ System.out.println("Loaded " + row2taskref.size() + " tasks");
}
protected ColumnModel createColumnModel()
15 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2675 - in projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client: task and 1 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-10-30 07:19:39 -0400 (Thu, 30 Oct 2008)
New Revision: 2675
Modified:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java
Log:
Enable / disable buttons in RemoteListView
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-30 11:16:27 UTC (rev 2674)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-30 11:19:39 UTC (rev 2675)
@@ -42,7 +42,8 @@
public ProcessDefinitionList(String titleName, final MainView view)
{
- super(titleName, view, getResourceUrl(view), false);
+ super(titleName, view, getResourceUrl(view));
+ enableAddBtn(false);
}
private static String getResourceUrl(MainView view)
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-10-30 11:16:27 UTC (rev 2674)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-10-30 11:19:39 UTC (rev 2675)
@@ -48,7 +48,7 @@
public ProcessInstanceList(ProcessDefinition procDef, String titleName, MainView view)
{
- super(titleName, view, getResourceUrl(view, procDef.getProcessId()), true);
+ super(titleName, view, getResourceUrl(view, procDef.getProcessId()));
this.parent = procDef;
}
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-10-30 11:16:27 UTC (rev 2674)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java 2008-10-30 11:19:39 UTC (rev 2675)
@@ -35,9 +35,11 @@
public TaskList(String titleName, final MainView view)
{
super(titleName, view,
- view.getUrlBuilder().getTaskListByActorURL(view.getRolesAssigned()),
- false
+ view.getUrlBuilder().getTaskListByActorURL(view.getRolesAssigned())
);
+
+ enableAddBtn(false);
+ enableDeleteBtn(false);
}
protected void onAdd()
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java 2008-10-30 11:16:27 UTC (rev 2674)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/RemoteListView.java 2008-10-30 11:19:39 UTC (rev 2675)
@@ -55,15 +55,16 @@
private PagingToolbar pagingToolbar;
private boolean storeInit = false;
- private boolean hasAddButton;
- public RemoteListView(String titleName, MainView view, String resourceUrl, boolean hasAddButton)
+ private ToolbarButton addButton;
+ private ToolbarButton deleteButton;
+
+ public RemoteListView(String titleName, MainView view, String resourceUrl)
{
super();
this.title = titleName;
this.view = view;
- this.hasAddButton = hasAddButton;
// ----------------------------------------
@@ -114,6 +115,22 @@
}
+ protected void enableAddBtn(boolean isEnabled)
+ {
+ if(isEnabled)
+ this.addButton.enable();
+ else
+ this.addButton.disable();
+ }
+
+ protected void enableDeleteBtn(boolean isEnabled)
+ {
+ if(isEnabled)
+ this.deleteButton.enable();
+ else
+ this.deleteButton.disable();
+ }
+
private GridPanel createGridPanel(String titleName)
{
GridPanel grid = new GridPanel();
@@ -155,21 +172,18 @@
pagingToolbar.addButton(examineButton);
- if(hasAddButton)
+ addButton = new ToolbarButton("Add", new ButtonListenerAdapter()
{
- ToolbarButton addButton = new ToolbarButton("Add", new ButtonListenerAdapter()
+ public void onClick(Button button, EventObject e)
{
- public void onClick(Button button, EventObject e)
- {
- onAdd();
- }
- });
- //addButton.setIcon("images/icons/add.png");
- addButton.setTooltip("Add");
- pagingToolbar.addButton( addButton );
- }
-
- ToolbarButton deleteButton = new ToolbarButton("Remove", new ButtonListenerAdapter()
+ onAdd();
+ }
+ });
+ //addButton.setIcon("images/icons/add.png");
+ addButton.setTooltip("Add");
+ pagingToolbar.addButton( addButton );
+
+ deleteButton = new ToolbarButton("Remove", new ButtonListenerAdapter()
{
public void onClick(Button button, EventObject e)
{
15 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2674 - jbpm3/trunk/modules/core.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-10-30 07:16:27 -0400 (Thu, 30 Oct 2008)
New Revision: 2674
Modified:
jbpm3/trunk/modules/core/pom.xml
Log:
[JBPM-1736] concurrent execution not supported on hsqldb
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2008-10-30 11:15:47 UTC (rev 2673)
+++ jbpm3/trunk/modules/core/pom.xml 2008-10-30 11:16:27 UTC (rev 2674)
@@ -247,6 +247,8 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
+ <!-- Concurrent execution not supported on hsqldb -->
+ <exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
</excludes>
</configuration>
</plugin>
15 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2673 - jbpm3/trunk/modules/core.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-10-30 07:15:47 -0400 (Thu, 30 Oct 2008)
New Revision: 2673
Modified:
jbpm3/trunk/modules/core/pom.xml
Log:
[JBPM-1736] concurrent execution not supported on hsqldb
Modified: jbpm3/trunk/modules/core/pom.xml
===================================================================
--- jbpm3/trunk/modules/core/pom.xml 2008-10-30 11:08:13 UTC (rev 2672)
+++ jbpm3/trunk/modules/core/pom.xml 2008-10-30 11:15:47 UTC (rev 2673)
@@ -220,7 +220,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
- <!-- https://jira.jboss.org/jira/browse/JBPM-1736 -->
+ <!-- Concurrent execution not supported on hsqldb -->
<exclude>org/jbpm/jbpm983/JBPM983Test.java</exclude>
</excludes>
</configuration>
15 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2672 - in jbpm3/trunk: modules/distribution and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-10-30 07:08:13 -0400 (Thu, 30 Oct 2008)
New Revision: 2672
Modified:
jbpm3/trunk/modules/distribution/pom.xml
jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
jbpm3/trunk/modules/enterprise/ear/pom.xml
jbpm3/trunk/pom.xml
Log:
Update to jsf-console-3.3.0-SNAPSHOT
Modified: jbpm3/trunk/modules/distribution/pom.xml
===================================================================
--- jbpm3/trunk/modules/distribution/pom.xml 2008-10-30 11:06:59 UTC (rev 2671)
+++ jbpm3/trunk/modules/distribution/pom.xml 2008-10-30 11:08:13 UTC (rev 2672)
@@ -26,10 +26,6 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <properties>
- <gwt.console.version>1.0.0-SNAPSHOT</gwt.console.version>
- </properties>
-
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -63,18 +59,6 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>gwt-console</artifactId>
- <version>${gwt.console.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
- <artifactId>gwt-console-server</artifactId>
- <version>${gwt.console.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-identity</artifactId>
<version>${version}</version>
</dependency>
@@ -103,7 +87,24 @@
<version>${version}</version>
<type>jdocbook</type>
</dependency>
+
+ <!-- jBPM Projects -->
<dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gwt-console</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gwt-console-server</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
<groupId>org.jbpm</groupId>
<artifactId>jbpm-jpdl-designer</artifactId>
<type>zip</type>
@@ -112,15 +113,15 @@
<!-- Sources -->
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-console</artifactId>
+ <artifactId>jbpm-core</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jbpm-core</artifactId>
+ <artifactId>jsf-console</artifactId>
<classifier>sources</classifier>
- <version>${version}</version>
+ <version>${jbpm.jsf-console.version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
Modified: jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-10-30 11:06:59 UTC (rev 2671)
+++ jbpm3/trunk/modules/distribution/src/main/resources/installer/install-definition.xml 2008-10-30 11:08:13 UTC (rev 2672)
@@ -115,6 +115,7 @@
<include name="jbpm-enterprise-bundle.ear" />
<include name="jbpm-core.jar" />
<include name="jbpm-identity.jar" />
+ <include name="jsf-console.war" />
<include name="activation.jar" />
<include name="antlr.jar" />
<include name="asm.jar" />
@@ -131,7 +132,7 @@
<!-- jbpm3/src -->
<fileset dir="@{deploy.artifacts.dir}/src" targetdir="$INSTALL_PATH/jbpm3/src" override="true">
- <include name="jbpm-console-sources.jar" />
+ <include name="jsf-console-sources.jar" />
<include name="jbpm-core-sources.jar" />
<include name="jbpm-enterprise-beans-sources.jar" />
<include name="jbpm-identity-sources.jar" />
@@ -187,7 +188,9 @@
<!-- jbpm/jbpm-userguide.war -->
<file src="@{deploy.artifacts.dir}/lib/jbpm-userguide.zip" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-userguide.war"
unpack="true" override="true" />
-
+
+ <!-- jbpm-destinations-service -->
+ <file src="@{resources.dir}/destination/jbpm-destinations-service.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" />
</pack>
<!-- jBPM Databases -->
@@ -238,10 +241,5 @@
<singlefile src="@{deploy.artifacts.dir}/resources/jbpm-core-config/hibernate.cfg.sybase.xml" target="${installPath}/server/${jbossTargetServer}/deploy/jbpm/jbpm-service.sar/hibernate.cfg.xml" />
</pack>
- <!-- jBPM JMS Destinations -->
- <pack name="jBPM3 JMS Destinations" required="no" preselected="yes">
- <description>The JMS Destinations</description>
- <file src="@{resources.dir}/destination/jbpm-destinations-service.xml" targetdir="${installPath}/server/${jbossTargetServer}/deploy/jbpm" />
- </pack>
</packs>
</installation>
\ No newline at end of file
Modified: jbpm3/trunk/modules/enterprise/ear/pom.xml
===================================================================
--- jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-10-30 11:06:59 UTC (rev 2671)
+++ jbpm3/trunk/modules/enterprise/ear/pom.xml 2008-10-30 11:08:13 UTC (rev 2672)
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console-war</artifactId>
+ <artifactId>jsf-console</artifactId>
<type>war</type>
</dependency>
<dependency>
@@ -116,7 +116,7 @@
</jarModule>
<webModule>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console-war</artifactId>
+ <artifactId>jsf-console</artifactId>
<bundleFileName>jsf-console.war</bundleFileName>
<contextRoot>/jbpm-console</contextRoot>
<unpack>true</unpack>
Modified: jbpm3/trunk/pom.xml
===================================================================
--- jbpm3/trunk/pom.xml 2008-10-30 11:06:59 UTC (rev 2671)
+++ jbpm3/trunk/pom.xml 2008-10-30 11:08:13 UTC (rev 2672)
@@ -29,9 +29,9 @@
<!-- Modules -->
<modules>
<module>modules/core</module>
+ <module>modules/identity</module>
<module>modules/enterprise</module>
<module>modules/examples</module>
- <module>modules/identity</module>
<module>modules/simulation</module>
</modules>
@@ -64,9 +64,10 @@
<javax.persistence.version>1.0</javax.persistence.version>
<javax.jaxb.version>2.1</javax.jaxb.version>
<jaxen.version>1.1.1</jaxen.version>
- <jsf-console.version>3.2.2-SNAPSHOT</jsf-console.version>
<jbpm.api.version>1.0.0-SNAPSHOT</jbpm.api.version>
- <jboss.jbpm.designer.version>3.1.4</jboss.jbpm.designer.version>
+ <jbpm.designer.version>3.1.4</jbpm.designer.version>
+ <jbpm.gwt-console.version>1.0.0-SNAPSHOT</jbpm.gwt-console.version>
+ <jbpm.jsf-console.version>3.3.0-SNAPSHOT</jbpm.jsf-console.version>
<jboss.gravel.version>1.0.0.GA</jboss.gravel.version>
<jboss.seam.version>2.0.2.GA</jboss.seam.version>
<junit.version>3.8.1</junit.version>
@@ -93,17 +94,29 @@
<version>${jbpm.api.version}</version>
</dependency>
<dependency>
- <groupId>org.jbpm</groupId>
- <artifactId>jbpm-jpdl-designer</artifactId>
- <version>${jboss.jbpm.designer.version}</version>
- <type>zip</type>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jsf-console</artifactId>
+ <version>${jbpm.jsf-console.version}</version>
+ <type>war</type>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
- <artifactId>jsf-console-war</artifactId>
- <version>${jsf-console.version}</version>
+ <artifactId>gwt-console</artifactId>
+ <version>${jbpm.gwt-console.version}</version>
<type>war</type>
</dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>gwt-console-server</artifactId>
+ <version>${jbpm.gwt-console.version}</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm</groupId>
+ <artifactId>jbpm-jpdl-designer</artifactId>
+ <version>${jbpm.designer.version}</version>
+ <type>zip</type>
+ </dependency>
<!-- Thirdparty Dependencies -->
<dependency>
15 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2671 - in projects/gwt-console/trunk/war/src/main: resources/org/jboss/bpm/console/public and 1 other directory.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-10-30 07:06:59 -0400 (Thu, 30 Oct 2008)
New Revision: 2671
Modified:
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Header.java
projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css
Log:
Added logoout functionality
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java 2008-10-30 11:03:58 UTC (rev 2670)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Authentication.java 2008-10-30 11:06:59 UTC (rev 2671)
@@ -131,6 +131,11 @@
this.callback = callback;
}
+ public native void doLogout() /*-{
+ $wnd.location.reload();
+ }-*/;
+
+
public interface AuthCallback
{
void onLoginSuccess(Request request, Response response);
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Header.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Header.java 2008-10-30 11:03:58 UTC (rev 2670)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/Header.java 2008-10-30 11:06:59 UTC (rev 2671)
@@ -22,11 +22,17 @@
package org.jboss.bpm.console.client;
import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.Button;
+import com.gwtext.client.widgets.event.ButtonListenerAdapter;
import com.gwtext.client.widgets.layout.*;
+import com.gwtext.client.core.EventObject;
import com.google.gwt.user.client.ui.HTML;
+import com.google.gwt.user.client.ui.Image;
import java.util.List;
+import org.jboss.bpm.console.client.widgets.HelpPanel;
+
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
@@ -40,12 +46,15 @@
{
super();
this.view = view;
-
this.setId(ID);
- HorizontalLayout layout = new HorizontalLayout(20);
- this.setLayout(layout);
+ this.setFrame(false);
+ this.setBorder(false);
+ this.setHeader(false);
+ //HorizontalLayout layout = new HorizontalLayout(20);
+ //this.setLayout(layout);
+
this.setHeight(50);
this.setBaseCls("bpm-header");
}
@@ -56,9 +65,24 @@
userInfo.setBorder(false);
userInfo.setHeader(false);
userInfo.setFrame(false);
+ userInfo.setStyleName("bpm-header-userinfo");
+ HorizontalLayout layout = new HorizontalLayout(10);
+ userInfo.setLayout(layout);
- userInfo.add( new HTML("<h3>User: "+view.getUsername()+"</h3>"));
-
+ userInfo.add( new Image("images/icons/05.png") );
+ userInfo.add( new HTML(view.getUsername()));
+ userInfo.add(
+ new Button("Logout",
+ new ButtonListenerAdapter(){
+
+ public void onClick(Button button, EventObject eventObject)
+ {
+ view.logout();
+ }
+ }
+ )
+ );
+
this.clear();
this.add(userInfo);
this.doLayout();
Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-10-30 11:03:58 UTC (rev 2670)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/MainView.java 2008-10-30 11:06:59 UTC (rev 2671)
@@ -92,6 +92,7 @@
private void assembleMainApplication(Panel mainPanel)
{
Panel borderPanel = new Panel();
+ borderPanel.setBorder(false);
borderPanel.setLayout(new BorderLayout());
// ------------------------------------------
@@ -258,4 +259,9 @@
{
return auth.getUsername();
}
+
+ public void logout()
+ {
+ auth.doLogout();
+ }
}
Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-10-30 11:03:58 UTC (rev 2670)
+++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-10-30 11:06:59 UTC (rev 2671)
@@ -11,6 +11,12 @@
background-repeat:no-repeat;
}
+.bpm-header-userinfo {
+ float: right;
+ position:relative; top: 10px; right:20px;
+ font-family: sans-serif;
+}
+
.bpm-menu {
height: 50px;
width: 100%;
15 years, 6 months
- 1
- 0