JBoss JBPM SVN: r2540 - in jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src: main/java/org/jbpm/util and 4 other directories.
by do-not-reply＠jboss.org
Author: alex.guizar(a)jboss.com
Date: 2008-10-14 19:45:01 -0400 (Tue, 14 Oct 2008)
New Revision: 2540
Removed:
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/context/package.html
Modified:
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteArray.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteBlockChopper.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ArrayUtil.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ByteUtil.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ClassLoaderUtil.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/EqualsUtil.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/IoUtil.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/JndiUtil.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StaticUtil.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StringUtil.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/XmlUtil.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AbstractJbpmTestCase.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/SerializabilityTest.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayTest.java
jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java
Log:
[JBPM-1177] merged r2439:2440 https://svn.jboss.org/repos/jbpm/jbpm3/trunk
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteArray.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteArray.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteArray.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -48,7 +48,7 @@
protected String name = null;
protected List byteBlocks = null;
- private static Log log = LogFactory.getLog(ByteArray.class);
+ private static final Log log = LogFactory.getLog(ByteArray.class);
public ByteArray() {
}
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteBlockChopper.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteBlockChopper.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/bytes/ByteBlockChopper.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -22,55 +22,93 @@
package org.jbpm.bytes;
import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
import org.jbpm.JbpmConfiguration;
/**
* is used by {@link org.jbpm.bytes.ByteArray} to chop a
* byte arrays into a list of chunks and glue them back together.
*/
-public abstract class ByteBlockChopper {
+public class ByteBlockChopper {
+ private static final Log log = LogFactory.getLog(ByteBlockChopper.class);
+
+ private ByteBlockChopper() {
+ // hide default constructor to prevent instantiation
+ }
+
public static List chopItUp(byte[] byteArray) {
- int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
List bytes = null;
- if ( (byteArray!=null)
- && (byteArray.length>0) ){
- bytes = new ArrayList();
- int index = 0;
- while ( (byteArray.length-index) > blockSize ) {
- byte[] byteBlock = new byte[blockSize];
- System.arraycopy(byteArray, index, byteBlock, 0, blockSize);
- bytes.add(byteBlock);
- index+=blockSize;
+ if (byteArray != null) {
+ int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
+ int byteCount = byteArray.length;
+ if (byteCount > blockSize) {
+ log.debug("chopping " + byteCount + " bytes");
+ bytes = new ArrayList();
+ int offset;
+ for (offset = 0; byteCount - offset > blockSize; offset += blockSize) {
+ bytes.add(subArray(byteArray, offset, blockSize));
+ }
+ bytes.add(subArray(byteArray, offset, byteCount - offset));
}
- byte[] byteBlock = new byte[byteArray.length-index];
- System.arraycopy(byteArray, index, byteBlock, 0, byteArray.length-index);
- bytes.add(byteBlock);
+ else if (byteCount > 0) {
+ log.debug("no need to chop " + byteCount + " bytes");
+ bytes = Collections.singletonList(byteArray);
+ }
}
return bytes;
}
- public static byte[] glueChopsBackTogether(List bytes) {
- byte[] value = null;
+ private static byte[] subArray(byte[] array, int offset, int length) {
+ byte[] subArray = new byte[length];
+ System.arraycopy(array, offset, subArray, 0, length);
+ log.debug("chopped " + length + " bytes beggining at " + offset);
+ return subArray;
+ }
+
+ public static byte[] glueChopsBackTogether(List byteBlocks) {
+ byte[] byteArray = null;
- if (bytes!=null) {
- Iterator iter = bytes.iterator();
- while (iter.hasNext()) {
- byte[] byteBlock = (byte[]) iter.next();
- if (value==null) {
- value = byteBlock;
- } else {
- byte[] oldValue = value;
- value = new byte[value.length+byteBlock.length];
- System.arraycopy(oldValue, 0, value, 0, oldValue.length);
- System.arraycopy(byteBlock, 0, value, oldValue.length, byteBlock.length);
+ if (byteBlocks != null) {
+ int blockCount = byteBlocks.size();
+ switch (blockCount) {
+ case 0:
+ break;
+ case 1:
+ byteArray = (byte[]) byteBlocks.get(0);
+ log.debug("no need to glue " + byteArray.length + " bytes");
+ break;
+ default:
+ int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
+ byte[] lastBlock = (byte[]) byteBlocks.get(blockCount - 1);
+ int byteCount = blockSize * (blockCount - 1) + lastBlock.length;
+ log.debug("gluing " + byteCount + " bytes");
+
+ byteArray = new byte[byteCount];
+ int offset = 0;
+ for (int i = 0, n = blockCount; i < n; i++) {
+ byte[] block = (byte[]) byteBlocks.get(i);
+ int length = block.length;
+ System.arraycopy(block, 0, byteArray, offset, length);
+ log.debug("glued " + length + " bytes beggining at " + offset);
+ // JBPM-702 sybase truncates trailing zeros
+ if (length < blockSize && i < n-1) {
+ Arrays.fill(byteArray, offset + length, offset + blockSize, (byte) 0);
+ log.debug("zero filled " + (blockSize - length) + " trailing bytes");
+ offset += blockSize;
+ }
+ else {
+ offset += length;
+ }
}
}
}
-
- return value;
+ return byteArray;
}
}
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ArrayUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ArrayUtil.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ArrayUtil.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -21,8 +21,12 @@
*/
package org.jbpm.util;
-public abstract class ArrayUtil {
+public class ArrayUtil {
+ private ArrayUtil() {
+ // hide default constructor to prevent instantiation
+ }
+
public static String toString(Object[] array) {
if (array==null) {
return "null";
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ByteUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ByteUtil.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ByteUtil.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -1,7 +1,10 @@
package org.jbpm.util;
+public class ByteUtil {
-public abstract class ByteUtil {
+ private ByteUtil() {
+ // hide default constructor to prevent instantiation
+ }
public static String toString(byte[] bytes) {
if (bytes == null) return "null";
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ClassLoaderUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ClassLoaderUtil.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/ClassLoaderUtil.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -34,6 +34,10 @@
*/
public class ClassLoaderUtil {
+ private ClassLoaderUtil() {
+ // hide default constructor to prevent instantiation
+ }
+
public static Class loadClass(String className) {
try {
return getClassLoader().loadClass(className);
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/EqualsUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/EqualsUtil.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/EqualsUtil.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -21,8 +21,12 @@
*/
package org.jbpm.util;
-public abstract class EqualsUtil {
+public class EqualsUtil {
+ private EqualsUtil() {
+ // hide default constructor to prevent instantiation
+ }
+
public static boolean equals(Object thisObject, Object otherObject) {
if ( (thisObject==null) || (otherObject==null) ) return false;
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/IoUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/IoUtil.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/IoUtil.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -28,10 +28,14 @@
import org.jbpm.JbpmException;
-public abstract class IoUtil {
+public class IoUtil {
- public static final int BUFFERSIZE = 4096;
+ private IoUtil() {
+ // hide default constructor to prevent instantiation
+ }
+ private static final int BUFFERSIZE = 4096;
+
public static byte[] readBytes(InputStream inputStream) throws IOException {
byte[] bytes = null;
if (inputStream==null) {
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/JndiUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/JndiUtil.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/JndiUtil.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -27,8 +27,12 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-public abstract class JndiUtil {
-
+public class JndiUtil {
+
+ private JndiUtil() {
+ // hide default constructor to prevent instantiation
+ }
+
public static Object lookup(String jndiName, Class type) {
Object object = null;
try {
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StaticUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StaticUtil.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StaticUtil.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -26,7 +26,7 @@
import java.util.Iterator;
import java.util.Map;
-public abstract class StaticUtil {
+public class StaticUtil {
/*
public class MyClass ... {
@@ -45,7 +45,7 @@
...
}
*/
-
+
static Map initializers = Collections.synchronizedMap(new HashMap());
public abstract static class Initializer {
@@ -56,6 +56,28 @@
public abstract void init();
}
+ /*
+ public class MyClass ... {
+ static AType aStaticInMyClass = null;
+ static AnotherType anotherStaticInMyClass = null;
+
+ static {
+ new StaticUtil.Initializer(MyClass.class) {
+ public void init() {
+ // initialize static members here
+ aStaticInMyClass = ...;
+ anotherStaticInMyClass = ...;
+ }
+ };
+ }
+ ...
+ }
+ */
+
+ private StaticUtil() {
+ // hide default constructor to prevent instantiation
+ }
+
public static void add(Class clazz, Initializer initializer) {
initializers.put(clazz, initializer);
}
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StringUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StringUtil.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/StringUtil.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -10,6 +10,10 @@
static final byte[] HEX_CHAR_TABLE = { (byte) '0', (byte) '1', (byte) '2', (byte) '3', (byte) '4', (byte) '5', (byte) '6', (byte) '7', (byte) '8',
(byte) '9', (byte) 'a', (byte) 'b', (byte) 'c', (byte) 'd', (byte) 'e', (byte) 'f' };
+ private StringUtil() {
+ // hide default constructor to prevent instantiation
+ }
+
public static String toHexString(byte[] bytes) {
try {
byte[] hex = new byte[2 * bytes.length];
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/XmlUtil.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/XmlUtil.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/main/java/org/jbpm/util/XmlUtil.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -47,8 +47,12 @@
import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
-public abstract class XmlUtil {
-
+public class XmlUtil {
+
+ private XmlUtil() {
+ // hide default constructor to prevent instantiation
+ }
+
public static Document parseXmlText(String xml) {
ByteArrayInputStream bais = new ByteArrayInputStream(xml.getBytes());
return parseXmlInputSource(new InputSource(bais));
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AbstractJbpmTestCase.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AbstractJbpmTestCase.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/AbstractJbpmTestCase.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -21,18 +21,14 @@
*/
package org.jbpm;
-import java.io.Serializable;
-
import junit.framework.AssertionFailedError;
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-public class AbstractJbpmTestCase extends TestCase implements Serializable {
+public abstract class AbstractJbpmTestCase extends TestCase {
- private static final long serialVersionUID = 1L;
-
private static Log log = LogFactory.getLog(AbstractJbpmTestCase.class);
public void setUp() throws Exception {
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/SerializabilityTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/SerializabilityTest.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/SerializabilityTest.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -100,7 +100,6 @@
"org.jbpm.security.authorizer.JbpmIdentityAuthorizer",
"org.jbpm.security.authorizer.RolesAuthorizer",
"org.jbpm.security.filter.JbpmAuthenticationFilter",
- "org.jbpm.util.ClassLoaderUtil",
"org.jbpm.command.service.CommandServiceImpl",
"org.jbpm.msg.jms.JmsCommandFactory",
"org.jbpm.msg.jms.JmsMessageConstants",
@@ -145,9 +144,10 @@
private void assertSerializabilityOfClass(String className) {
Class clazz = ClassLoaderUtil.loadClass(className);
- if ( ! ( (Serializable.class.isAssignableFrom(clazz))
- || (Modifier.isAbstract(clazz.getModifiers()))
- || (isExcused(className))
+ if ( ! ( Serializable.class.isAssignableFrom(clazz)
+ || Modifier.isAbstract(clazz.getModifiers())
+ || isExcused(className)
+ || clazz.getConstructors().length == 0
)
) {
fail(className+" is NOT Serializable");
@@ -166,5 +166,4 @@
return isExcused;
}
- // private static final Log log = LogFactory.getLog(SerializabilityTest.class);
}
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayDbTest.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -75,7 +75,7 @@
assertNull(retrievedByteArray.getBytes());
}
- private byte[] getMultipleBlockBytes() {
+ private static byte[] getMultipleBlockBytes() {
String text = "muchos bytes"; // (10 bytes)
for (int i=0; i<8; i++) text+=text;
// now text should be 2560 bytes
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayTest.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayTest.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/bytes/ByteArrayTest.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -21,30 +21,36 @@
*/
package org.jbpm.bytes;
-import junit.framework.TestCase;
+import java.util.List;
-public class ByteArrayTest extends TestCase {
+import org.jbpm.AbstractJbpmTestCase;
+import org.jbpm.JbpmConfiguration;
- public void testByteChopping2Blocks() {
- ByteArray byteArray = new ByteArray(new byte[2048]);
- assertEquals(2, byteArray.byteBlocks.size());
- }
+public class ByteArrayTest extends AbstractJbpmTestCase {
- public void testByteChopping3Blocks() {
- ByteArray byteArray = new ByteArray(new byte[2049]);
- assertEquals(3, byteArray.byteBlocks.size());
+ public void testByteChoppingBlockCount() {
+ int blockSize = JbpmConfiguration.Configs.getInt("jbpm.byte.block.size");
+ for (int arrayLength = 125; arrayLength <= 1000; arrayLength *= 2) {
+ ByteArray byteArray = new ByteArray(new byte[arrayLength]);
+ int blockCount = arrayLength / blockSize;
+ if (arrayLength % blockSize > 0) blockCount++;
+ List byteBlocks = byteArray.byteBlocks;
+ assertEquals(blockCount, byteBlocks.size());
+ }
}
-
+
public void testReassembling() {
- ByteArray byteArray = new ByteArray(new byte[2049]);
- assertEquals(2049, byteArray.getBytes().length);
+ for (int arrayLength = 125; arrayLength <= 1000; arrayLength *= 2) {
+ ByteArray byteArray = new ByteArray(new byte[arrayLength]);
+ assertEquals(arrayLength, byteArray.getBytes().length);
+ }
}
-
+
public void testEquals() {
ByteArray left = new ByteArray("the same bytes".getBytes());
ByteArray right = new ByteArray("the same bytes".getBytes());
- assertTrue(left.equals(right));
- assertTrue(right.equals(left));
+ assertEquals(left, right);
+ assertEquals(right, left);
}
public void testNotEquals() {
Deleted: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/context/package.html
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/context/package.html 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/context/package.html 2008-10-14 23:45:01 UTC (rev 2540)
@@ -1,4 +0,0 @@
-<body>
-is the package that contains the context module, adding
-process variables to the graph execution.
-</body>
\ No newline at end of file
Modified: jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java
===================================================================
--- jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java 2008-10-14 12:18:37 UTC (rev 2539)
+++ jbpm3/branches/jpdl-3.2.2-SOA-4.2/jpdl/jar/src/test/java/org/jbpm/db/AbstractDbTestCase.java 2008-10-14 23:45:01 UTC (rev 2540)
@@ -38,10 +38,8 @@
import org.jbpm.logging.log.ProcessLog;
import org.jbpm.taskmgmt.exe.TaskInstance;
-public class AbstractDbTestCase extends AbstractJbpmTestCase {
+public abstract class AbstractDbTestCase extends AbstractJbpmTestCase {
- private static final long serialVersionUID = 1L;
-
protected static JbpmConfiguration jbpmConfiguration = getDbTestJbpmConfiguration();
protected JbpmContext jbpmContext = null;
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2539 - jbpm3/trunk/modules/gwt-console.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-10-14 08:18:37 -0400 (Tue, 14 Oct 2008)
New Revision: 2539
Added:
jbpm3/trunk/modules/gwt-console/License.html
Log:
Added License.html
Added: jbpm3/trunk/modules/gwt-console/License.html
===================================================================
--- jbpm3/trunk/modules/gwt-console/License.html (rev 0)
+++ jbpm3/trunk/modules/gwt-console/License.html 2008-10-14 12:18:37 UTC (rev 2539)
@@ -0,0 +1,117 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
+
+<title>jBPM GWT-Console License Information</title>
+
+<style type="text/css">
+
+p.heading {
+ font-weight: bold;
+}
+
+.licenses {
+ border-collapse: separate;
+}
+
+.licenses th {
+ text-align: left;
+ background-color: #ccccff;
+ padding: 3px;
+}
+
+.licenses td {
+ background-color: #f4f4f4;
+ padding: 3px;
+ text-align: left;
+ vertical-align: top;
+}
+
+.licenses tr.even td {
+ background-color: #eeeeee;
+}
+
+</style></head>
+
+<body>
+
+<div id="body">
+
+
+
+<h1>jBPM GWT-Console License Information</h1>
+
+<p>
+ <pre>
+ JBoss, Home of Professional Open Source.
+ Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ as indicated by the @author tags. See the copyright.txt file 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.
+ </pre>
+</p>
+
+ <a name="licenses"></a>
+<h2>LICENSE INFORMATION REGARDING RELATED THIRD-PARTY SOFTWARE</h2>
+
+<p>The jBPM GWT-Console relies on the following third party software.
+ Below is the location and license information :
+</p>
+
+<table class="licenses">
+ <tbody><tr>
+ <th>Package</th>
+ <th>License</th>
+ <th>Details</th>
+ </tr>
+
+ <tr>
+ <td class="package"><a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a></td>
+ <td class="license"><a href="http://code.google.com/webtoolkit/terms.html">Apache License v.
+2.0</a></td>
+ <td class="location"><a
+href="http://code.google.com/webtoolkit/">http://code.google.com/webtoolkit/</a></td>
+ </tr>
+ <tr>
+ <td class="package"><a href="http://www.extjs.com/">Ext 2.0</a></td>
+
+ <td class="license">Ext has <a href="http://extjs.com/license">several licensing options</a>
+available to fit a variety of needs. LGPL 3.0 is one of them.</td>
+ <td class="location"><a href="http://extjs.com/download">http://extjs.com/download</a></td>
+ </tr>
+ <tr>
+ <td class="package"><a href="http://code.google.com/p/gwt-ext/">GWT-Ext 2.0.5</a></td>
+ <td class="license"><a href="http://code.google.com/p/gwt-ext/">GNU Lesser General Public Licence (LGPL), v 3.0</a>.</td>
+
+ <td class="location"><a
+href="http://code.google.com/p/gwt-ext/">http://code.google.com/p/gwt-ext/</a></td>
+ </tr>
+ <tr>
+ <td class="package"><a href="http://gwt-widget.sourceforge.net/">GWT-Widgets</a></td>
+ <td class="license"><a href="http://gwt-widget.sourceforge.net/">Apache License v. 2.0</a>.</td>
+
+ <td class="location"><a href="http://gwt-widget.sourceforge.net/">http://gwt-widget.sourceforge.net/</a></td>
+ </tr>
+
+</tbody></table>
+
+</div>
+
+</body></html>
+
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2538 - in jbpm3/trunk/modules/gwt-console: rpc and 7 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-10-14 08:05:53 -0400 (Tue, 14 Oct 2008)
New Revision: 2538
Added:
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/DateLocale.java
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateFormat.java
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateParser.java
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/regex/
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/regex/Pattern.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DAOFactory.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DiagramDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3ProcessDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/ServiceLocator.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java
Modified:
jbpm3/trunk/modules/gwt-console/pom.xml
jbpm3/trunk/modules/gwt-console/rpc/pom.xml
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstance.java
jbpm3/trunk/modules/gwt-console/server/pom.xml
jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
Log:
Remove dependency on gwtwidgets
Modified: jbpm3/trunk/modules/gwt-console/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/pom.xml 2008-10-14 11:09:26 UTC (rev 2537)
+++ jbpm3/trunk/modules/gwt-console/pom.xml 2008-10-14 12:05:53 UTC (rev 2538)
@@ -16,8 +16,7 @@
<properties>
<gchart.version>2.2</gchart.version>
- <gwtext.version>2.0.5</gwtext.version>
- <gwt-widgets.version>0.2.0</gwt-widgets.version>
+ <gwtext.version>2.0.5</gwtext.version>
<stax-api.version>1.0-2</stax-api.version>
<jaf.version>1.1</jaf.version>
</properties>
@@ -39,13 +38,8 @@
<groupId>com.google.gwt</groupId>
<artifactId>gchart</artifactId>
<version>${gchart.version}</version>
- </dependency>
+ </dependency>
<dependency>
- <groupId>net.sf.gwt-widget</groupId>
- <artifactId>gwt-widgets</artifactId>
- <version>${gwt-widgets.version}</version>
- </dependency>
- <dependency>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
<version>${stax-api.version}</version>
Modified: jbpm3/trunk/modules/gwt-console/rpc/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/pom.xml 2008-10-14 11:09:26 UTC (rev 2537)
+++ jbpm3/trunk/modules/gwt-console/rpc/pom.xml 2008-10-14 12:05:53 UTC (rev 2538)
@@ -33,12 +33,7 @@
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>net.sf.gwt-widget</groupId>
- <artifactId>gwt-widgets</artifactId>
- <version>${gwt-widgets.version}</version>
- </dependency>
+ </dependency>
</dependencies>
<build>
Modified: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstance.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstance.java 2008-10-14 11:09:26 UTC (rev 2537)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/ProcessInstance.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -21,8 +21,9 @@
*/
package org.jboss.bpm.console.client.model;
-import org.gwtwidgets.client.util.SimpleDateFormat;
+import org.jboss.bpm.console.client.model.util.SimpleDateFormat;
+
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.util.Date;
@@ -101,7 +102,7 @@
@XmlElement(name = "start")
public String getStartDate()
{
- SimpleDateFormat df = new SimpleDateFormat("y-M-d H:m:s");
+ SimpleDateFormat df = new SimpleDateFormat("y-M-d H:mm:ss");
return df.format(startDate);
}
@@ -126,4 +127,5 @@
{
this.endDate = endDate;
}
+
}
Added: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/DateLocale.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/DateLocale.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/DateLocale.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -0,0 +1,92 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.model.util;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Date locale support for the {@link SimpleDateParser}. You are encouraged to
+ * extend this class and provide implementations for other locales.
+ * @author <a href="mailto:g.georgovassilis@gmail.com">George Georgovassilis</a>
+ *
+ */
+public class DateLocale {
+ public final static String TOKEN_DAY_OF_WEEK = "E";
+
+ public final static String TOKEN_DAY_OF_MONTH = "d";
+
+ public final static String TOKEN_MONTH = "M";
+
+ public final static String TOKEN_YEAR = "y";
+
+ public final static String TOKEN_HOUR_12 = "h";
+
+ public final static String TOKEN_HOUR_24 = "H";
+
+ public final static String TOKEN_MINUTE = "m";
+
+ public final static String TOKEN_SECOND = "s";
+
+ public final static String TOKEN_MILLISECOND = "S";
+
+ public final static String TOKEN_AM_PM = "a";
+
+ public final static String AM = "AM";
+
+ public final static String PM = "PM";
+
+ public final static List SUPPORTED_DF_TOKENS = Arrays.asList(new String[] {
+ TOKEN_DAY_OF_WEEK, TOKEN_DAY_OF_MONTH, TOKEN_MONTH, TOKEN_YEAR,
+ TOKEN_HOUR_12, TOKEN_HOUR_24, TOKEN_MINUTE, TOKEN_SECOND,
+ TOKEN_AM_PM });
+
+ public String[] MONTH_LONG = { "January", "February", "March", "April",
+ "May", "June", "July", "August", "September", "October",
+ "November", "December" };
+
+ public String[] MONTH_SHORT = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sept", "Oct", "Nov", "Dec" };
+
+ public String[] WEEKDAY_LONG = { "Sunday", "Monday", "Tuesday",
+ "Wednesday", "Thursday", "Friday", "Saturday" };
+
+ public String[] WEEKDAY_SHORT = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri",
+ "Sat" };
+
+ public static String getAM() {
+ return AM;
+ }
+
+ public static String getPM() {
+ return PM;
+ }
+
+ public String[] getWEEKDAY_LONG() {
+ return WEEKDAY_LONG;
+ }
+
+ public String[] getWEEKDAY_SHORT() {
+ return WEEKDAY_SHORT;
+ }
+
+}
Property changes on: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/DateLocale.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateFormat.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateFormat.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateFormat.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -0,0 +1,186 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.model.util;
+
+import java.util.Date;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@SuppressWarnings("deprecation")
+public class SimpleDateFormat {
+ private String format;
+ private DateLocale locale = new DateLocale();
+
+ /**
+ * Gets the support locale for formatting and parsing dates
+ * @return
+ */
+ public DateLocale getLocale() {
+ return locale;
+ }
+
+ public void setLocale(DateLocale locale) {
+ this.locale = locale;
+ }
+
+ public SimpleDateFormat(String pattern) {
+ format = pattern;
+ }
+
+ public String format(Date date) {
+ String f = "";
+ if (format != null && format.length() > 0) {
+ String lastTokenType = null;
+ String currentToken = "";
+ for (int i = 0; i < format.length(); i++) {
+ String thisChar = format.substring(i, i + 1);
+ String currentTokenType = DateLocale.SUPPORTED_DF_TOKENS
+ .contains(thisChar) ? thisChar : "";
+ if (currentTokenType.equals(lastTokenType) || i == 0) {
+ currentToken += thisChar;
+ lastTokenType = currentTokenType;
+ } else {
+ if ("".equals(lastTokenType))
+ f += currentToken;
+ else
+ f += handleToken(currentToken, date);
+ currentToken = thisChar;
+ lastTokenType = currentTokenType;
+ }
+ }
+ if ("".equals(lastTokenType))
+ f += currentToken;
+ else
+ f += handleToken(currentToken, date);
+ }
+ return f;
+ }
+
+ /**
+ * takes a date format string and returns the formatted portion of the date.
+ * For instance if the token is MMMM then the full month name is returned.
+ *
+ * @param token
+ * date format token
+ * @param date
+ * date to format
+ * @return formatted portion of the date
+ */
+ private String handleToken(String token, Date date) {
+ String response = token;
+ String tc = token.substring(0, 1);
+ if (DateLocale.TOKEN_DAY_OF_WEEK.equals(tc)) {
+ if (token.length() > 3)
+ response = locale.getWEEKDAY_LONG()[date.getDay()];
+ else
+ response = locale.getWEEKDAY_SHORT()[date.getDay()];
+ } else if (DateLocale.TOKEN_DAY_OF_MONTH.equals(tc)) {
+ if (token.length() == 1)
+ response = Integer.toString(date.getDate());
+ else
+ response = twoCharDateField(date.getDate());
+ } else if (DateLocale.TOKEN_MONTH.equals(tc)) {
+ switch (token.length()) {
+ case 1:
+ response = Integer.toString(date.getMonth() + 1);
+ break;
+ case 2:
+ response = twoCharDateField(date.getMonth() + 1);
+ break;
+ case 3:
+ response = locale.MONTH_SHORT[date.getMonth()];
+ break;
+ default:
+ response = locale.MONTH_LONG[date.getMonth()];
+ break;
+ }
+ } else if (DateLocale.TOKEN_YEAR.equals(tc)) {
+ if (token.length() > 2)
+ response = Integer.toString(date.getYear() + 1900);
+ else
+ response = twoCharDateField(date.getYear());
+ } else if (DateLocale.TOKEN_HOUR_12.equals(tc)) {
+ int h = date.getHours();
+ if (h == 0)
+ h = 12;
+ else if (h > 12)
+ h -= 12;
+ if (token.length() > 1)
+ response = twoCharDateField(h);
+ else
+ response = Integer.toString(h);
+ } else if (DateLocale.TOKEN_HOUR_24.equals(tc)) {
+ if (token.length() > 1)
+ response = twoCharDateField(date.getHours());
+ else
+ response = Integer.toString(date.getHours());
+ } else if (DateLocale.TOKEN_MINUTE.equals(tc)) {
+ if (token.length() > 1)
+ response = twoCharDateField(date.getMinutes());
+ else
+ response = Integer.toString(date.getMinutes());
+ } else if (DateLocale.TOKEN_SECOND.equals(tc)) {
+ if (token.length() > 1)
+ response = twoCharDateField(date.getSeconds());
+ else
+ response = Integer.toString(date.getSeconds());
+ } else if (DateLocale.TOKEN_AM_PM.equals(tc)) {
+ int hour = date.getHours();
+ if (hour > 11)
+ response = DateLocale.getPM();
+ else
+ response = DateLocale.getAM();
+ }
+ return response;
+ }
+
+ /**
+ * This is basically just a sneaky way to guarantee that our 1 or 2 digit
+ * numbers come out as a 2 character string. we add an arbitrary number
+ * larger than 100, convert this new number to a string, then take the right
+ * most 2 characters.
+ *
+ * @param num
+ * @return
+ */
+ private String twoCharDateField(int num) {
+ String res = Integer.toString(num + 1900);
+ res = res.substring(res.length() - 2);
+ return res;
+ }
+
+ private static Date newDate(long time) {
+ return new Date(time);
+ }
+
+ /**
+ * Parses text and returns the corresponding date object.
+ *
+ * @param source
+ * @return java.util.Date
+ */
+ public Date parse(String source){
+ return SimpleDateParser.parse(source, format);
+ };
+
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateFormat.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateParser.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateParser.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateParser.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -0,0 +1,167 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.model.util;
+
+import org.jboss.bpm.console.client.model.util.regex.Pattern;
+
+import java.util.Date;
+
+
+/**
+ * This is a simple regular expression based parser for date notations.
+ * While our aim is to fully support in the future the JDK date parser, currently
+ * only numeric notations and literals are supported such as <code>dd/MM/yyyy HH:mm:ss.SSSS</code>.
+ * Each entity is parsed with the same number of digits, i.e. for <code>dd</code> two digits will be
+ * parsed while for <code>d</code> only one will be parsed.
+ * @author <a href="mailto:g.georgovassilis@gmail.com">George Georgovassilis</a>
+ *
+ */
+
+@SuppressWarnings("deprecation")
+public class SimpleDateParser {
+
+
+ private final static String DAY_IN_MONTH = "d";
+
+ private final static String MONTH = "M";
+
+ private final static String YEAR = "y";
+
+ private final static String LITERAL = "\\";
+
+ private final static int DATE_PATTERN = 0;
+
+ private final static int REGEX_PATTERN = 1;
+
+ private final static int COMPONENT = 2;
+
+ private final static int REGEX = 0;
+
+ private final static int INSTRUCTION = 1;
+
+ private final static String[] TOKENS[] = {
+ { "SSSS", "(\\d\\d\\d\\d)",DateLocale.TOKEN_MILLISECOND },
+ { "SSS", "(\\d\\d\\d)", DateLocale.TOKEN_MILLISECOND },
+ { "SS", "(\\d\\d)", DateLocale.TOKEN_MILLISECOND },
+ { "S", "(\\d)", DateLocale.TOKEN_MILLISECOND },
+ { "ss", "(\\d\\d)", DateLocale.TOKEN_SECOND },
+ { "s", "(\\d)", DateLocale.TOKEN_SECOND },
+ { "mm", "(\\d\\d)", DateLocale.TOKEN_MINUTE },
+ { "m", "(\\d)", DateLocale.TOKEN_MINUTE},
+ { "HH", "(\\d\\d)", DateLocale.TOKEN_HOUR_24},
+ { "H", "(\\d)", DateLocale.TOKEN_HOUR_24 },
+ { "dd", "(\\d\\d)", DateLocale.TOKEN_DAY_OF_MONTH },
+ { "d", "(\\d)", DateLocale.TOKEN_DAY_OF_MONTH },
+ { "MM", "(\\d\\d)", DateLocale.TOKEN_MONTH },
+ { "M", "(\\d)", DateLocale.TOKEN_MONTH },
+ { "yyyy", "(\\d\\d\\d\\d)", DateLocale.TOKEN_YEAR },
+ { "yyy", "(\\d\\d\\d)", DateLocale.TOKEN_YEAR },
+ { "yy", "(\\d\\d)", DateLocale.TOKEN_YEAR },
+ { "y", "(\\d)", DateLocale.TOKEN_YEAR }
+ };
+
+ private Pattern regularExpression;
+
+ private String instructions = "";
+
+ private static void _parse(String format, String[] args) {
+ if (format.length() == 0)
+ return;
+ if (format.startsWith("'")){
+ format = format.substring(1);
+ int end = format.indexOf("'");
+ if (end == -1)
+ throw new IllegalArgumentException("Unmatched single quotes.");
+ args[REGEX]+=Pattern.quote(format.substring(0,end));
+ format = format.substring(end+1);
+ }
+ for (int i = 0; i < TOKENS.length; i++) {
+ String[] row = TOKENS[i];
+ String datePattern = row[DATE_PATTERN];
+ if (!format.startsWith(datePattern))
+ continue;
+ format = format.substring(datePattern.length());
+ args[REGEX] += row[REGEX_PATTERN];
+ args[INSTRUCTION] += row[COMPONENT];
+ _parse(format, args);
+ return;
+ }
+ args[REGEX] += Pattern.quote(""+format.charAt(0));
+ format = format.substring(1);
+ _parse(format, args);
+ }
+
+ private static void load(Date date, String text, String component) {
+ if (component.equals(DateLocale.TOKEN_MILLISECOND)) {
+ //TODO: implement
+ }
+
+ if (component.equals(DateLocale.TOKEN_SECOND)) {
+ date.setSeconds(Integer.parseInt(text));
+ }
+
+ if (component.equals(DateLocale.TOKEN_MINUTE)) {
+ date.setMinutes(Integer.parseInt(text));
+ }
+
+ if (component.equals(DateLocale.TOKEN_HOUR_24)) {
+ date.setHours(Integer.parseInt(text));
+ }
+
+ if (component.equals(DateLocale.TOKEN_DAY_OF_MONTH)) {
+ date.setDate(Integer.parseInt(text));
+ }
+ if (component.equals(DateLocale.TOKEN_MONTH)) {
+ date.setMonth(Integer.parseInt(text)-1);
+ }
+ if (component.equals(DateLocale.TOKEN_YEAR)) {
+ //TODO: fix for short patterns
+ date.setYear(Integer.parseInt(text)-1900);
+ }
+
+ }
+
+ public SimpleDateParser(String format) {
+ String[] args = new String[] { "", "" };
+ _parse(format, args);
+ regularExpression = new Pattern(args[REGEX]);
+ instructions = args[INSTRUCTION];
+ }
+
+ public Date parse(String input) {
+ Date date = new Date(0, 0, 1, 0, 0, 0);
+ String matches[] = regularExpression.match(input);
+ if (matches == null)
+ throw new IllegalArgumentException(input+" does not match "+regularExpression.pattern());
+ if (matches.length-1!=instructions.length())
+ throw new IllegalArgumentException("Different group count - "+input+" does not match "+regularExpression.pattern());
+ for (int group = 0; group < instructions.length(); group++) {
+ String match = matches[group + 1];
+ load(date, match, ""+instructions.charAt(group));
+ }
+ return date;
+ }
+
+ public static Date parse(String input, String pattern){
+ return new SimpleDateParser(pattern).parse(input);
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/SimpleDateParser.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/regex/Pattern.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/regex/Pattern.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/regex/Pattern.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -0,0 +1,186 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.model.util.regex;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.google.gwt.core.client.JavaScriptObject;
+
+/**
+ * <p>
+ * Implementation of the {@link java.util.regex.Pattern} class with a
+ * wrapper aroung the Javascript <a href="http://developer.mozilla.org/en/docs/Core_JavaScript_1.5_Guide:Regular_Ex...">RegExp</a> object.
+ * As most of the methods delegate to the JavaScript RegExp object, certain differences in the
+ * declaration and behaviour of regular expressions must be expected.
+ * </p>
+ * <p>
+ * Please note that neither the {@link java.util.regex.Pattern#compile(String)} method nor
+ * {@link Matcher} instances are supported. For the later, consider using {@link Pattern#match(String)}.
+ * </p>
+ *
+ * @author George Georgovassilis
+ *
+ */
+public class Pattern {
+
+ /**
+ * Declares that regular expressions should be matched across line borders.
+ */
+ public final static int MULTILINE = 1;
+
+ /**
+ * Declares that characters are matched reglardless of case.
+ */
+ public final static int CASE_INSENSITIVE = 2;
+
+ private JavaScriptObject regExp;
+
+ private static JavaScriptObject createExpression(String pattern, int flags) {
+ String sFlags = "";
+ if ((flags & MULTILINE) != 0)
+ sFlags += "m";
+ if ((flags & CASE_INSENSITIVE) != 0)
+ sFlags += "i";
+ return _createExpression(pattern, sFlags);
+ }
+
+ private static native JavaScriptObject _createExpression(String pattern,
+ String flags)/*-{
+ return new RegExp(pattern, flags);
+ }-*/;
+
+ private native void _match(String text, List matches)/*-{
+ var regExp = this.@org.jboss.bpm.console.client.model.util.regex.Pattern::regExp;
+ var result = text.match(regExp);
+ if (result == null) return;
+ for (var i=0;i<result.length;i++)
+ matches.@java.util.ArrayList::add(Ljava/lang/Object;)(result[i]);
+ }-*/;
+
+ /**
+ * Determines wether the specified regular expression is validated by the
+ * provided input.
+ * @param regex Regular expression
+ * @param input String to validate
+ * @return <code>true</code> if matched.
+ */
+ public static boolean matches(String regex, String input) {
+ return new Pattern(regex).matches(input);
+ }
+
+ /**
+ * Escape a provided string so that it will be interpreted as a literal
+ * in regular expressions.
+ * The current implementation does escape each character even if not neccessary,
+ * generating verbose literals.
+ * @param input
+ * @return
+ */
+ public static String quote(String input) {
+ String output = "";
+ for (int i = 0; i < input.length(); i++) {
+ output += "\\" + input.charAt(i);
+ }
+ return output;
+ }
+
+ /**
+ * Class constructor
+ * @param pattern Regular expression
+ */
+ public Pattern(String pattern) {
+ this(pattern, 0);
+ }
+
+ /**
+ * Class constructor
+ * @param pattern Regular expression
+ * @param flags
+ */
+ public Pattern(String pattern, int flags) {
+ regExp = createExpression(pattern, flags);
+ }
+
+ /**
+ * This method is borrowed from the JavaScript RegExp object.
+ * It parses a string and returns as an array any assignments to parenthesis groups
+ * in the pattern's regular expression
+ * @param text
+ * @return Array of strings following java's Pattern convention for groups:
+ * Group 0 is the entire input string and the remaining groups are the matched parenthesis.
+ * In case nothing was matched an empty array is returned.
+ */
+ public String[] match(String text) {
+ List matches = new ArrayList();
+ _match(text, matches);
+ String arr[] = new String[matches.size()];
+ for (int i = 0; i < matches.size(); i++)
+ arr[i] = matches.get(i).toString();
+ return arr;
+ }
+
+ /**
+ * Determines wether a provided text matches the regular expression
+ * @param text
+ * @return
+ */
+ public native boolean matches(String text)/*-{
+ var regExp = this.@org.jboss.bpm.console.client.model.util.regex.Pattern::regExp;
+ return regExp.test(text);
+ }-*/;
+
+ /**
+ * Returns the regular expression for this pattern
+ * @return
+ */
+ public native String pattern()/*-{
+ var regExp = this.@org.jboss.bpm.console.client.model.util.regex.Pattern::regExp;
+ return regExp.source;
+ }-*/;
+
+ private native void _split(String input, List results)/*-{
+ var regExp = this.@org.jboss.bpm.console.client.model.util.regex.Pattern::regExp;
+ var parts = input.split(regExp);
+ for (var i=0;i<parts.length;i++)
+ results.@java.util.ArrayList::add(Ljava/lang/Object;)(parts[i] );
+ }-*/;
+
+ /**
+ * Split an input string by the pattern's regular expression
+ * @param input
+ * @return Array of strings
+ */
+ public String[] split(String input){
+ List results = new ArrayList();
+ _split(input, results);
+ String[] parts = new String[results.size()];
+ for (int i=0;i<results.size();i++)
+ parts[i] = (String)results.get(i);
+ return parts;
+ }
+
+ public String toString() {
+ return regExp.toString();
+ }
+}
+
Property changes on: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/util/regex/Pattern.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/server/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/pom.xml 2008-10-14 11:09:26 UTC (rev 2537)
+++ jbpm3/trunk/modules/gwt-console/server/pom.xml 2008-10-14 12:05:53 UTC (rev 2538)
@@ -19,13 +19,25 @@
<dependencies>
<dependency>
+ <groupId>javax.ejb</groupId>
+ <artifactId>ejb-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-enterprise-beans</artifactId>
+ <scope>provided</scope>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
<artifactId>gwt-console-rpc</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-core</artifactId>
+ <scope>provided</scope>
<version>${version}</version>
</dependency>
<dependency>
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DAOFactory.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DAOFactory.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DAOFactory.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao.internal;
+
+import org.jboss.bpm.console.server.dao.DAOFactory;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
+import org.jboss.bpm.console.server.dao.DiagramDAO;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class JBPM3DAOFactory extends DAOFactory
+{
+
+ public ProcessDAO createProcessDAO()
+ {
+ return new JBPM3ProcessDAO();
+ }
+
+ public DiagramDAO createDiagramDAO()
+ {
+ return new JBPM3DiagramDAO();
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DAOFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DiagramDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DiagramDAO.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DiagramDAO.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao.internal;
+
+import org.jboss.bpm.console.server.dao.DiagramDAO;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class JBPM3DiagramDAO implements DiagramDAO
+{
+
+ public byte[] getProcessImage(long processId)
+ {
+ return new byte[0];
+ }
+
+ public DiagramInfo getDiagramInfo(long processId)
+ {
+ return null;
+ }
+
+ public ActiveNodeInfo getActivNodeInfo(ProcessDAO processDAO, long instanceId)
+ {
+ return null;
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3DiagramDAO.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3ProcessDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3ProcessDAO.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3ProcessDAO.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -0,0 +1,130 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao.internal;
+
+import org.jboss.bpm.console.client.model.ProcessDefinition;
+import org.jboss.bpm.console.client.model.ProcessInstance;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
+import org.jbpm.ejb.LocalCommandService;
+import org.jbpm.ejb.LocalCommandServiceHome;
+import org.jbpm.command.GetProcessDefinitionsCommand;
+import org.jbpm.command.GetProcessDefinitionCommand;
+import org.jbpm.command.GetProcessInstanceCommand;
+import org.jbpm.command.GetProcessInstancesCommand;
+
+import javax.ejb.CreateException;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class JBPM3ProcessDAO implements ProcessDAO
+{
+ private LocalCommandService facade;
+
+ public JBPM3ProcessDAO()
+ {
+ try
+ {
+ LocalCommandServiceHome home = (LocalCommandServiceHome)
+ ServiceLocator.getEjbLocalHome("java:ejb/CommandServiceBean");
+ this.facade = home.create();
+ }
+ catch (CreateException e)
+ {
+ throw new RuntimeException("Failed to create LocalCommandService", e);
+ }
+ }
+
+ public List<ProcessDefinition> getAllDefinitions()
+ {
+ List<org.jbpm.graph.def.ProcessDefinition> defs = (List<org.jbpm.graph.def.ProcessDefinition>)
+ facade.execute( new GetProcessDefinitionsCommand() );
+
+ List<ProcessDefinition> results = new ArrayList<ProcessDefinition>(defs.size());
+ for(org.jbpm.graph.def.ProcessDefinition p0 : defs)
+ {
+ results.add( Transform.processDefinition(p0) );
+ }
+ return results;
+ }
+
+ public ProcessDefinition getDefinitionById(long processId)
+ {
+ List<ProcessDefinition> defs = getAllDefinitions();
+ ProcessDefinition parent = null;
+ for(ProcessDefinition p : defs)
+ {
+ if(processId == p.getProcessId())
+ {
+ parent = p;
+ break;
+ }
+ }
+
+ if(null==parent)
+ throw new IllegalArgumentException("No process definition with ID " + processId);
+
+ GetProcessDefinitionCommand command = new GetProcessDefinitionCommand();
+ command.setName(parent.getName());
+
+ org.jbpm.graph.def.ProcessDefinition p0 = (org.jbpm.graph.def.ProcessDefinition)
+ facade.execute(command);
+ return Transform.processDefinition(p0);
+ }
+
+ public List<ProcessDefinition> removeDefinition(long processId)
+ {
+ throw new RuntimeException("Not implemented");
+ }
+
+ public List<ProcessInstance> getInstancesByProcessId(long processId)
+ {
+ ProcessDefinition parent = getDefinitionById(processId);
+ GetProcessInstancesCommand command = new GetProcessInstancesCommand();
+ command.setProcessName(parent.getName());
+
+ List<org.jbpm.graph.exe.ProcessInstance> instances =
+ (List<org.jbpm.graph.exe.ProcessInstance>) facade.execute(command);
+
+ List<ProcessInstance> results = new ArrayList<ProcessInstance>(instances.size());
+ for(org.jbpm.graph.exe.ProcessInstance i0 : instances)
+ {
+ results.add( Transform.processInstance(i0) );
+ }
+ return results;
+ }
+
+ public ProcessInstance getInstanceById(long instanceId)
+ {
+ org.jbpm.graph.exe.ProcessInstance instance = (org.jbpm.graph.exe.ProcessInstance)
+ facade.execute( new GetProcessInstanceCommand(instanceId));
+
+ return Transform.processInstance(instance);
+ }
+
+ public List<ProcessInstance> removeInstance(long instanceId)
+ {
+ throw new RuntimeException("Not implemented");
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/JBPM3ProcessDAO.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/ServiceLocator.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/ServiceLocator.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/ServiceLocator.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -0,0 +1,49 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao.internal;
+
+import javax.ejb.EJBLocalHome;
+import javax.naming.Context;
+import javax.naming.InitialContext;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ServiceLocator
+{
+ public static EJBLocalHome getEjbLocalHome(String localHomeJndiName)
+ {
+ EJBLocalHome localHome = null;
+ try
+ {
+ Context ctx = new InitialContext();
+ localHome = (EJBLocalHome) ctx.lookup(localHomeJndiName);
+ }
+ catch (Exception cce)
+ {
+ throw new RuntimeException("Failed load access EJB: " +localHomeJndiName, cce);
+ }
+
+ return localHome;
+ }
+
+}
\ No newline at end of file
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/ServiceLocator.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java 2008-10-14 12:05:53 UTC (rev 2538)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao.internal;
+
+import org.jboss.bpm.console.client.model.ProcessDefinition;
+import org.jboss.bpm.console.client.model.ProcessInstance;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class Transform
+{
+ public static ProcessDefinition processDefinition(org.jbpm.graph.def.ProcessDefinition p0)
+ {
+ return new ProcessDefinition(p0.getId(), p0.getName(), String.valueOf(p0.getVersion()));
+ }
+
+ public static ProcessInstance processInstance(org.jbpm.graph.exe.ProcessInstance i0)
+ {
+ // TODO: status?
+ return new ProcessInstance(i0.getId(), i0.getProcessDefinition().getId(), "Unknown", i0.getStart(), i0.getEnd());
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml 2008-10-14 11:09:26 UTC (rev 2537)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml 2008-10-14 12:05:53 UTC (rev 2538)
@@ -17,7 +17,7 @@
<context-param>
<param-name>org.jboss.bpm.console.server.dao.DAOFactory</param-name>
- <param-value>org.jboss.bpm.console.server.dao.internal.MockDAOFactory</param-value>
+ <param-value>org.jboss.bpm.console.server.dao.internal.JBPM3DAOFactory</param-value>
</context-param>
<filter>
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2008-10-14 11:09:26 UTC (rev 2537)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/Application.gwt.xml 2008-10-14 12:05:53 UTC (rev 2538)
@@ -5,8 +5,6 @@
<inherits name='com.google.gwt.json.JSON'/>
<inherits name='com.gwtext.GwtExt' />
<inherits name='com.googlecode.gchart.GChart'/>
- <inherits name='org.gwtwidgets.WidgetLibrary'/>
-
<!-- Specify the app entry point class. -->
<entry-point class='org.jboss.bpm.console.client.Application' />
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2537 - in jbpm3/trunk/modules/core/src/test: resources/org/jbpm/jcr and 1 other directory.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-10-14 07:09:26 -0400 (Tue, 14 Oct 2008)
New Revision: 2537
Modified:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/jcr/JcrDbTest.java
jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jcr/jbpm.jcr.cfg.xml
Log:
[JBPM-1720] avoid duplicate creation of JbpmConfiguration (and hence the session factory)
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/jcr/JcrDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/jcr/JcrDbTest.java 2008-10-14 10:17:31 UTC (rev 2536)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/jcr/JcrDbTest.java 2008-10-14 11:09:26 UTC (rev 2537)
@@ -39,10 +39,9 @@
public class JcrDbTest extends AbstractDbTestCase
{
- @Override
- protected JbpmConfiguration getJbpmConfiguration()
+ protected String getJbpmTestConfig()
{
- return JbpmConfiguration.parseResource("org/jbpm/jcr/jbpm.jcr.cfg.xml");
+ return "org/jbpm/jcr/jbpm.jcr.cfg.xml";
}
public void testJcrNodeStorageAndRetrieval() throws Exception
@@ -68,8 +67,10 @@
public void deployDocumentApprovalProcess()
{
- ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition name='document approval'>" + " <start-state name='start' />"
- + "</process-definition>");
+ ProcessDefinition processDefinition = ProcessDefinition.parseXmlString(
+ "<process-definition name='document approval'>" +
+ " <start-state name='start' />" +
+ "</process-definition>");
jbpmContext.deployProcessDefinition(processDefinition);
}
}
Modified: jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jcr/jbpm.jcr.cfg.xml
===================================================================
--- jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jcr/jbpm.jcr.cfg.xml 2008-10-14 10:17:31 UTC (rev 2536)
+++ jbpm3/trunk/modules/core/src/test/resources/org/jbpm/jcr/jbpm.jcr.cfg.xml 2008-10-14 11:09:26 UTC (rev 2537)
@@ -12,7 +12,7 @@
<factory>
<bean class='org.jbpm.jcr.jackrabbit.JackrabbitJcrServiceFactory'>
<field name='configuration'><string value='jcr.jackrabbit.xml' /></field>
- <field name='directory'><string value='build/repository' /></field>
+ <field name='directory'><string value='target/repository' /></field>
<field name='username'><string value='username' /></field>
<field name='password'><string value='pwd' /></field>
</bean>
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2536 - jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-10-14 06:17:31 -0400 (Tue, 14 Oct 2008)
New Revision: 2536
Modified:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/ProcessStateDbTest.java
Log:
[JBPM-1735] Cleanup ProcessStateDbTest
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/ProcessStateDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/ProcessStateDbTest.java 2008-10-14 09:49:31 UTC (rev 2535)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/graph/node/ProcessStateDbTest.java 2008-10-14 10:17:31 UTC (rev 2536)
@@ -367,6 +367,8 @@
finally
{
newTransaction();
+ graphSession.deleteProcessInstance(superProcessInstance.getId());
+ newTransaction();
graphSession.deleteProcessDefinition(subProcessDefinition.getId());
graphSession.deleteProcessDefinition(superProcessDefinition.getId());
}
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2535 - jbpm3/trunk/modules/core/src/test/java/org/jbpm/db.
by do-not-reply＠jboss.org
Author: tom.baeyens(a)jboss.com
Date: 2008-10-14 05:49:31 -0400 (Tue, 14 Oct 2008)
New Revision: 2535
Modified:
jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java
Log:
[JBPM-1739] Cleanup GraphSessionDbTest
Modified: jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java
===================================================================
--- jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java 2008-10-14 09:30:22 UTC (rev 2534)
+++ jbpm3/trunk/modules/core/src/test/java/org/jbpm/db/GraphSessionDbTest.java 2008-10-14 09:49:31 UTC (rev 2535)
@@ -34,41 +34,30 @@
public void testProcessDefinitionSaveAndLoad()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// create a process definition
ProcessDefinition processDefinition = new ProcessDefinition("auction");
// save it in the database
graphSession.saveProcessDefinition(processDefinition);
try
{
+ // get the assigned id
+ long processDefinitionId = processDefinition.getId();
+ // start a new transaction
+ newTransaction();
+ // load the process definition by the id
+ processDefinition = graphSession.loadProcessDefinition(processDefinitionId);
+ // check the result
+ assertEquals("auction", processDefinition.getName());
}
finally
{
+ // cleanup
jbpmContext.getGraphSession().deleteProcessDefinition(processDefinition.getId());
}
- // get the assigned id
- long processDefinitionId = processDefinition.getId();
- // start a new transaction
- newTransaction();
- // load the process definition by the id
- processDefinition = graphSession.loadProcessDefinition(processDefinitionId);
- // check the result
- assertEquals("auction", processDefinition.getName());
}
public void testFindProcessDefinitionByNameAndVersion()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// put 3 process definitions in the database with the same name, but different versions
ProcessDefinition processDefinitionOne = new ProcessDefinition("auction");
processDefinitionOne.setVersion(1);
@@ -88,20 +77,24 @@
newTransaction();
// load the process definition by the id
- processDefinitionThree = graphSession.findProcessDefinition("auction", 2);
- assertEquals(secondVersionProcessDefinitionId, processDefinitionThree.getId());
- assertEquals("auction", processDefinitionThree.getName());
- assertEquals(2, processDefinitionThree.getVersion());
+ processDefinitionTwo = graphSession.findProcessDefinition("auction", 2);
+ assertEquals(secondVersionProcessDefinitionId, processDefinitionTwo.getId());
+ assertEquals("auction", processDefinitionTwo.getName());
+ assertEquals(2, processDefinitionTwo.getVersion());
+
+ // start a new transaction
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(processDefinitionOne.getId());
+ newTransaction();
+ graphSession.deleteProcessDefinition(processDefinitionTwo.getId());
+ newTransaction();
+ graphSession.deleteProcessDefinition(processDefinitionThree.getId());
}
public void testFindLatestProcessDefinition() throws Exception
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// put 3 process definitions in the database with the same name, but different versions
ProcessDefinition processDefinition = new ProcessDefinition("auction");
processDefinition.setVersion(1);
@@ -123,16 +116,22 @@
assertEquals(lastVersionProcessDefinitionId, processDefinition.getId());
assertEquals("auction", processDefinition.getName());
assertEquals(3, processDefinition.getVersion());
+
+ newTransaction();
+
+ // cleanup
+ processDefinition = graphSession.findProcessDefinition("auction", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 3);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testFindAllProcessDefinitions() throws Exception
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// put 3 process definitions in the database with the same name, but different versions
ProcessDefinition processDefinition = new ProcessDefinition("auction");
processDefinition.setVersion(1);
@@ -168,16 +167,28 @@
assertEquals("bake cake", ((ProcessDefinition)allProcessDefinitions.get(3)).getName());
assertEquals(1, ((ProcessDefinition)allProcessDefinitions.get(4)).getVersion());
assertEquals("bake cake", ((ProcessDefinition)allProcessDefinitions.get(4)).getName());
+
+ newTransaction();
+
+ // cleanup
+ processDefinition = graphSession.findProcessDefinition("auction", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 3);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("bake cake", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("bake cake", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testFindAllProcessDefinitionVersions() throws Exception
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
// put 3 process definitions in the database with the same name, but different versions
ProcessDefinition processDefinition = new ProcessDefinition("auction");
processDefinition.setVersion(1);
@@ -216,27 +227,38 @@
assertEquals("bake cake", ((ProcessDefinition)allProcessDefinitionVersions.get(0)).getName());
assertEquals(1, ((ProcessDefinition)allProcessDefinitionVersions.get(1)).getVersion());
assertEquals("bake cake", ((ProcessDefinition)allProcessDefinitionVersions.get(1)).getName());
+
+ newTransaction();
+
+ // cleanup
+ processDefinition = graphSession.findProcessDefinition("auction", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("auction", 3);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("bake cake", 1);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
+
+ processDefinition = graphSession.findProcessDefinition("bake cake", 2);
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testSaveAndLoadProcessInstance()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
+ ProcessInstance processInstance = new ProcessInstance();
+ processInstance = saveAndReload(processInstance);
+ assertNotNull(processInstance);
- assertNotNull(saveAndReload(new ProcessInstance()));
+ // cleanup
+ session.delete(processInstance);
}
public void testUpdateProcessInstance()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='s' />" + " <node name='n' />"
+ "</process-definition>");
@@ -253,16 +275,15 @@
processInstance = saveAndReload(processInstance);
assertEquals("n", processInstance.getRootToken().getNode().getName());
assertEquals(pid, processInstance.getId());
+
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testFindProcessInstancesByProcessDefinition()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='s' />" + " <node name='n' />"
+ "</process-definition>");
@@ -287,16 +308,15 @@
assertTrue(previousStart >= processStart);
previousStart = processStart;
}
+
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testDeleteProcessInstance()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='s' />" + " <node name='n' />"
+ "</process-definition>");
graphSession.saveProcessDefinition(processDefinition);
@@ -310,16 +330,15 @@
newTransaction();
assertEquals(0, graphSession.findProcessInstances(processDefinition.getId()).size());
+
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testDeleteProcessInstanceWithVariables()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='start'>" + " <transition to='fork' />"
+ " </start-state>" + " <fork name='fork'>" + " <transition name='a' to='a' />" + " <transition name='b' to='b' />" + " </fork>"
+ " <state name='a' />" + " <state name='b' />" + "</process-definition>");
@@ -344,16 +363,13 @@
List processInstances = graphSession.findProcessInstances(processDefinition.getId());
assertEquals(0, processInstances.size());
+
+ newTransaction();
+ graphSession.deleteProcessDefinition(processDefinition.getId());
}
public void testDeleteProcessDefinition()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition processDefinition = ProcessDefinition.parseXmlString("<process-definition>" + " <start-state name='s' />" + " <node name='n' />"
+ "</process-definition>");
graphSession.saveProcessDefinition(processDefinition);
@@ -374,12 +390,6 @@
public void testLatestProcessDefinitions()
{
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
ProcessDefinition websale = new ProcessDefinition("websale");
jbpmContext.deployProcessDefinition(websale);
jbpmContext.deployProcessDefinition(websale);
@@ -395,18 +405,12 @@
assertEquals(2, latestProcessDefinitions.size());
assertEquals(3, getVersionOfProcess("websale", latestProcessDefinitions));
assertEquals(2, getVersionOfProcess("change nappy", latestProcessDefinitions));
- }
- public void testCalculateAverageTimeByNode()
- {
- if (true)
- {
- System.out.println("FIXME [JBPM-1739]: Cleanup GraphSessionDbTest");
- return;
- }
-
- List foo = graphSession.calculateAverageTimeByNode(1L, 3000L);
- // System.out.println("Foo has " + foo.size() + " members");
+ newTransaction();
+
+ // cleanup
+ graphSession.deleteProcessDefinition(websale.getId());
+ graphSession.deleteProcessDefinition(changeNappy.getId());
}
private int getVersionOfProcess(String name, List latestProcessDefinitions)
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2534 - in jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server: dao and 1 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-10-14 05:30:22 -0400 (Tue, 14 Oct 2008)
New Revision: 2534
Added:
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DiagramDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/DiagramInfoParser.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDiagramDAO.java
Removed:
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/
Modified:
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java
Log:
Package restructuring
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2008-10-14 09:17:32 UTC (rev 2533)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2008-10-14 09:30:22 UTC (rev 2534)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.console.server;
-import org.jboss.bpm.console.server.jbpm3.JBPM3Management;
+import org.jboss.bpm.console.server.JBPM3Management;
import javax.ws.rs.core.Application;
import java.util.HashSet;
Copied: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java (from rev 2533, jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java)
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java 2008-10-14 09:30:22 UTC (rev 2534)
@@ -0,0 +1,114 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server;
+
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.server.dao.DAOFactory;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
+import org.jboss.bpm.console.server.dao.DiagramDAO;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@Path("jbpm3")
+public class JBPM3Management
+{
+ private DiagramDAO diagramDAO = null;
+ private ProcessDAO processDAO = null;
+
+ private ProcessDAO getProcessDAO(HttpServletRequest request)
+ {
+ if(null==this.processDAO)
+ {
+ DAOFactory factory = DAOFactory.newInstance(request.getSession().getServletContext());
+ this.processDAO = factory.createProcessDAO();
+ }
+
+ return this.processDAO;
+
+ }
+
+ private DiagramDAO getDiagramDAO(HttpServletRequest request)
+ {
+ if(null==this.diagramDAO)
+ {
+ DAOFactory factory = DAOFactory.newInstance(request.getSession().getServletContext());
+ this.diagramDAO = factory.createDiagramDAO();
+ }
+
+ return this.diagramDAO;
+
+ }
+
+ @GET
+ @Path("definitions/{id}/image")
+ @Produces("image/jpeg")
+ public Response getProcessImage(
+ @PathParam("id")
+ long id,
+ @Context
+ HttpServletRequest request
+ )
+ {
+ byte[] image = getDiagramDAO(request).getProcessImage(id);
+ if(null==image)
+ return Response.serverError().build();
+ else
+ return Response.ok(image).type("image/jpeg").build();
+ }
+
+ @GET
+ @Path("definitions/{id}/diagramInfo")
+ @Produces("application/json")
+ public DiagramInfo getDiagramInfo(
+ @PathParam("id")
+ long id,
+ @Context
+ HttpServletRequest request
+ )
+ {
+ return getDiagramDAO(request).getDiagramInfo(id);
+ }
+
+ @GET
+ @Path("instances/{id}/activeNodeInfo")
+ @Produces("application/json")
+ public ActiveNodeInfo getActiveNodeInfo(
+ @PathParam("id")
+ long id,
+ @Context
+ HttpServletRequest request
+ )
+ {
+ return getDiagramDAO(request).getActivNodeInfo(getProcessDAO(request), id);
+ }
+
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/JBPM3Management.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java 2008-10-14 09:17:32 UTC (rev 2533)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java 2008-10-14 09:30:22 UTC (rev 2534)
@@ -21,7 +21,7 @@
*/
package org.jboss.bpm.console.server.dao;
-import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
+import org.jboss.bpm.console.server.dao.DiagramDAO;
import javax.servlet.ServletContext;
Copied: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DiagramDAO.java (from rev 2533, jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java)
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DiagramDAO.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DiagramDAO.java 2008-10-14 09:30:22 UTC (rev 2534)
@@ -0,0 +1,38 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao;
+
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface DiagramDAO
+{
+ byte[] getProcessImage(long processId);
+
+ DiagramInfo getDiagramInfo(long processId);
+
+ ActiveNodeInfo getActivNodeInfo(ProcessDAO processDAO, long instanceId);
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DiagramDAO.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/DiagramInfoParser.java (from rev 2533, jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java)
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/DiagramInfoParser.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/DiagramInfoParser.java 2008-10-14 09:30:22 UTC (rev 2534)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao.internal;
+
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramNodeInfo;
+import org.jbpm.util.XmlUtil;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+class DiagramInfoParser
+{
+ /**
+ * Will close the stream after successfull read
+ * @param in
+ * @return
+ */
+ public static DiagramInfo parse(InputStream in )
+ {
+ Document document = XmlUtil.parseXmlInputStream(in);
+ Element processDiagramElement = document.getDocumentElement();
+ final String widthString = processDiagramElement.getAttribute("width");
+ final String heightString = processDiagramElement.getAttribute("height");
+ final List<DiagramNodeInfo> diagramNodeInfoList = new ArrayList<DiagramNodeInfo>();
+ final NodeList nodeNodeList = processDiagramElement.getElementsByTagName("node");
+ final int nodeNodeListLength = nodeNodeList.getLength();
+ for (int i = 0; i < nodeNodeListLength; i ++) {
+ final Node nodeNode = nodeNodeList.item(i);
+ if (nodeNode instanceof Node && nodeNode.getParentNode() == processDiagramElement) {
+ final Element nodeElement = (Element) nodeNode;
+ final String nodeName = nodeElement.getAttribute("name");
+ final String nodeXString = nodeElement.getAttribute("x");
+ final String nodeYString = nodeElement.getAttribute("y");
+ final String nodeWidthString = nodeElement.getAttribute("width");
+ final String nodeHeightString = nodeElement.getAttribute("height");
+ final DiagramNodeInfo nodeInfo = new DiagramNodeInfo(
+ nodeName,
+ Integer.parseInt(nodeXString),
+ Integer.parseInt(nodeYString),
+ Integer.parseInt(nodeWidthString),
+ Integer.parseInt(nodeHeightString)
+ );
+ diagramNodeInfoList.add(nodeInfo);
+ }
+ }
+ DiagramInfo diagramInfo = new DiagramInfo(
+ Integer.parseInt(heightString),
+ Integer.parseInt(widthString),
+ diagramNodeInfoList
+ );
+
+ try
+ {
+ in.close();
+ } catch (IOException e)
+ {
+ throw new RuntimeException("Failed to close stream", e);
+ }
+
+ return diagramInfo;
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/DiagramInfoParser.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java 2008-10-14 09:17:32 UTC (rev 2533)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java 2008-10-14 09:30:22 UTC (rev 2534)
@@ -23,8 +23,8 @@
import org.jboss.bpm.console.server.dao.DAOFactory;
import org.jboss.bpm.console.server.dao.ProcessDAO;
-import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
-import org.jboss.bpm.console.server.jbpm3.dao.internal.MockDiagramDAO;
+import org.jboss.bpm.console.server.dao.DiagramDAO;
+import org.jboss.bpm.console.server.dao.internal.MockDiagramDAO;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Copied: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDiagramDAO.java (from rev 2533, jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java)
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDiagramDAO.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDiagramDAO.java 2008-10-14 09:30:22 UTC (rev 2534)
@@ -0,0 +1,97 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao.internal;
+
+import org.jboss.bpm.console.client.model.ProcessInstance;
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramNodeInfo;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
+import org.jboss.bpm.console.server.dao.DiagramDAO;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class MockDiagramDAO implements DiagramDAO
+{
+
+ public byte[] getProcessImage(long processId)
+ {
+ byte[] imageBytes = null;
+
+ try
+ {
+ InputStream in = MockDiagramDAO.class.getResourceAsStream("1.jpg");
+ if(null==in)
+ throw new IllegalArgumentException("Failed to load image resource");
+ imageBytes = new byte[in.available()];
+ in.read(imageBytes);
+
+ } catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+
+ return imageBytes;
+ }
+
+ public DiagramInfo getDiagramInfo(long processId)
+ {
+ InputStream in = MockDiagramDAO.class.getResourceAsStream("gpd.xml");
+ if(null==in)
+ throw new IllegalArgumentException("Failed to load diagram info");
+
+ return DiagramInfoParser.parse(in);
+ }
+
+ public ActiveNodeInfo getActivNodeInfo(ProcessDAO processDAO, long instanceId)
+ {
+
+ ProcessInstance pi = processDAO.getInstanceById(instanceId);
+ DiagramInfo diagram = getDiagramInfo(pi.getParentId());
+ List<DiagramNodeInfo> nodes = diagram.getNodeList();
+
+ DiagramNodeInfo activeNode = null;
+ int i = 0;
+ for(DiagramNodeInfo n : nodes)
+ {
+ // TODO: Fake. Actually this should retrieve the active node
+ if(i==1)
+ {
+ activeNode = n;
+ break;
+ }
+
+ i++;
+
+ }
+
+ if(null==activeNode)
+ throw new RuntimeException("Failed to retrieve active node for instanceId " + instanceId);
+
+ return new ActiveNodeInfo(diagram.getWidth(), diagram.getHeight(), activeNode);
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDiagramDAO.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2533 - in jbpm3/trunk/modules/gwt-console/server/src/main: java/org/jboss/bpm/console/server/dao and 5 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-10-14 05:17:32 -0400 (Tue, 14 Oct 2008)
New Revision: 2533
Added:
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java
Removed:
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
Modified:
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/BufferedResponseWrapper.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/UserManagement.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml
Log:
Load DAOFactory from servlet init parameter
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/BufferedResponseWrapper.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/BufferedResponseWrapper.java 2008-10-13 17:06:31 UTC (rev 2532)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/BufferedResponseWrapper.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -22,11 +22,11 @@
package org.jboss.bpm.console.server;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.ServletOutputStream;
+import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
-import java.io.ByteArrayOutputStream;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java 2008-10-13 17:06:31 UTC (rev 2532)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -26,6 +26,7 @@
import org.jboss.bpm.console.server.dao.DAOFactory;
import org.jboss.bpm.console.server.dao.ProcessDAO;
+import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
@@ -39,10 +40,19 @@
public class ProcessManagement
{
private ProcessDAO processDAO;
-
- public ProcessManagement()
+
+ /**
+ * Lazy load the {@link org.jboss.bpm.console.server.dao.ProcessDAO}
+ */
+ private ProcessDAO getProcessDAO(HttpServletRequest request)
{
- this.processDAO = DAOFactory.createProcessDAO();
+ if(null==this.processDAO)
+ {
+ DAOFactory factory = DAOFactory.newInstance(request.getSession().getServletContext());
+ this.processDAO = factory.createProcessDAO();
+ }
+
+ return this.processDAO;
}
@GET
@@ -52,8 +62,8 @@
@Context
HttpServletRequest request
)
- {
- return new ProcessDefinitionWrapper( processDAO.getAllDefinitions() );
+ {
+ return new ProcessDefinitionWrapper( getProcessDAO(request).getAllDefinitions() );
}
@POST
@@ -66,7 +76,7 @@
HttpServletRequest request
)
{
- return new ProcessDefinitionWrapper( processDAO.removeDefinition(processId) );
+ return new ProcessDefinitionWrapper( getProcessDAO(request).removeDefinition(processId) );
}
@GET
@@ -78,7 +88,7 @@
@Context
HttpServletRequest request)
{
- return new ProcessInstanceWrapper( processDAO.getInstancesByProcessId(processId) );
+ return new ProcessInstanceWrapper( getProcessDAO(request).getInstancesByProcessId(processId) );
}
@POST
@@ -90,6 +100,6 @@
@Context
HttpServletRequest request)
{
- return new ProcessInstanceWrapper( processDAO.removeInstance(instanceId) );
+ return new ProcessInstanceWrapper( getProcessDAO(request).removeInstance(instanceId) );
}
}
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/UserManagement.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/UserManagement.java 2008-10-13 17:06:31 UTC (rev 2532)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/UserManagement.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -21,14 +21,14 @@
*/
package org.jboss.bpm.console.server;
+import org.jboss.bpm.console.client.model.RoleAssignment;
import org.jboss.bpm.console.client.model.RoleAssignmentWrapper;
-import org.jboss.bpm.console.client.model.RoleAssignment;
+import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
-import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
import java.util.StringTokenizer;
/**
Deleted: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java 2008-10-13 17:06:31 UTC (rev 2532)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.server.dao;
-
-import org.jboss.bpm.console.server.dao.internal.MockProcessDAO;
-import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
-import org.jboss.bpm.console.server.jbpm3.dao.internal.MockDiagramDAO;
-
-/**
- * TODO: Add service locator lookup
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class DAOFactory
-{
- public static ProcessDAO createProcessDAO()
- {
- return new MockProcessDAO();
- }
-
- public static DiagramDAO createDiagramDAO()
- {
- return new MockDiagramDAO();
- }
-}
-
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao;
+
+import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public abstract class DAOFactory
+{
+ public abstract ProcessDAO createProcessDAO();
+
+ public abstract DiagramDAO createDiagramDAO();
+
+ /**
+ * Expects an init parameter <code>org.jboss.bpm.console.server.dao.DAOFactory</code>
+ * refering to the implementation class name that should be created.
+ * @param context ServletContext
+ * @return a DAOFactory implementation
+ */
+ public static DAOFactory newInstance(ServletContext context)
+ {
+ String daoFactoryClassName = context.getInitParameter(DAOFactory.class.getName());
+ if(null==daoFactoryClassName)
+ throw new RuntimeException("Failed to load DAOFactory. Init parameter " +
+ DAOFactory.class.getName() + " is missing");
+
+ try
+ {
+ return (DAOFactory)Class.forName(daoFactoryClassName).newInstance();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Failed to load DAOFactory", e);
+ }
+ }
+}
Copied: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java (from rev 2532, jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java)
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -0,0 +1,44 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.dao.internal;
+
+import org.jboss.bpm.console.server.dao.DAOFactory;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
+import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
+import org.jboss.bpm.console.server.jbpm3.dao.internal.MockDiagramDAO;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class MockDAOFactory extends DAOFactory
+{
+ public ProcessDAO createProcessDAO()
+ {
+ return new MockProcessDAO();
+ }
+
+ public DiagramDAO createDiagramDAO()
+ {
+ return new MockDiagramDAO();
+ }
+}
+
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockDAOFactory.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java 2008-10-13 17:06:31 UTC (rev 2532)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -21,15 +21,18 @@
*/
package org.jboss.bpm.console.server.jbpm3;
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
import org.jboss.bpm.console.server.dao.DAOFactory;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
-import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
-import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.GET;
import javax.ws.rs.Path;
-import javax.ws.rs.GET;
+import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
-import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
/**
@@ -38,22 +41,44 @@
@Path("jbpm3")
public class JBPM3Management
{
- private DiagramDAO diagramDAO;
+ private DiagramDAO diagramDAO = null;
+ private ProcessDAO processDAO = null;
- public JBPM3Management()
+ private ProcessDAO getProcessDAO(HttpServletRequest request)
{
- this.diagramDAO = DAOFactory.createDiagramDAO();
+ if(null==this.processDAO)
+ {
+ DAOFactory factory = DAOFactory.newInstance(request.getSession().getServletContext());
+ this.processDAO = factory.createProcessDAO();
+ }
+
+ return this.processDAO;
+
}
+ private DiagramDAO getDiagramDAO(HttpServletRequest request)
+ {
+ if(null==this.diagramDAO)
+ {
+ DAOFactory factory = DAOFactory.newInstance(request.getSession().getServletContext());
+ this.diagramDAO = factory.createDiagramDAO();
+ }
+
+ return this.diagramDAO;
+
+ }
+
@GET
@Path("definitions/{id}/image")
@Produces("image/jpeg")
public Response getProcessImage(
@PathParam("id")
- long id
+ long id,
+ @Context
+ HttpServletRequest request
)
{
- byte[] image = diagramDAO.getProcessImage(id);
+ byte[] image = getDiagramDAO(request).getProcessImage(id);
if(null==image)
return Response.serverError().build();
else
@@ -65,10 +90,12 @@
@Produces("application/json")
public DiagramInfo getDiagramInfo(
@PathParam("id")
- long id
+ long id,
+ @Context
+ HttpServletRequest request
)
{
- return diagramDAO.getDiagramInfo(id);
+ return getDiagramDAO(request).getDiagramInfo(id);
}
@GET
@@ -76,10 +103,12 @@
@Produces("application/json")
public ActiveNodeInfo getActiveNodeInfo(
@PathParam("id")
- long id
+ long id,
+ @Context
+ HttpServletRequest request
)
{
- return diagramDAO.getActivNodeInfo(id);
+ return getDiagramDAO(request).getActivNodeInfo(getProcessDAO(request), id);
}
}
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java 2008-10-13 17:06:31 UTC (rev 2532)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -21,8 +21,9 @@
*/
package org.jboss.bpm.console.server.jbpm3.dao;
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
-import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -33,5 +34,5 @@
DiagramInfo getDiagramInfo(long processId);
- ActiveNodeInfo getActivNodeInfo(long instanceId);
+ ActiveNodeInfo getActivNodeInfo(ProcessDAO processDAO, long instanceId);
}
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java 2008-10-13 17:06:31 UTC (rev 2532)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -23,16 +23,16 @@
import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
import org.jboss.bpm.console.client.model.jbpm3.DiagramNodeInfo;
+import org.jbpm.util.XmlUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
+import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import org.w3c.dom.Node;
-import org.jbpm.util.XmlUtil;
+import java.io.IOException;
import java.io.InputStream;
-import java.io.IOException;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java 2008-10-13 17:06:31 UTC (rev 2532)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java 2008-10-14 09:17:32 UTC (rev 2533)
@@ -21,17 +21,15 @@
*/
package org.jboss.bpm.console.server.jbpm3.dao.internal;
-import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
-import org.jboss.bpm.console.server.jbpm3.dao.internal.DiagramInfoParser;
-import org.jboss.bpm.console.server.dao.ProcessDAO;
-import org.jboss.bpm.console.server.dao.DAOFactory;
-import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.client.model.ProcessInstance;
import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
import org.jboss.bpm.console.client.model.jbpm3.DiagramNodeInfo;
-import org.jboss.bpm.console.client.model.ProcessInstance;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
+import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
-import java.io.InputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.util.List;
/**
@@ -39,13 +37,7 @@
*/
public class MockDiagramDAO implements DiagramDAO
{
- private ProcessDAO processDAO;
- public MockDiagramDAO()
- {
- processDAO = DAOFactory.createProcessDAO();
- }
-
public byte[] getProcessImage(long processId)
{
byte[] imageBytes = null;
@@ -75,7 +67,7 @@
return DiagramInfoParser.parse(in);
}
- public ActiveNodeInfo getActivNodeInfo(long instanceId)
+ public ActiveNodeInfo getActivNodeInfo(ProcessDAO processDAO, long instanceId)
{
ProcessInstance pi = processDAO.getInstanceById(instanceId);
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml 2008-10-13 17:06:31 UTC (rev 2532)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/webapp/WEB-INF/web.xml 2008-10-14 09:17:32 UTC (rev 2533)
@@ -15,6 +15,11 @@
<param-value>/rs</param-value>
</context-param>
+ <context-param>
+ <param-name>org.jboss.bpm.console.server.dao.DAOFactory</param-name>
+ <param-value>org.jboss.bpm.console.server.dao.internal.MockDAOFactory</param-value>
+ </context-param>
+
<filter>
<filter-name>gwtJSON</filter-name>
<filter-class>org.jboss.bpm.console.server.GWTJsonFilter</filter-class>
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2532 - in jbpm3/trunk/modules/gwt-console: rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3 and 21 other directories.
by do-not-reply＠jboss.org
Author: heiko.braun(a)jboss.com
Date: 2008-10-13 13:06:31 -0400 (Mon, 13 Oct 2008)
New Revision: 2532
Added:
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/ActiveNodeInfo.java
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramInfo.java
jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramNodeInfo.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/1.jpg
jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/gpd.xml
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/RestURL.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequest.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequestHandler.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java
Removed:
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/Config.java
Modified:
jbpm3/trunk/modules/gwt-console/server/pom.xml
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/ProcessDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockProcessDAO.java
jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css
Log:
Update process image: added active node display
Added: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/ActiveNodeInfo.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/ActiveNodeInfo.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/ActiveNodeInfo.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.model.jbpm3;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlElement;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@XmlRootElement(name = "activeNodeInfo")
+public class ActiveNodeInfo
+{
+ private int width = -1;
+ private int height = -1;
+
+ private DiagramNodeInfo activeNode;
+
+
+ public ActiveNodeInfo()
+ {
+ }
+
+ public ActiveNodeInfo(int width, int height, DiagramNodeInfo activeNode)
+ {
+ this.width = width;
+ this.height = height;
+ this.activeNode = activeNode;
+ }
+
+ @XmlElement(name = "diagramWidth")
+ public int getWidth()
+ {
+ return width;
+ }
+
+ public void setWidth(int width)
+ {
+ this.width = width;
+ }
+
+ @XmlElement(name = "diagramHeight")
+ public int getHeight()
+ {
+ return height;
+ }
+
+ public void setHeight(int height)
+ {
+ this.height = height;
+ }
+
+ @XmlElement(name = "activeNode")
+ public DiagramNodeInfo getActiveNode()
+ {
+ return activeNode;
+ }
+
+ public void setActiveNode(DiagramNodeInfo activeNode)
+ {
+ this.activeNode = activeNode;
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/ActiveNodeInfo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramInfo.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramInfo.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramInfo.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,81 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.model.jbpm3;
+
+import javax.xml.bind.annotation.XmlRootElement;
+import java.util.*;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@XmlRootElement(name = "diagramInfo")
+public class DiagramInfo
+{
+ private int width = -1;
+ private int height = -1;
+ private List<DiagramNodeInfo> nodeList = new ArrayList<DiagramNodeInfo>();
+
+ public DiagramInfo()
+ {
+ }
+
+ public DiagramInfo(final int height, final int width, final List<DiagramNodeInfo> l) {
+ this.height = height;
+ this.width = width;
+ final List<DiagramNodeInfo> list = new ArrayList<DiagramNodeInfo>();
+ for (DiagramNodeInfo nodeInfo : l) {
+ list.add(nodeInfo);
+ }
+ nodeList = Collections.unmodifiableList(list);
+ }
+
+ public int getWidth()
+ {
+ return width;
+ }
+
+ public void setWidth(int width)
+ {
+ this.width = width;
+ }
+
+ public int getHeight()
+ {
+ return height;
+ }
+
+ public void setHeight(int height)
+ {
+ this.height = height;
+ }
+
+ public List<DiagramNodeInfo> getNodeList()
+ {
+ return nodeList;
+ }
+
+ public void setNodeList(List<DiagramNodeInfo> nodeList)
+ {
+ this.nodeList = nodeList;
+ }
+
+}
Property changes on: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramInfo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramNodeInfo.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramNodeInfo.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramNodeInfo.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,103 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.model.jbpm3;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@XmlRootElement(name = "nodeInfo")
+public class DiagramNodeInfo
+{
+ private String name;
+ private int x;
+ private int y;
+ private int width;
+ private int height;
+
+ public DiagramNodeInfo()
+ {
+ }
+
+ public DiagramNodeInfo(
+ final String name,
+ final int x, final int y,
+ final int width, final int height)
+ {
+ this.height = height;
+ this.name = name;
+ this.width = width;
+ this.x = x;
+ this.y = y;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public int getX()
+ {
+ return x;
+ }
+
+ public void setX(int x)
+ {
+ this.x = x;
+ }
+
+ public int getY()
+ {
+ return y;
+ }
+
+ public void setY(int y)
+ {
+ this.y = y;
+ }
+
+ public int getWidth()
+ {
+ return width;
+ }
+
+ public void setWidth(int width)
+ {
+ this.width = width;
+ }
+
+ public int getHeight()
+ {
+ return height;
+ }
+
+ public void setHeight(int height)
+ {
+ this.height = height;
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/DiagramNodeInfo.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/server/pom.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/pom.xml 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/server/pom.xml 2008-10-13 17:06:31 UTC (rev 2532)
@@ -24,6 +24,11 @@
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>org.jbpm.jbpm3</groupId>
+ <artifactId>jbpm-core</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>com.google.gwt</groupId>
<artifactId>gwt-servlet</artifactId>
<version>${gwt.version}</version>
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ConsoleServerApplication.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -21,6 +21,8 @@
*/
package org.jboss.bpm.console.server;
+import org.jboss.bpm.console.server.jbpm3.JBPM3Management;
+
import javax.ws.rs.core.Application;
import java.util.HashSet;
import java.util.Set;
@@ -36,6 +38,7 @@
{
singletons.add(new ProcessManagement());
singletons.add(new UserManagement());
+ singletons.add(new JBPM3Management());
}
@Override
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/ProcessManagement.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -26,9 +26,9 @@
import org.jboss.bpm.console.server.dao.DAOFactory;
import org.jboss.bpm.console.server.dao.ProcessDAO;
+import javax.servlet.http.HttpServletRequest;
import javax.ws.rs.*;
import javax.ws.rs.core.Context;
-import javax.servlet.http.HttpServletRequest;
/**
* REST server module for accessing process related data.
@@ -39,10 +39,10 @@
public class ProcessManagement
{
private ProcessDAO processDAO;
-
+
public ProcessManagement()
{
- this.processDAO = DAOFactory.createProcessDefinitionDAO();
+ this.processDAO = DAOFactory.createProcessDAO();
}
@GET
@@ -52,8 +52,8 @@
@Context
HttpServletRequest request
)
- {
- return new ProcessDefinitionWrapper( processDAO.getAllProcessDefinitions() );
+ {
+ return new ProcessDefinitionWrapper( processDAO.getAllDefinitions() );
}
@POST
@@ -66,7 +66,7 @@
HttpServletRequest request
)
{
- return new ProcessDefinitionWrapper( processDAO.removeProcessDefinition(processId) );
+ return new ProcessDefinitionWrapper( processDAO.removeDefinition(processId) );
}
@GET
@@ -78,7 +78,7 @@
@Context
HttpServletRequest request)
{
- return new ProcessInstanceWrapper( processDAO.getInstanceByProcessDefinitionId(processId) );
+ return new ProcessInstanceWrapper( processDAO.getInstancesByProcessId(processId) );
}
@POST
@@ -90,7 +90,6 @@
@Context
HttpServletRequest request)
{
- return new ProcessInstanceWrapper( processDAO.removeProcessInstance(instanceId) );
+ return new ProcessInstanceWrapper( processDAO.removeInstance(instanceId) );
}
-
}
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/DAOFactory.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -22,6 +22,8 @@
package org.jboss.bpm.console.server.dao;
import org.jboss.bpm.console.server.dao.internal.MockProcessDAO;
+import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
+import org.jboss.bpm.console.server.jbpm3.dao.internal.MockDiagramDAO;
/**
* TODO: Add service locator lookup
@@ -29,9 +31,14 @@
*/
public class DAOFactory
{
- public static ProcessDAO createProcessDefinitionDAO()
+ public static ProcessDAO createProcessDAO()
{
return new MockProcessDAO();
- }
+ }
+
+ public static DiagramDAO createDiagramDAO()
+ {
+ return new MockDiagramDAO();
+ }
}
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/ProcessDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/ProcessDAO.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/ProcessDAO.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -33,13 +33,15 @@
*/
public interface ProcessDAO
{
- List<ProcessDefinition> getAllProcessDefinitions();
+ List<ProcessDefinition> getAllDefinitions();
- ProcessDefinition getProcessDefinitionById(long processId);
+ ProcessDefinition getDefinitionById(long processId);
- List<ProcessDefinition> removeProcessDefinition(long processId);
+ List<ProcessDefinition> removeDefinition(long processId);
- List<ProcessInstance> getInstanceByProcessDefinitionId(long processId);
+ List<ProcessInstance> getInstancesByProcessId(long processId);
- List<ProcessInstance> removeProcessInstance(long instanceId);
+ ProcessInstance getInstanceById(long instanceId);
+
+ List<ProcessInstance> removeInstance(long instanceId);
}
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockProcessDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockProcessDAO.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/dao/internal/MockProcessDAO.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -21,13 +21,13 @@
*/
package org.jboss.bpm.console.server.dao.internal;
-import org.jboss.bpm.console.server.dao.ProcessDAO;
import org.jboss.bpm.console.client.model.ProcessDefinition;
import org.jboss.bpm.console.client.model.ProcessInstance;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
-import java.util.List;
import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
@@ -45,7 +45,7 @@
defs.add( new ProcessDefinition(5, "Loan application", "1"));
defs.add( new ProcessDefinition(6, "Expense report review", "4"));
defs.add( new ProcessDefinition(7, "Expense claim", "4"));
- defs.add( new ProcessDefinition(8, "Credit approval", "4"));
+ defs.add( new ProcessDefinition(8, "Credit approval", "4"));
}
final static List<ProcessInstance> instances = new ArrayList<ProcessInstance>();
@@ -59,12 +59,12 @@
instances.add( new ProcessInstance(7, -1, "Running", new Date(), null));
}
- public List<ProcessDefinition> getAllProcessDefinitions()
+ public List<ProcessDefinition> getAllDefinitions()
{
return defs;
}
- public ProcessDefinition getProcessDefinitionById(long id)
+ public ProcessDefinition getDefinitionById(long id)
{
ProcessDefinition match = null;
for(ProcessDefinition pd : defs)
@@ -75,11 +75,11 @@
break;
}
}
- return match;
+ return match;
}
- public List<ProcessDefinition> removeProcessDefinition(long processId)
+ public List<ProcessDefinition> removeDefinition(long processId)
{
System.out.println("Remove definition " + processId);
@@ -94,16 +94,16 @@
throw new IllegalArgumentException("No process with id " + processId);
else
defs.remove(toBeRemoved);
-
+
return defs;
}
- public List<ProcessInstance> getInstanceByProcessDefinitionId(long id)
+ public List<ProcessInstance> getInstancesByProcessId(long id)
{
- return instances;
+ return instances;
}
- public List<ProcessInstance> removeProcessInstance(long instanceId)
+ public List<ProcessInstance> removeInstance(long instanceId)
{
System.out.println("Remove instance " + instanceId);
@@ -122,4 +122,20 @@
return instances;
}
+
+
+ public ProcessInstance getInstanceById(long instanceId)
+ {
+ ProcessInstance match = null;
+ for(ProcessInstance instance : instances)
+ {
+ if(instanceId == instance.getId())
+ match = instance;
+ }
+
+ if(null==match)
+ throw new IllegalArgumentException("No instance with id " + instanceId);
+
+ return match;
+ }
}
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.jbpm3;
+
+import org.jboss.bpm.console.server.dao.DAOFactory;
+import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+
+import javax.ws.rs.Path;
+import javax.ws.rs.GET;
+import javax.ws.rs.Produces;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+@Path("jbpm3")
+public class JBPM3Management
+{
+ private DiagramDAO diagramDAO;
+
+ public JBPM3Management()
+ {
+ this.diagramDAO = DAOFactory.createDiagramDAO();
+ }
+
+ @GET
+ @Path("definitions/{id}/image")
+ @Produces("image/jpeg")
+ public Response getProcessImage(
+ @PathParam("id")
+ long id
+ )
+ {
+ byte[] image = diagramDAO.getProcessImage(id);
+ if(null==image)
+ return Response.serverError().build();
+ else
+ return Response.ok(image).type("image/jpeg").build();
+ }
+
+ @GET
+ @Path("definitions/{id}/diagramInfo")
+ @Produces("application/json")
+ public DiagramInfo getDiagramInfo(
+ @PathParam("id")
+ long id
+ )
+ {
+ return diagramDAO.getDiagramInfo(id);
+ }
+
+ @GET
+ @Path("instances/{id}/activeNodeInfo")
+ @Produces("application/json")
+ public ActiveNodeInfo getActiveNodeInfo(
+ @PathParam("id")
+ long id
+ )
+ {
+ return diagramDAO.getActivNodeInfo(id);
+ }
+
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/JBPM3Management.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,37 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.jbpm3.dao;
+
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface DiagramDAO
+{
+ byte[] getProcessImage(long processId);
+
+ DiagramInfo getDiagramInfo(long processId);
+
+ ActiveNodeInfo getActivNodeInfo(long instanceId);
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/DiagramDAO.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,91 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.jbpm3.dao.internal;
+
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramNodeInfo;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+import org.w3c.dom.Node;
+import org.jbpm.util.XmlUtil;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.List;
+import java.util.ArrayList;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+class DiagramInfoParser
+{
+ /**
+ * Will close the stream after successfull read
+ * @param in
+ * @return
+ */
+ public static DiagramInfo parse(InputStream in )
+ {
+ Document document = XmlUtil.parseXmlInputStream(in);
+ Element processDiagramElement = document.getDocumentElement();
+ final String widthString = processDiagramElement.getAttribute("width");
+ final String heightString = processDiagramElement.getAttribute("height");
+ final List<DiagramNodeInfo> diagramNodeInfoList = new ArrayList<DiagramNodeInfo>();
+ final NodeList nodeNodeList = processDiagramElement.getElementsByTagName("node");
+ final int nodeNodeListLength = nodeNodeList.getLength();
+ for (int i = 0; i < nodeNodeListLength; i ++) {
+ final Node nodeNode = nodeNodeList.item(i);
+ if (nodeNode instanceof Node && nodeNode.getParentNode() == processDiagramElement) {
+ final Element nodeElement = (Element) nodeNode;
+ final String nodeName = nodeElement.getAttribute("name");
+ final String nodeXString = nodeElement.getAttribute("x");
+ final String nodeYString = nodeElement.getAttribute("y");
+ final String nodeWidthString = nodeElement.getAttribute("width");
+ final String nodeHeightString = nodeElement.getAttribute("height");
+ final DiagramNodeInfo nodeInfo = new DiagramNodeInfo(
+ nodeName,
+ Integer.parseInt(nodeXString),
+ Integer.parseInt(nodeYString),
+ Integer.parseInt(nodeWidthString),
+ Integer.parseInt(nodeHeightString)
+ );
+ diagramNodeInfoList.add(nodeInfo);
+ }
+ }
+ DiagramInfo diagramInfo = new DiagramInfo(
+ Integer.parseInt(heightString),
+ Integer.parseInt(widthString),
+ diagramNodeInfoList
+ );
+
+ try
+ {
+ in.close();
+ } catch (IOException e)
+ {
+ throw new RuntimeException("Failed to close stream", e);
+ }
+
+ return diagramInfo;
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/DiagramInfoParser.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,105 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.server.jbpm3.dao.internal;
+
+import org.jboss.bpm.console.server.jbpm3.dao.DiagramDAO;
+import org.jboss.bpm.console.server.jbpm3.dao.internal.DiagramInfoParser;
+import org.jboss.bpm.console.server.dao.ProcessDAO;
+import org.jboss.bpm.console.server.dao.DAOFactory;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramInfo;
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramNodeInfo;
+import org.jboss.bpm.console.client.model.ProcessInstance;
+
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class MockDiagramDAO implements DiagramDAO
+{
+ private ProcessDAO processDAO;
+
+ public MockDiagramDAO()
+ {
+ processDAO = DAOFactory.createProcessDAO();
+ }
+
+ public byte[] getProcessImage(long processId)
+ {
+ byte[] imageBytes = null;
+
+ try
+ {
+ InputStream in = MockDiagramDAO.class.getResourceAsStream("1.jpg");
+ if(null==in)
+ throw new IllegalArgumentException("Failed to load image resource");
+ imageBytes = new byte[in.available()];
+ in.read(imageBytes);
+
+ } catch (IOException e)
+ {
+ e.printStackTrace();
+ }
+
+ return imageBytes;
+ }
+
+ public DiagramInfo getDiagramInfo(long processId)
+ {
+ InputStream in = MockDiagramDAO.class.getResourceAsStream("gpd.xml");
+ if(null==in)
+ throw new IllegalArgumentException("Failed to load diagram info");
+
+ return DiagramInfoParser.parse(in);
+ }
+
+ public ActiveNodeInfo getActivNodeInfo(long instanceId)
+ {
+
+ ProcessInstance pi = processDAO.getInstanceById(instanceId);
+ DiagramInfo diagram = getDiagramInfo(pi.getParentId());
+ List<DiagramNodeInfo> nodes = diagram.getNodeList();
+
+ DiagramNodeInfo activeNode = null;
+ int i = 0;
+ for(DiagramNodeInfo n : nodes)
+ {
+ // TODO: Fake. Actually this should retrieve the active node
+ if(i==1)
+ {
+ activeNode = n;
+ break;
+ }
+
+ i++;
+
+ }
+
+ if(null==activeNode)
+ throw new RuntimeException("Failed to retrieve active node for instanceId " + instanceId);
+
+ return new ActiveNodeInfo(diagram.getWidth(), diagram.getHeight(), activeNode);
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/java/org/jboss/bpm/console/server/jbpm3/dao/internal/MockDiagramDAO.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/1.jpg
===================================================================
(Binary files differ)
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/1.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/gpd.xml
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/gpd.xml (rev 0)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/gpd.xml 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<process-diagram name="websale" width="566" height="541">
+ <node name="Create new web sale order" x="250" y="50" width="200" height="40">
+ <transition>
+ <label x="5" y="-10"/>
+ </transition>
+ </node>
+ <node name="Evaluate web order" x="280" y="125" width="140" height="40">
+ <transition name="ok">
+ <label x="9" y="-10"/>
+ </transition>
+ <transition name="more info needed">
+ <label x="-44" y="-18"/>
+ <bendpoint w1="-114" h1="-35" w2="116" h2="-35"/>
+ </transition>
+ </node>
+ <node name="Fix web order data" x="50" y="125" width="140" height="40">
+ <transition>
+ <label x="5" y="-10"/>
+ <bendpoint w1="109" h1="32" w2="-121" h2="32"/>
+ </transition>
+ </node>
+ <node name="salefork" x="250" y="200" width="200" height="25">
+ <transition name="payment">
+ <label x="12" y="-18"/>
+ <bendpoint w1="145" h1="31" w2="0" h2="-52"/>
+ </transition>
+ <transition name="shipping">
+ <label x="10" y="10"/>
+ <bendpoint w1="-130" h1="34" w2="0" h2="-89"/>
+ </transition>
+ </node>
+ <node name="Wait for money" x="425" y="275" width="140" height="40">
+ <transition>
+ <label x="5" y="-10"/>
+ </transition>
+ </node>
+ <node name="update books" x="425" y="350" width="140" height="40">
+ <transition>
+ <label x="5" y="-10"/>
+ <bendpoint w1="-1" h1="34" w2="144" h2="-33"/>
+ </transition>
+ </node>
+ <node name="ship item" x="150" y="315" width="140" height="40">
+ <transition>
+ <label x="5" y="-10"/>
+ <bendpoint w1="-1" h1="74" w2="-131" h2="-28"/>
+ </transition>
+ </node>
+ <node name="salejoin" x="250" y="425" width="200" height="25">
+ <transition>
+ <label x="5" y="-10"/>
+ </transition>
+ </node>
+ <node name="end" x="280" y="500" width="140" height="40"/>
+</process-diagram>
+
Property changes on: jbpm3/trunk/modules/gwt-console/server/src/main/resources/org/jboss/bpm/console/server/jbpm3/dao/internal/gpd.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html
===================================================================
--- jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/server/src/main/webapp/index.html 2008-10-13 17:06:31 UTC (rev 2532)
@@ -55,6 +55,31 @@
<td>A list of assigned roles matching the query parameter (Comma seperated list)</td>
<td>application/json</td>
</tr>
+
+ <tr>
+ <td colspan=4><h3>jBPM3 proprietary extensions</h3></td>
+ </tr>
+
+ <tr>
+ <td>GET</td>
+ <td><a href="/gwt-console-server/rs/jbpm3/definitions/1/image">/rs/jbpm3/definitions/{processId}/image</a></td>
+ <td>Retrieve a process definition image (GPD), if deployed</td>
+ <td>image/jpeg</td>
+ </tr>
+
+ <tr>
+ <td>GET</td>
+ <td>/rs/jbpm3/definitions/{processId}/diagramInfo</td>
+ <td>Retrieve a process definition coordinates (GPD)</td>
+ <td>application/json</td>
+ </tr>
+
+ <tr>
+ <td>GET</td>
+ <td>/rs/jbpm3/instances/{instanceId}/activeNodeInfo</td>
+ <td>Retrieve a process definition coordinates (GPD) of the active node</td>
+ <td>application/json</td>
+ </tr>
</table>
<h2>Example usage</h2>
Deleted: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/Config.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/Config.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/Config.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -1,83 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.bpm.console.client;
-
-/**
- * @author Heiko.Braun <heiko.braun(a)jboss.com>
- */
-public class Config
-{
- String consoleServerUrl = "http://localhost:8080";
- String webContext = "/gwt-console-server";
-
- public String getConsoleServerUrl()
- {
- return consoleServerUrl;
- }
-
- public void setConsoleServerUrl(String consoleServerUrl)
- {
- this.consoleServerUrl = consoleServerUrl;
- }
-
- public String getWebContext()
- {
- return webContext;
- }
-
- public void setWebContext(String webContext)
- {
- this.webContext = webContext;
- }
-
- public String getProcessDefinitionURL()
- {
- return consoleServerUrl + webContext + "/rs/process/definitions";
- }
-
- public String getProcessInstanceURL(long processId)
- {
- return consoleServerUrl + webContext + "/rs/process/definitions/"+processId+"/instances";
- }
-
- public String getUserInRoleURL(String[] possibleRoles)
- {
- StringBuffer sb = new StringBuffer();
- for(int i=0; i<possibleRoles.length; i++)
- {
- sb.append(possibleRoles[i]);
- if(i<possibleRoles.length-1)
- sb.append(",");
- }
- return consoleServerUrl + webContext + "/rs/user/roles?roleCheck="+sb.toString();
- }
-
- public String getRemoveDefinitionURL(long processId)
- {
- return consoleServerUrl + webContext + "/rs/process/definitions/" + processId + "/remove";
- }
-
- public String getRemoveInstanceURL(long instanceId)
- {
- return consoleServerUrl + webContext + "/rs/process/instances/" + instanceId + "/remove";
- }
-}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/ConsoleView.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -57,7 +57,7 @@
private HeaderPanel header;
private MainMenu mainMenu;
private EditorPanel editorPanel;
- private Config config = new Config();
+ private RestURL restURL = new RestURL( "http://localhost:8080", "gwt-console-server");
private String[] rolesAssigned = new String[] {};
private final static String[] POSSIBLE_ROLES = {"admin", "user"};
@@ -149,7 +149,7 @@
if(GWT.isScript())
{
- String url = getConfig().getUserInRoleURL(POSSIBLE_ROLES);
+ String url = getRestURL().getUserInRoleURL(POSSIBLE_ROLES);
RequestBuilder rb = new RequestBuilder(RequestBuilder.GET, url);
try
@@ -235,9 +235,9 @@
return editorPanel.hasEditor(id);
}
- public Config getConfig()
+ public RestURL getRestURL()
{
- return config;
+ return restURL;
}
public void showEditor(String id)
Copied: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/RestURL.java (from rev 2515, jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/Config.java)
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/RestURL.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/RestURL.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,99 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class RestURL
+{
+ private final String consoleServerUrl;
+ private final String webContext;
+
+ public RestURL(String consoleServerUrl, String webContext)
+ {
+ this.consoleServerUrl = consoleServerUrl;
+ this.webContext = webContext;
+ }
+
+ public String getConsoleServerUrl()
+ {
+ return consoleServerUrl;
+ }
+
+ public String getWebContext()
+ {
+ return webContext;
+ }
+
+ private String getBaseUrl()
+ {
+ return consoleServerUrl + "/" + webContext;
+ }
+
+ public String getProcessDefinitionURL()
+ {
+ return getBaseUrl() + "/rs/process/definitions";
+ }
+
+ public String getProcessInstanceURL(long processId)
+ {
+ return getBaseUrl() + "/rs/process/definitions/"+processId+"/instances";
+ }
+
+ public String getUserInRoleURL(String[] possibleRoles)
+ {
+ StringBuffer sb = new StringBuffer();
+ for(int i=0; i<possibleRoles.length; i++)
+ {
+ sb.append(possibleRoles[i]);
+ if(i<possibleRoles.length-1)
+ sb.append(",");
+ }
+ return getBaseUrl() + "/rs/user/roles?roleCheck="+sb.toString();
+ }
+
+ public String getRemoveDefinitionURL(long processId)
+ {
+ return getBaseUrl() + "/rs/process/definitions/" + processId + "/remove";
+ }
+
+ public String getRemoveInstanceURL(long instanceId)
+ {
+ return getBaseUrl() + "/rs/process/instances/" + instanceId + "/remove";
+ }
+
+ public String getProcessImageURL(long processId)
+ {
+ return getBaseUrl() + "/rs/jbpm3/definitions/" + processId + "/image";
+ }
+
+ public String getDiagramInfoURL(long processId)
+ {
+ return getBaseUrl() + "/rs/jbpm3/definitions/" + processId + "/diagramInfo";
+ }
+
+ public String getActiveNodeInfoURL(long instanceId)
+ {
+ return getBaseUrl() + "/rs/jbpm3/instances/" + instanceId + "/activeNodeInfo";
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/RestURL.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -48,7 +48,7 @@
private static String getResourceUrl(ConsoleView view)
{
- return view.getConfig().getProcessDefinitionURL();
+ return view.getRestURL().getProcessDefinitionURL();
}
protected ColumnModel createColumnModel()
@@ -106,7 +106,7 @@
if("yes".equals( btnID) )
{
ProcessDefinition proc = (ProcessDefinition)row2ProcessMap.get(row);
- String url = view.getConfig().getRemoveDefinitionURL(proc.getProcessId());
+ String url = view.getRestURL().getRemoveDefinitionURL(proc.getProcessId());
RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, url);
try
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessImageView.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -21,33 +21,138 @@
*/
package org.jboss.bpm.console.client.process;
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.json.client.JSONObject;
import com.google.gwt.user.client.ui.Image;
+import com.google.gwt.user.client.ui.HTML;
+import com.gwtext.client.widgets.Component;
import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.event.PanelListenerAdapter;
+import org.jboss.bpm.console.client.ConsoleView;
import org.jboss.bpm.console.client.model.ProcessInstance;
+import org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo;
+import org.jboss.bpm.console.client.model.jbpm3.DiagramNodeInfo;
+import org.jboss.bpm.console.client.util.JSONRequest;
+import org.jboss.bpm.console.client.util.JSONRequestHandler;
+import org.jboss.bpm.console.client.util.JSONWalk;
/**
+ * Fetches the {@link org.jboss.bpm.console.client.model.jbpm3.ActiveNodeInfo}
+ * and displays the process image.<p>
+ *
+ * The {@link com.gwtext.client.widgets.event.PanelListenerAdapter#doBeforeRender(com.gwtext.client.widgets.Component)}
+ * callback forces the GET request on the active node info, but has weak error handling and thus can result in 'null'.<br>
+ *
+ * The {@link com.gwtext.client.widgets.event.PanelListenerAdapter#onRender(com.gwtext.client.widgets.Component)}
+ * callback fetches the process definition image, if available.
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*/
public class ProcessImageView extends Panel
{
+ private ProcessInstance instance;
+ private ConsoleView view;
+ private ActiveNodeInfo activeNodeInfo = null;
- private ProcessInstance parent;
-
- public ProcessImageView(ProcessInstance parent)
+ public ProcessImageView(final ProcessInstance instance, final ConsoleView view)
{
super();
- this.parent = parent;
-
- final Image image = new Image("images/processSample.jpg");
- image.setStyleName("bpm-ProcessImage");
-
+ this.instance = instance;
+ this.view = view;
+
this.setHeader(false);
this.setBorder(true);
this.setFrame(false);
this.setAutoScroll(true);
+
+ this.addListener(
+ new PanelListenerAdapter()
+ {
+ public boolean doBeforeRender(Component component)
+ {
+ System.out.println("doBeforeRender");
+ loadActiveNodeInfo();
+ return true;
+ }
+
+
+ public void onRender(Component component)
+ {
+ System.out.println("onRender");
+ /*final Image image = new Image("images/processSample.jpg");
+ image.setStyleName("bpm-ProcessImage");
+ add(image);*/
+
+
+ }
+ }
+ );
+
+ }
+
+ private void loadActiveNodeInfo()
+ {
+ String url = view.getRestURL().getActiveNodeInfoURL(this.instance.getId());
+ System.out.println("Loading activeNodeInfo: " + url);
+
+ JSONRequest.get(url,
+ new JSONRequestHandler() {
+
+ public void onRequestComplete(JavaScriptObject json)
+ {
+ JSONObject root = new JSONObject(json);
+ int diagramWidth = JSONWalk.on(root).next("diagramWidth").asInt();
+ int diagramHeight = JSONWalk.on(root).next("diagramHeight").asInt();
+
+ JSONObject activeNode = JSONWalk.on(root).next("activeNode").asObject();
+
+ int x = JSONWalk.on(activeNode).next("x").asInt();
+ int y = JSONWalk.on(activeNode).next("y").asInt();
+
+ int width = JSONWalk.on(activeNode).next("width").asInt();
+ int height = JSONWalk.on(activeNode).next("height").asInt();
+ String name = JSONWalk.on(activeNode).next("name").asString();
+
+ ActiveNodeInfo activeNodeInfo =
+ new ActiveNodeInfo(
+ diagramWidth, diagramHeight,
+ new DiagramNodeInfo(name, x, y, width, height)
+ );
+
+ onActiveNodeInfoLoaded(activeNodeInfo);
+ }
+ }
+ );
+
+ }
+
+ public void onActiveNodeInfoLoaded(ActiveNodeInfo activeNodeInfo)
+ {
+ System.out.println("Successfully loaded activeNodeInfo:" + activeNodeInfo.getActiveNode().getName());
+ this.activeNodeInfo = activeNodeInfo;
+
+ DiagramNodeInfo activeNode = activeNodeInfo.getActiveNode();
+ String imageUrl = view.getRestURL().getProcessImageURL(instance.getParentId());
- this.add(image);
+ HTML html = new HTML(
+ "<div id=\"imageContainer\" style=\"position:relative;top:-1;left:-1;height:"+activeNodeInfo.getHeight()+"px;width:"+activeNodeInfo.getWidth()+"px\">" +
+ "<img src=\""+imageUrl+"\" style=\"position:absolute;top:0;left:0\" />" +
+ "" +
+ "<div class=\"activeNode\" style=\"top:"+ (activeNode.getY()) +"px;left:"+activeNode.getX()+"px;width:"+(activeNode.getWidth()-2)+"px;height:"+(activeNode.getHeight()-2)+"px\"></div>" +
+ "" +
+ "<div class=\"activeNode-header\" style=\"top:"+(activeNode.getY()-15)+"px;left:"+activeNode.getX()+"px;width:"+activeNode.getWidth()+"px;height:15px\">" +
+ " <div class=\"activeNode-header-link\"><a href=\"javascript:alert('Not implemented!')\">Running</a></div>" +
+ "</div>" +
+ "</div>"
+ );
+ add(html);
+ doLayout();
+
}
+
+ public ActiveNodeInfo getActiveNodeInfo()
+ {
+ return activeNodeInfo;
+ }
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceEditor.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -37,7 +37,7 @@
/**
* @author Heiko.Braun <heiko.braun(a)jboss.com>
*
- * @see ProcessInstanceList#onExamine(Integer)
+ * @see ProcessInstanceList#onExamine(int)
*/
public class ProcessInstanceEditor extends EditorView
{
@@ -71,7 +71,7 @@
// ----------------------------------
- ProcessImageView imageView = new ProcessImageView(instance);
+ ProcessImageView imageView = new ProcessImageView(instance, view);
imageView.setWidth(UIConstants.EDITOR_PANEL_WIDTH);
Toolbar imageToolbar = new Toolbar();
@@ -85,14 +85,11 @@
final Window window = new Window();
window.setTitle("Process Graph");
window.setClosable(true);
- window.setWidth(600);
- window.setHeight(400);
- window.setPlain(true);
- /*window.setLayout(new BorderLayout());
- window.add(tabPanel, centerData);
- window.add(navPanel, westData);*/
+ window.setWidth(800);
+ window.setHeight(600);
+ window.setPlain(true);
window.setCloseAction(Window.HIDE);
- window.add(new ProcessImageView(instance) );
+ window.add(new ProcessImageView(instance, view) );
window.show("");
}
}
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/process/ProcessInstanceList.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -79,7 +79,7 @@
if("yes".equals( btnID) )
{
ProcessInstance instance = row2InstanceMap.get(row);
- String url = view.getConfig().getRemoveInstanceURL(instance.getId());
+ String url = view.getRestURL().getRemoveInstanceURL(instance.getId());
RequestBuilder rb = new RequestBuilder(RequestBuilder.POST, url);
try
@@ -173,7 +173,7 @@
private static String getResourceUrl(ConsoleView view, long parentId)
{
- return view.getConfig().getProcessInstanceURL(parentId);
+ return view.getRestURL().getProcessInstanceURL(parentId);
}
}
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequest.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequest.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequest.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.util;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class JSONRequest {
+ public static void get(String url, JSONRequestHandler handler)
+ {
+ String callbackName = "JSONCallback"+handler.hashCode();
+ get( url+"?callback="+callbackName, callbackName, handler );
+ }
+
+ public static void get(String url, String callbackName, JSONRequestHandler handler )
+ {
+ createCallbackFunction( handler, callbackName );
+ addScript(url);
+ }
+
+ public static native void addScript(String url) /*-{
+ var scr = document.createElement("script");
+ scr.setAttribute("language", "JavaScript");
+ scr.setAttribute("src", url);
+ document.getElementsByTagName("body")[0].appendChild(scr);
+ }-*/;
+
+ private native static void createCallbackFunction( JSONRequestHandler obj, String callbackName)/*-{
+ tmpcallback = function(j) {
+ obj.@org.jboss.bpm.console.client.util.JSONRequestHandler::onRequestComplete(Lcom/google/gwt/core/client/JavaScriptObject;)(j);
+ };
+ eval( "window." + callbackName + "=tmpcallback" );
+ }-*/;
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequest.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequestHandler.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequestHandler.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequestHandler.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.util;
+
+import com.google.gwt.core.client.JavaScriptObject;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public interface JSONRequestHandler
+{
+ void onRequestComplete(JavaScriptObject json);
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONRequestHandler.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java (rev 0)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java 2008-10-13 17:06:31 UTC (rev 2532)
@@ -0,0 +1,162 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.bpm.console.client.util;
+
+import com.google.gwt.json.client.JSONObject;
+import com.google.gwt.json.client.JSONValue;
+import com.google.gwt.json.client.JSONException;
+import com.google.gwt.json.client.JSONArray;
+
+import java.util.Iterator;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class JSONWalk
+{
+ private JSONValue root;
+
+
+ private JSONWalk(JSONValue root)
+ {
+ this.root = root;
+ }
+
+ public static JSONWalk on(JSONValue root)
+ {
+ return new JSONWalk(root);
+ }
+
+ public JSONWrapper next(String name)
+ {
+ if(null==root || root.isObject()==null) return null;
+ JSONObject rootObject = root.isObject();
+
+ JSONWrapper match = null;
+ Iterator it = rootObject.keySet().iterator();
+ while(it.hasNext())
+ {
+ String s = (String)it.next();
+ JSONValue child = rootObject.get(s);
+ if(name.equals(s))
+ {
+ match = new JSONWrapper(child);
+ break;
+ }
+ else
+ {
+ match = JSONWalk.on(child).next(name);
+ }
+ }
+
+ return match;
+ }
+
+ public class JSONWrapper
+ {
+
+ private JSONValue value;
+
+ public JSONWrapper(JSONValue value)
+ {
+ this.value = value;
+ }
+
+ public int asInt()
+ {
+ if(value.isNumber()!=null)
+ {
+ return new Double(value.isNumber().getValue()).intValue();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Not a number: " + value);
+ }
+ }
+
+ public double asDouble()
+ {
+ if(value.isNumber()!=null)
+ {
+ return value.isNumber().getValue();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Not a number: " + value);
+ }
+ }
+
+ public String asString()
+ {
+ if(value.isString()!=null)
+ {
+ return value.isString().stringValue();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Not a string: " + value);
+ }
+ }
+
+ public boolean asBool()
+ {
+ if(value.isBoolean()!=null)
+ {
+ return value.isBoolean().booleanValue();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Not a boolean: " + value);
+ }
+ }
+
+ public JSONArray asArray()
+ {
+ if(value.isArray()!=null)
+ {
+ return value.isArray();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Not a number: " + value);
+ }
+ }
+
+ public JSONObject asObject()
+ {
+ if(value.isObject()!=null)
+ {
+ return value.isObject();
+ }
+ else
+ {
+ throw new IllegalArgumentException("Not an object: " + value);
+ }
+ }
+
+
+ public String toString() throws JSONException
+ {
+ return value.toString();
+ }
+ }
+}
Property changes on: jbpm3/trunk/modules/gwt-console/war/src/main/java/org/jboss/bpm/console/client/util/JSONWalk.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css
===================================================================
--- jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-10-10 16:20:55 UTC (rev 2531)
+++ jbpm3/trunk/modules/gwt-console/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-10-13 17:06:31 UTC (rev 2532)
@@ -1,6 +1,6 @@
.bpm-layout {
border: 1px solid green;
- margin: 10px;
+ margin: 10px;
}
.bpm-header {
@@ -27,11 +27,11 @@
}
.bpm-EvenRow {
- background-color: #f0f4f8;
+ background-color: #f0f4f8;
}
.bpm-FieldValue {
-
+
}
.bpm-EditorHeader {
@@ -61,41 +61,77 @@
}
.bpm-help-icon {
- background-image: url( images/icons/14.png)
+ background-image: url( images/icons/14.png)
}
.bpm-metric-icon {
- background-image: url( images/icons/31.png)
+ background-image: url( images/icons/31.png)
}
.bpm-process-icon {
- background-image: url( images/icons/41.png)
+ background-image: url( images/icons/41.png)
}
.bpm-task-icon {
- background-image: url( images/icons/29.png)
+ background-image: url( images/icons/29.png)
}
.bpm-instance-icon {
- background-image: url( images/icons/05_1.png)
+ background-image: url( images/icons/05_1.png)
}
.bpm-settings-icon {
- background-image: url( images/icons/36.png)
+ background-image: url( images/icons/36.png)
}
.bpm-switch-context-icon {
- background-image: url( images/icons/13.png)
+ background-image: url( images/icons/13.png)
}
.bpm-comment-icon {
- background-image: url( images/icons/27.png)
+ background-image: url( images/icons/27.png)
}
.bpm-enalrge-icon {
- background-image: url( images/icons/49.png)
+ background-image: url( images/icons/49.png)
}
.login-panel-content {
text-align: center;
+}
+
+
+div.activeNode {
+ position:absolute;
+ border-width:1px;
+ border-style:solid;
+ border-color:#6699CC;
+}
+
+div.activeNode-header {
+ position:absolute;
+ overflow:hidden;
+}
+
+div.activeNode-header-link {
+ cursor:default;
+ font-family:sans-serif;
+ font-size:10px;
+ white-space:nowrap;
+ color:#ffffff;
+ padding-left:3px;
+ padding-right:3px;
+ border-width:1px;
+ border-style:solid;
+ border-color:#6699CC;
+ background-color:#6699CC;
+}
+
+div.activeNode-header-link a {
+ color:#ffffff;
+ text-decoration:none;
+}
+
+div.activeNode-header-link a:hover {
+ text-decoration:underline;
}
\ No newline at end of file
17 years, 6 months
- 1
- 0
JBoss JBPM SVN: r2531 - in projects/spec/trunk/modules/dialects: api10/src/main/java/org/jbpm and 20 other directories.
by do-not-reply＠jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-10-10 12:20:55 -0400 (Fri, 10 Oct 2008)
New Revision: 2531
Added:
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/
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/
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/
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/ProcessDefinitionAdapter.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessUnmarshaller.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/
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/ProcessUnmarshaller.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Activity.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ActivityType.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Artifact.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ArtifactsContainer.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Association.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/BpmnDiagram.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/DataObject.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Graph.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Group.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Identifiable.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/IdentifiableNode.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Lane.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/MessagingEdge.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/NamedBpmnObject.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ObjectFactory.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Pool.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SequenceEdge.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SequenceFlowConditionType.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SubProcess.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/TextAnnotation.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Vertex.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/package-info.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/
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/ProcessUnmarshaller.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/
Removed:
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/
Modified:
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBActivity.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBAssignment.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBBPMNElement.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBCancelEventDetail.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBCompensationEventDetail.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBComplexGateway.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBConditionalEventDetail.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBEndEvent.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBErrorEventDetail.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBEvent.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBEventDetail.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExclusiveGateway.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExecutionHandler.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBFlow.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBFlowHandler.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBFlowObject.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGateway.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGraphicalElement.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBHandler.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBInclude.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBInclusiveGateway.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBInputSet.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBIntermediateEvent.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessage.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessageEventDetail.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessageFlow.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessageRef.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBOutputSet.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBParallelGateway.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBProcess.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBProperty.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSequenceFlow.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignal.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignalEventDetail.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignalHandler.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBStartEvent.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSubProcess.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSupportingElement.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/JAXBTerminateEventDetail.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTimerEventDetail.java
projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/ObjectFactory.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/model/BindingType.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/BooleanType.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/ConfigType.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/Delegation.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Action.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Assignment.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32CancelTimer.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32CreateTimer.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Decision.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32EndState.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Event.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Fork.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Join.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Mail.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32MailNode.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Node.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32ProcessState.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Script.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32StartState.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32State.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32SuperState.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Swimlane.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Task.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32TaskNode.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Timer.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Transition.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Variable.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/ObjectFactory.java
projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/package-info.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EAnnotation.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EAttribute.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EClass.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EClassifier.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EDataType.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EEnum.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EEnumLiteral.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EFactory.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EModelElement.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/ENamedElement.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EObject.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EOperation.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EPackage.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EParameter.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EReference.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EStringToStringMapEntry.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EStructuralFeature.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/ETypedElement.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/ObjectFactory.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/package-info.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Add.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Any.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Delete.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Difference.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Documentation.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Extension.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Import.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/MetaModel.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Model.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/ObjectFactory.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/PackageReference.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Replace.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/XMI.java
projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/package-info.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/ApplicationType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/ExpressionType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/MessageType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/ObjectFactory.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/PackageType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivities.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivity.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivitySet.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivitySets.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActualParameters.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLApplication.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLApplications.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArrayType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArtifact.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArtifactInput.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArtifacts.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssignment.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssignments.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssociation.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssociations.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAuthor.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLBasicType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLBlockActivity.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCategories.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCategory.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCodepage.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCondition.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLConformanceClass.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLConnectorGraphicsInfo.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLConnectorGraphicsInfos.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCoordinates.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCost.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCostStructure.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCostUnit.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCountrykey.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCreated.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataField.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataFields.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataMapping.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataMappings.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataObject.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDeadline.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDeclaredType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDescription.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDocumentation.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDuration.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEndEvent.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEndPoint.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEnumerationType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEnumerationValue.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEvent.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExtendedAttribute.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExtendedAttributes.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExternalPackage.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExternalPackages.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExternalReference.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLFormalParameter.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLFormalParameters.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLGroup.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLIORules.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLIcon.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLImplementation.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLInput.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLInputSet.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLInputSets.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLIntermediateEvent.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLJoin.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLane.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLanes.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLayoutInfo.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLength.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLimit.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLListType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLoop.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLoopMultiInstance.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLoopStandard.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLMember.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLMessageFlow.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLMessageFlows.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLModificationDate.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLNo.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLNodeGraphicsInfo.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLNodeGraphicsInfos.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLObject.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLOutput.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLOutputSet.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLOutputSets.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPackageHeader.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPage.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPages.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLParticipant.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLParticipantType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLParticipants.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLink.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLinkType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLinkTypes.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLinks.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPerformer.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPerformers.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPool.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPools.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPrecision.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPriority.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPriorityUnit.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLProcessHeader.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPropertyInput.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRecordType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRedefinableHeader.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLReference.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResourceCosts.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResponsible.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResponsibles.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResultError.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResultMultiple.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRoute.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRule.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLScale.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSchemaType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLScript.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSimulationInformation.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSplit.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLStartEvent.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSubFlow.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTask.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskApplication.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskManual.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskReceive.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskReference.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskScript.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskSend.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskService.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskUser.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTimeEstimation.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransaction.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransition.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRef.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRefs.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRestriction.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRestrictions.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitions.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerConditional.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerIntermediateMultiple.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerMultiple.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultCompensation.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultLink.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultMessage.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultSignal.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerTimer.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTypeDeclaration.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTypeDeclarations.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLUnionType.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLValidFrom.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLValidTo.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVendor.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVendorExtension.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVendorExtensions.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVersion.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWaitingTime.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWebServiceFaultCatch.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWebServiceOperation.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWorkflowProcess.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWorkflowProcesses.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWorkingTime.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLXPDLVersion.java
projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/package-info.java
Log:
Change package to org.jbpm...
Copied: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java (from rev 2529, projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/DialectHandlerImpl.java)
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java (rev 0)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/DialectHandlerImpl.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,101 @@
+/*
+ * 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.dialect.api10;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.Writer;
+import java.net.URI;
+import java.net.URL;
+
+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;
+
+/**
+ * The DialectHandler converts a supported dialect to the internal Process model.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Jun-2008
+ */
+public class DialectHandlerImpl implements DialectHandler
+{
+ @Override
+ public URI getNamespaceURI()
+ {
+ return DEFAULT_NAMESPACE_URI;
+ }
+
+ @Override
+ public ProcessDefinition createProcessDefinition(String pXML)
+ {
+ try
+ {
+ ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+ ProcessDefinition procDef = unmarschaller.unmarshallProcess(new StringReader(pXML));
+ return procDef;
+ }
+ catch (JAXBException ex)
+ {
+ throw new InvalidProcessException("Cannot unmarschall: " + pXML, ex);
+ }
+ catch (IOException ex)
+ {
+ throw new InvalidProcessException("Cannot unmarschall: " + pXML, ex);
+ }
+ }
+
+ @Override
+ public ProcessDefinition createProcessDefinition(URL pURL) throws IOException
+ {
+ try
+ {
+ ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+ ProcessDefinition procDef = unmarschaller.unmarshallProcess(new InputStreamReader(pURL.openStream()));
+ return procDef;
+ }
+ catch (JAXBException ex)
+ {
+ throw new InvalidProcessException("Cannot unmarschall: " + pURL, ex);
+ }
+ }
+
+ public void marshallProcess(Process proc, Writer out) throws IOException
+ {
+ try
+ {
+ new ProcessMarshaller().marshallProcess(proc, out);
+ }
+ catch (JAXBException ex)
+ {
+ IOException ioex = new IOException("Cannot marschall: " + proc);
+ ioex.initCause(ex);
+ throw ioex;
+ }
+ }
+}
\ No newline at end of file
Copied: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java (from rev 2529, projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessMarshaller.java)
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java (rev 0)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessMarshaller.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,479 @@
+/*
+ * 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.dialect.api10;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Marshaller;
+
+import org.jbpm.api.NotImplementedException;
+import org.jbpm.api.model.Assignment;
+import org.jbpm.api.model.ComplexGateway;
+import org.jbpm.api.model.EndEvent;
+import org.jbpm.api.model.Event;
+import org.jbpm.api.model.ExclusiveGateway;
+import org.jbpm.api.model.Expression;
+import org.jbpm.api.model.Gateway;
+import org.jbpm.api.model.InclusiveGateway;
+import org.jbpm.api.model.InputSet;
+import org.jbpm.api.model.Message;
+import org.jbpm.api.model.Node;
+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.Property;
+import org.jbpm.api.model.ReceiveTask;
+import org.jbpm.api.model.SendTask;
+import org.jbpm.api.model.SequenceFlow;
+import org.jbpm.api.model.Signal;
+import org.jbpm.api.model.StartEvent;
+import org.jbpm.api.model.Task;
+import org.jbpm.api.model.Event.EventDetailType;
+import org.jbpm.api.model.SequenceFlow.ConditionType;
+import org.jbpm.api.runtime.ExecutionHandler;
+import org.jbpm.api.runtime.FlowHandler;
+import org.jbpm.api.runtime.SignalHandler;
+import org.jbpm.dialect.api10.model.JAXBAssignment;
+import org.jbpm.dialect.api10.model.JAXBComplexGateway;
+import org.jbpm.dialect.api10.model.JAXBEndEvent;
+import org.jbpm.dialect.api10.model.JAXBEvent;
+import org.jbpm.dialect.api10.model.JAXBExclusiveGateway;
+import org.jbpm.dialect.api10.model.JAXBExecutionHandler;
+import org.jbpm.dialect.api10.model.JAXBExpression;
+import org.jbpm.dialect.api10.model.JAXBFlow;
+import org.jbpm.dialect.api10.model.JAXBFlowHandler;
+import org.jbpm.dialect.api10.model.JAXBFlowObject;
+import org.jbpm.dialect.api10.model.JAXBGateway;
+import org.jbpm.dialect.api10.model.JAXBInclusiveGateway;
+import org.jbpm.dialect.api10.model.JAXBInputSet;
+import org.jbpm.dialect.api10.model.JAXBMessage;
+import org.jbpm.dialect.api10.model.JAXBMessageEventDetail;
+import org.jbpm.dialect.api10.model.JAXBMessageRef;
+import org.jbpm.dialect.api10.model.JAXBOutputSet;
+import org.jbpm.dialect.api10.model.JAXBParallelGateway;
+import org.jbpm.dialect.api10.model.JAXBProcess;
+import org.jbpm.dialect.api10.model.JAXBProperty;
+import org.jbpm.dialect.api10.model.JAXBSequenceFlow;
+import org.jbpm.dialect.api10.model.JAXBSignal;
+import org.jbpm.dialect.api10.model.JAXBSignalEventDetail;
+import org.jbpm.dialect.api10.model.JAXBSignalHandler;
+import org.jbpm.dialect.api10.model.JAXBStartEvent;
+import org.jbpm.dialect.api10.model.JAXBTask;
+import org.jbpm.dialect.api10.model.ObjectFactory;
+
+/**
+ * A JAXB marshaller for a Process
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public class ProcessMarshaller
+{
+ public void marshallProcess(Process proc, Writer out) throws JAXBException, IOException
+ {
+ JAXBProcess jaxbProc = adaptProcess(proc);
+ JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
+ Marshaller marshaller = jaxbContext.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+ marshaller.setProperty(Marshaller.JAXB_FRAGMENT, true);
+
+ marshaller.marshal(jaxbProc, out);
+ }
+
+ private JAXBProcess adaptProcess(Process proc)
+ {
+ JAXBProcess jaxbProc = new JAXBProcess();
+ jaxbProc.setName(proc.getName());
+
+ for (Message msg : proc.getMessages())
+ {
+ JAXBMessage jaxbMsg = adaptMessage(msg);
+ jaxbProc.getMessages().add(jaxbMsg);
+ }
+ for (Property prop : proc.getProperties())
+ {
+ JAXBProperty jaxbProp = getJaxbProperty(prop);
+ jaxbProc.getProperties().add(jaxbProp);
+ }
+ for (Assignment ass : proc.getAssignments())
+ {
+ JAXBAssignment jaxbAss = getJaxbAssignment(ass);
+ jaxbProc.getAssignments().add(jaxbAss);
+ }
+
+ for (Node flowObject : proc.getNodes())
+ {
+ JAXBFlowObject jaxbNode;
+ if (flowObject instanceof Event)
+ {
+ jaxbNode = adaptEvent(jaxbProc, (Event)flowObject);
+ }
+ else if (flowObject instanceof Task)
+ {
+ jaxbNode = adaptTask(jaxbProc, (Task)flowObject);
+ }
+ else if (flowObject instanceof Gateway)
+ {
+ jaxbNode = adaptGateway(jaxbProc, (Gateway)flowObject);
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported flow object: " + flowObject);
+ }
+
+ for (Assignment ass : flowObject.getAssignments())
+ {
+ JAXBAssignment jaxbAss = getJaxbAssignment(ass);
+ jaxbNode.getAssignments().add(jaxbAss);
+ }
+
+ jaxbProc.getFlowObjects().add(jaxbNode);
+ }
+ return jaxbProc;
+ }
+
+ private JAXBFlowObject adaptEvent(JAXBProcess jaxbProc, Event event)
+ {
+ JAXBEvent jaxbEvent;
+ if (event instanceof StartEvent)
+ {
+ StartEvent start = (StartEvent)event;
+ JAXBStartEvent jaxbStart = new JAXBStartEvent();
+ jaxbStart.setName(start.getName());
+ jaxbStart.setOutFlow(getJAXBFlow(start.getOutFlow()));
+
+ EventDetailType detailType = start.getDetailType();
+
+ // if (start.getTriggerType().size() > 1)
+ // throw new NotImplementedException("JBPM-1660", "StartTrigger Multiple");
+
+ if (detailType == EventDetailType.Message)
+ {
+ throw new NotImplementedException("JBPM-1657", "StartTrigger Message");
+ }
+ else if (detailType == EventDetailType.Timer)
+ {
+ throw new NotImplementedException("JBPM-1658", "StartTrigger Timer");
+ }
+ else if (detailType == EventDetailType.Rule)
+ {
+ throw new NotImplementedException("JBPM-1659", "StartTrigger Conditional");
+ }
+ else if (detailType == EventDetailType.Signal)
+ {
+ Signal signal = start.getSignalRef();
+ JAXBSignalEventDetail jaxbTrigger = new JAXBSignalEventDetail();
+ jaxbTrigger.setSignal(new JAXBSignal(signal.getSignalType(), signal.getMessage()));
+ jaxbStart.getTrigger().add(jaxbTrigger);
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported start trigger: " + detailType);
+ }
+ jaxbEvent = jaxbStart;
+ }
+ else if (event instanceof EndEvent)
+ {
+ EndEvent end = (EndEvent)event;
+ JAXBEndEvent jaxbEnd = new JAXBEndEvent();
+ jaxbEnd.setName(end.getName());
+
+ EventDetailType detailType = end.getDetailType();
+ // if (end.getResult().size() > 1)
+ // throw new NotImplementedException("JBPM-1683", "EndEvent Multiple Result");
+
+ if (detailType == EventDetailType.Message)
+ {
+ Message message = end.getMessageRef();
+ JAXBMessageRef jaxbMessageRef = adaptMessageRef(jaxbProc, message);
+ JAXBMessageEventDetail jaxbResult = new JAXBMessageEventDetail();
+ jaxbResult.setMessageRef(jaxbMessageRef);
+ jaxbEnd.getResult().add(jaxbResult);
+ }
+ else if (detailType == EventDetailType.Error)
+ {
+ throw new NotImplementedException("JBPM-1677", "EndEvent Error Result");
+ }
+ else if (detailType == EventDetailType.Cancel)
+ {
+ throw new NotImplementedException("JBPM-1678", "EndEvent Cancel Result");
+ }
+ else if (detailType == EventDetailType.Compensation)
+ {
+ throw new NotImplementedException("JBPM-1679", "EndEvent Compensation Result");
+ }
+ else if (detailType == EventDetailType.Signal)
+ {
+ throw new NotImplementedException("JBPM-1651", "EndEvent Signal Result");
+ }
+ else if (detailType == EventDetailType.Terminate)
+ {
+ throw new NotImplementedException("JBPM-1680", "EndEvent Terminate Result");
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported end event result type: " + detailType);
+ }
+
+ jaxbEvent = jaxbEnd;
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported Event: " + event);
+ }
+ jaxbEvent.setExecutionHandler(getJAXBExecutionHandler(event, event.getExecutionHandler()));
+ jaxbEvent.setFlowHandler(getJAXBFlowHandler(event, event.getFlowHandler()));
+ jaxbEvent.setSignalHandler(getJAXBSignalHandler(event, event.getSignalHandler()));
+ return jaxbEvent;
+ }
+
+ private JAXBFlowObject adaptTask(JAXBProcess jaxbProc, Task task)
+ {
+ JAXBTask jaxbTask = new JAXBTask();
+ jaxbTask.setTaskType(task.getTaskType());
+ jaxbTask.setName(task.getName());
+ jaxbTask.setOutFlow(getJAXBFlow(task.getOutFlow()));
+ jaxbTask.setExecutionHandler(getJAXBExecutionHandler(task, task.getExecutionHandler()));
+ jaxbTask.setFlowHandler(getJAXBFlowHandler(task, task.getFlowHandler()));
+ jaxbTask.setSignalHandler(getJAXBSignalHandler(task, task.getSignalHandler()));
+ for (InputSet inSet : task.getInputSets())
+ {
+ JAXBInputSet jaxbSet = new JAXBInputSet();
+ for (Property prop : inSet.getProperties())
+ {
+ JAXBProperty jaxbProp = getJaxbProperty(prop);
+ jaxbSet.getProperties().add(jaxbProp);
+ }
+ jaxbTask.getInputSets().add(jaxbSet);
+ }
+ for (OutputSet outSet : task.getOutputSets())
+ {
+ JAXBOutputSet jaxbSet = new JAXBOutputSet();
+ for (Property prop : outSet.getProperties())
+ {
+ JAXBProperty jaxbProp = getJaxbProperty(prop);
+ jaxbSet.getProperties().add(jaxbProp);
+ }
+ jaxbTask.getOutputSets().add(jaxbSet);
+ }
+ for (Property prop : task.getProperties())
+ {
+ JAXBProperty jaxbProp = getJaxbProperty(prop);
+ jaxbTask.getProperties().add(jaxbProp);
+ }
+ if (task instanceof ReceiveTask)
+ {
+ ReceiveTask recTask = (ReceiveTask)task;
+ Message messageRef = recTask.getMessageRef();
+ if (messageRef != null)
+ {
+ JAXBMessageRef jaxbMessageRef = adaptMessageRef(jaxbProc, messageRef);
+ jaxbTask.setMessageRef(jaxbMessageRef);
+ }
+ }
+ else if (task instanceof SendTask)
+ {
+ SendTask sendTask = (SendTask)task;
+ Message messageRef = sendTask.getMessageRef();
+ if (messageRef != null)
+ {
+ JAXBMessageRef jaxbMessageRef = adaptMessageRef(jaxbProc, messageRef);
+ jaxbTask.setMessageRef(jaxbMessageRef);
+ }
+ }
+ return jaxbTask;
+ }
+
+ private JAXBFlowObject adaptGateway(JAXBProcess jaxbProc, Gateway gateway)
+ {
+ JAXBGateway jaxbGateway;
+ if (gateway instanceof ExclusiveGateway)
+ {
+ jaxbGateway = new JAXBExclusiveGateway();
+ }
+ else if (gateway instanceof InclusiveGateway)
+ {
+ jaxbGateway = new JAXBInclusiveGateway();
+ }
+ else if (gateway instanceof ParallelGateway)
+ {
+ jaxbGateway = new JAXBParallelGateway();
+ }
+ else if (gateway instanceof ComplexGateway)
+ {
+ jaxbGateway = new JAXBComplexGateway();
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported gateway: " + gateway);
+ }
+ jaxbGateway.setName(gateway.getName());
+ jaxbGateway.setExecutionHandler(getJAXBExecutionHandler(gateway, gateway.getExecutionHandler()));
+ jaxbGateway.setFlowHandler(getJAXBFlowHandler(gateway, gateway.getFlowHandler()));
+ jaxbGateway.setSignalHandler(getJAXBSignalHandler(gateway, gateway.getSignalHandler()));
+ for (SequenceFlow gate : gateway.getGates())
+ {
+ SequenceFlow flow = gate;
+ jaxbGateway.getOutFlows().add(getJAXBFlow(flow));
+ }
+ return jaxbGateway;
+ }
+
+ private JAXBMessageRef adaptMessageRef(JAXBProcess jaxbProc, Message msgRef)
+ {
+ String msgName = msgRef.getName();
+ JAXBMessage jaxbMsg = jaxbProc.getMessageByName(msgName);
+ JAXBMessageRef jaxbMsgRef = new JAXBMessageRef();
+ jaxbMsgRef.setNameRef(msgName);
+
+ String fromStr = getParticipant(msgRef.getFromRef());
+ if (fromStr != null && fromStr.equals(jaxbMsg.getFromRef()) == false)
+ jaxbMsgRef.setFromRef(fromStr);
+
+ String toStr = getParticipant(msgRef.getToRef());
+ if (toStr != null && toStr.equals(jaxbMsg.getToRef()) == false)
+ jaxbMsgRef.setToRef(toStr);
+
+ return jaxbMsgRef;
+ }
+
+ private JAXBMessage adaptMessage(Message msg)
+ {
+ JAXBMessage jaxbMsg = new JAXBMessage();
+ jaxbMsg.setName(msg.getName());
+ jaxbMsg.setFromRef(getParticipant(msg.getFromRef()));
+ jaxbMsg.setToRef(getParticipant(msg.getToRef()));
+ for (Property prop : msg.getProperties())
+ {
+ JAXBProperty jaxbProp = getJaxbProperty(prop);
+ jaxbMsg.getProperties().add(jaxbProp);
+ }
+ return jaxbMsg;
+ }
+
+ private String getParticipant(Participant par)
+ {
+ String parName = par.getName().getCanonicalName();
+ return parName;
+ }
+
+ private JAXBFlow getJAXBFlow(SequenceFlow flow)
+ {
+ JAXBFlow jaxb;
+ if (flow instanceof SequenceFlow)
+ {
+ SequenceFlow seqFlow = (SequenceFlow)flow;
+ JAXBSequenceFlow jaxbSeq = new JAXBSequenceFlow();
+ if (seqFlow.getConditionType() == ConditionType.Expression)
+ {
+ jaxbSeq.setConditionType(seqFlow.getConditionType());
+ jaxbSeq.setCondition(getJAXBExpression(seqFlow.getConditionExpression()));
+ }
+ else if (seqFlow.getConditionType() == ConditionType.Default)
+ {
+ jaxbSeq.setConditionType(seqFlow.getConditionType());
+ }
+ jaxb = jaxbSeq;
+ }
+ else
+ {
+ throw new NotImplementedException("JBPM-1382", "Message Flow");
+ }
+ jaxb.setTargetName(flow.getTargetName());
+ return jaxb;
+ }
+
+ private JAXBProperty getJaxbProperty(Property prop)
+ {
+ JAXBProperty jaxbProp = new JAXBProperty();
+ jaxbProp.setName(prop.getName());
+ jaxbProp.setValue((String)prop.getValue());
+ if (prop.isCorrelation())
+ jaxbProp.setCorrelation(prop.isCorrelation());
+ return jaxbProp;
+ }
+
+ private JAXBExpression getJAXBExpression(Expression expr)
+ {
+ JAXBExpression jaxb = new JAXBExpression();
+ jaxb.setLang(expr.getExpressionLanguage());
+ jaxb.setBody(expr.getExpressionBody());
+ return jaxb;
+ }
+
+ private JAXBAssignment getJaxbAssignment(Assignment ass)
+ {
+ JAXBAssignment jaxbAss = new JAXBAssignment();
+ jaxbAss.setAssignTime(ass.getAssignTime());
+ jaxbAss.setFrom(getJAXBExpression(ass.getFrom()));
+ jaxbAss.setTo(ass.getTo().getName());
+ return jaxbAss;
+ }
+
+ private JAXBExecutionHandler getJAXBExecutionHandler(Node fo, ExecutionHandler handler)
+ {
+ JAXBExecutionHandler jaxb = null;
+ if (handler != null)
+ {
+ if (fo.getClass().getPackage() != handler.getClass().getPackage())
+ {
+ jaxb = new JAXBExecutionHandler();
+ jaxb.setClassName(handler.getClass().getName());
+ }
+ }
+ return jaxb;
+ }
+
+ private JAXBFlowHandler getJAXBFlowHandler(Node fo, FlowHandler handler)
+ {
+ JAXBFlowHandler jaxb = null;
+ if (handler != null)
+ {
+ if (fo.getClass().getPackage() != handler.getClass().getPackage())
+ {
+ jaxb = new JAXBFlowHandler();
+ jaxb.setClassName(handler.getClass().getName());
+ }
+ }
+ return jaxb;
+ }
+
+ private JAXBSignalHandler getJAXBSignalHandler(Node fo, SignalHandler handler)
+ {
+ JAXBSignalHandler jaxb = null;
+ if (handler != null)
+ {
+ if (fo.getClass().getPackage() != handler.getClass().getPackage())
+ {
+ jaxb = new JAXBSignalHandler();
+ jaxb.setClassName(handler.getClass().getName());
+ }
+ }
+ return jaxb;
+ }
+}
Copied: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java (from rev 2529, projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/ProcessUnmarshaller.java)
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java (rev 0)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/ProcessUnmarshaller.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,410 @@
+/*
+ * 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.dialect.api10;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.Reader;
+
+import javax.management.ObjectName;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import org.jbpm.api.NotImplementedException;
+import org.jbpm.api.model.Gateway;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.SequenceFlow.ConditionType;
+import org.jbpm.api.model.Task.TaskType;
+import org.jbpm.api.model.builder.EventBuilder;
+import org.jbpm.api.model.builder.GatewayBuilder;
+import org.jbpm.api.model.builder.MessageBuilder;
+import org.jbpm.api.model.builder.ObjectNameFactory;
+import org.jbpm.api.model.builder.ProcessBuilder;
+import org.jbpm.api.model.builder.TaskBuilder;
+import org.jbpm.api.runtime.ExecutionHandler;
+import org.jbpm.api.runtime.FlowHandler;
+import org.jbpm.api.runtime.NodeHandler;
+import org.jbpm.api.runtime.SignalHandler;
+import org.jbpm.api.service.ProcessBuilderService;
+import org.jbpm.dialect.api10.model.JAXBAssignment;
+import org.jbpm.dialect.api10.model.JAXBCancelEventDetail;
+import org.jbpm.dialect.api10.model.JAXBCompensationEventDetail;
+import org.jbpm.dialect.api10.model.JAXBComplexGateway;
+import org.jbpm.dialect.api10.model.JAXBConditionalEventDetail;
+import org.jbpm.dialect.api10.model.JAXBEndEvent;
+import org.jbpm.dialect.api10.model.JAXBErrorEventDetail;
+import org.jbpm.dialect.api10.model.JAXBEvent;
+import org.jbpm.dialect.api10.model.JAXBEventDetail;
+import org.jbpm.dialect.api10.model.JAXBExclusiveGateway;
+import org.jbpm.dialect.api10.model.JAXBExpression;
+import org.jbpm.dialect.api10.model.JAXBFlow;
+import org.jbpm.dialect.api10.model.JAXBFlowObject;
+import org.jbpm.dialect.api10.model.JAXBGateway;
+import org.jbpm.dialect.api10.model.JAXBHandler;
+import org.jbpm.dialect.api10.model.JAXBInclusiveGateway;
+import org.jbpm.dialect.api10.model.JAXBInputSet;
+import org.jbpm.dialect.api10.model.JAXBIntermediateEvent;
+import org.jbpm.dialect.api10.model.JAXBMessage;
+import org.jbpm.dialect.api10.model.JAXBMessageEventDetail;
+import org.jbpm.dialect.api10.model.JAXBMessageFlow;
+import org.jbpm.dialect.api10.model.JAXBMessageRef;
+import org.jbpm.dialect.api10.model.JAXBOutputSet;
+import org.jbpm.dialect.api10.model.JAXBParallelGateway;
+import org.jbpm.dialect.api10.model.JAXBProcess;
+import org.jbpm.dialect.api10.model.JAXBProperty;
+import org.jbpm.dialect.api10.model.JAXBSequenceFlow;
+import org.jbpm.dialect.api10.model.JAXBSignal;
+import org.jbpm.dialect.api10.model.JAXBSignalEventDetail;
+import org.jbpm.dialect.api10.model.JAXBStartEvent;
+import org.jbpm.dialect.api10.model.JAXBTask;
+import org.jbpm.dialect.api10.model.JAXBTerminateEventDetail;
+import org.jbpm.dialect.api10.model.JAXBTimerEventDetail;
+import org.jbpm.dialect.api10.model.ObjectFactory;
+
+/**
+ * A JAXB unmarshaller for a Process
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public class ProcessUnmarshaller
+{
+ public ProcessDefinition unmarshallProcess(Reader xml) throws JAXBException, IOException
+ {
+ JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ unmarshaller.setProperty("com.sun.xml.bind.ObjectFactory", new ObjectFactory());
+ JAXBProcess jaxbProc = (JAXBProcess)unmarshaller.unmarshal(xml);
+ ProcessDefinition procDef = adaptProcess(jaxbProc);
+ return procDef;
+ }
+
+ private ProcessDefinition adaptProcess(JAXBProcess jaxbProc) throws IOException
+ {
+ ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder();
+ procBuilder.addProcess(jaxbProc.getName());
+
+ // Process Messages
+ for (JAXBMessage jaxb : jaxbProc.getMessages())
+ {
+ MessageBuilder msgBuilder = procBuilder.addProcessMessage(jaxb.getName());
+ adaptJAXBMessage(msgBuilder, jaxb);
+ }
+
+ // Process Properties
+ for (JAXBProperty jaxbProp : jaxbProc.getProperties())
+ {
+ procBuilder.addProcessProperty(jaxbProp.getName(), jaxbProp.getValue());
+ }
+
+ // Process Assignments
+ for (JAXBAssignment jaxbAss : jaxbProc.getAssignments())
+ {
+ JAXBExpression jaxbFrom = jaxbAss.getFrom();
+ String jaxbTo = jaxbAss.getTo();
+ procBuilder.addProcessAssignment(jaxbAss.getAssignTime(), jaxbFrom.getLang(), jaxbFrom.getBody(), jaxbTo);
+ }
+
+ // Process FlowObjects
+ for (JAXBFlowObject jaxbFlowObject : jaxbProc.getFlowObjects())
+ {
+ if (jaxbFlowObject instanceof JAXBEvent)
+ {
+ adaptJAXBEvent(procBuilder, jaxbProc, (JAXBEvent)jaxbFlowObject);
+ }
+ else if (jaxbFlowObject instanceof JAXBTask)
+ {
+ adaptTask(procBuilder, jaxbProc, (JAXBTask)jaxbFlowObject);
+ }
+ else if (jaxbFlowObject instanceof JAXBGateway)
+ {
+ adaptJAXBGateway(procBuilder, jaxbProc, (JAXBGateway)jaxbFlowObject);
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported flow object: " + jaxbFlowObject);
+ }
+
+ // FlowObject Assignments
+ for (JAXBAssignment jaxbAss : jaxbFlowObject.getAssignments())
+ {
+ JAXBExpression jaxbFrom = jaxbAss.getFrom();
+ String jaxbTo = jaxbAss.getTo();
+ procBuilder.addNodeAssignment(jaxbAss.getAssignTime(), jaxbFrom.getLang(), jaxbFrom.getBody(), jaxbTo);
+ }
+ }
+
+ ProcessDefinition procDef = procBuilder.getProcessDefinition();
+ return procDef;
+ }
+
+ private void adaptJAXBMessage(MessageBuilder msgBuilder, JAXBMessage jaxbMsg)
+ {
+ String fromRef = jaxbMsg.getFromRef();
+ if (fromRef != null)
+ msgBuilder.addFromRef(getObjectName(fromRef));
+
+ String toRef = jaxbMsg.getToRef();
+ if (toRef != null)
+ msgBuilder.addToRef(getObjectName(toRef));
+
+ for (JAXBProperty jaxbProp : jaxbMsg.getProperties())
+ {
+ boolean isCorrelation = jaxbProp.isCorrelation() != null ? jaxbProp.isCorrelation() : false;
+ msgBuilder.addProperty(jaxbProp.getName(), jaxbProp.getValue(), isCorrelation);
+ }
+ }
+
+ private ObjectName getObjectName(String objName)
+ {
+ return ObjectNameFactory.create(objName);
+ }
+
+ private void adaptJAXBEvent(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBEvent jaxb)
+ {
+ if (jaxb instanceof JAXBStartEvent)
+ {
+ JAXBStartEvent jaxbStart = (JAXBStartEvent)jaxb;
+ EventBuilder eventBuilder = procBuilder.addStartEvent(jaxbStart.getName());
+ addOutFlow(procBuilder, jaxbStart.getOutFlow());
+
+ if (jaxbStart.getTrigger().size() > 1)
+ throw new NotImplementedException("JBPM-1660", "StartTrigger Multiple");
+
+ for (JAXBEventDetail jaxbTrigger : jaxbStart.getTrigger())
+ {
+ if (jaxbTrigger instanceof JAXBMessageEventDetail)
+ {
+ throw new NotImplementedException("JBPM-1657", "StartTrigger Message");
+ }
+ if (jaxbTrigger instanceof JAXBTimerEventDetail)
+ {
+ throw new NotImplementedException("JBPM-1658", "StartTrigger Timer");
+ }
+ if (jaxbTrigger instanceof JAXBConditionalEventDetail)
+ {
+ throw new NotImplementedException("JBPM-1659", "StartTrigger Conditional");
+ }
+ if (jaxbTrigger instanceof JAXBSignalEventDetail)
+ {
+ JAXBSignalEventDetail jaxbSignalTrigger = (JAXBSignalEventDetail)jaxbTrigger;
+ JAXBSignal jaxbSignal = jaxbSignalTrigger.getSignal();
+ eventBuilder.addSignalRef(jaxbSignal.getType(), jaxbSignal.getMessage());
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported start trigger: " + jaxbTrigger);
+ }
+ }
+ }
+ else if (jaxb instanceof JAXBIntermediateEvent)
+ {
+ throw new NotImplementedException("JBPM-1661", "IntermediateEvent");
+ }
+ else if (jaxb instanceof JAXBEndEvent)
+ {
+ JAXBEndEvent jaxbEnd = (JAXBEndEvent)jaxb;
+ EventBuilder eventBuilder = procBuilder.addEndEvent(jaxbEnd.getName());
+
+ if (jaxbEnd.getResult().size() > 1)
+ throw new NotImplementedException("JBPM-1683", "EndEvent Multiple Result");
+
+ for (JAXBEventDetail jaxbResult : jaxbEnd.getResult())
+ {
+ if (jaxbResult instanceof JAXBMessageEventDetail)
+ {
+ JAXBMessageEventDetail jaxbMessageResult = (JAXBMessageEventDetail)jaxbResult;
+ JAXBMessageRef jaxbMsg = jaxbMessageResult.getMessageRef();
+ eventBuilder.addMessageRef(jaxbMsg.getNameRef());
+ }
+ else if (jaxbResult instanceof JAXBErrorEventDetail)
+ {
+ throw new NotImplementedException("JBPM-1677", "EndEvent Error Result");
+ }
+ else if (jaxbResult instanceof JAXBCancelEventDetail)
+ {
+ throw new NotImplementedException("JBPM-1678", "EndEvent Cancel Result");
+ }
+ else if (jaxbResult instanceof JAXBCompensationEventDetail)
+ {
+ throw new NotImplementedException("JBPM-1679", "EndEvent Compensation Result");
+ }
+ else if (jaxbResult instanceof JAXBSignalEventDetail)
+ {
+ throw new NotImplementedException("JBPM-1651", "EndEvent Signal Result");
+ }
+ else if (jaxbResult instanceof JAXBTerminateEventDetail)
+ {
+ throw new NotImplementedException("JBPM-1680", "EndEvent Terminate Result");
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported end event result type: " + jaxbResult);
+ }
+ }
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported Event: " + jaxb);
+ }
+ procBuilder.addExecutionHandler(loadHandler(ExecutionHandler.class, jaxb.getExecutionHandler()));
+ procBuilder.addFlowHandler(loadHandler(FlowHandler.class, jaxb.getFlowHandler()));
+ procBuilder.addSignalHandler(loadHandler(SignalHandler.class, jaxb.getSignalHandler()));
+ }
+
+ private void adaptTask(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBTask jaxbTask)
+ {
+ TaskType taskType = jaxbTask.getTaskType();
+ TaskBuilder taskBuilder = procBuilder.addTask(jaxbTask.getName(), taskType);
+ addOutFlow(taskBuilder, jaxbTask.getOutFlow());
+
+ for (JAXBInputSet jaxbSet : jaxbTask.getInputSets())
+ {
+ taskBuilder.addInputSet();
+ for (JAXBProperty jaxbProp : jaxbSet.getProperties())
+ taskBuilder.addPropertyInput(jaxbProp.getName());
+ }
+
+ for (JAXBOutputSet jaxbSet : jaxbTask.getOutputSets())
+ {
+ taskBuilder.addOutputSet();
+ for (JAXBProperty jaxbProp : jaxbSet.getProperties())
+ taskBuilder.addPropertyOutput(jaxbProp.getName(), jaxbProp.getValue());
+ }
+
+ for (JAXBProperty jaxbProp : jaxbTask.getProperties())
+ {
+ taskBuilder.addNodeProperty(jaxbProp.getName(), jaxbProp.getValue());
+ }
+
+ JAXBMessageRef jaxbMsgRef = jaxbTask.getMessageRef();
+ if (jaxbMsgRef != null)
+ {
+ String msgName = jaxbMsgRef.getNameRef();
+ if (taskType == TaskType.Send)
+ taskBuilder.addOutMessageRef(msgName);
+ else if (taskType == TaskType.Receive)
+ taskBuilder.addInMessageRef(msgName);
+ }
+
+ procBuilder.addExecutionHandler(loadHandler(ExecutionHandler.class, jaxbTask.getExecutionHandler()));
+ procBuilder.addFlowHandler(loadHandler(FlowHandler.class, jaxbTask.getFlowHandler()));
+ procBuilder.addSignalHandler(loadHandler(SignalHandler.class, jaxbTask.getSignalHandler()));
+ }
+
+ private void adaptJAXBGateway(ProcessBuilder procBuilder, JAXBProcess jaxbProc, JAXBGateway jaxb)
+ {
+ GatewayBuilder gwBuilder;
+ if (jaxb instanceof JAXBExclusiveGateway)
+ {
+ gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Exclusive);
+ }
+ else if (jaxb instanceof JAXBInclusiveGateway)
+ {
+ gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Inclusive);
+ }
+ else if (jaxb instanceof JAXBComplexGateway)
+ {
+ gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Complex);
+ }
+ else if (jaxb instanceof JAXBParallelGateway)
+ {
+ gwBuilder = procBuilder.addGateway(jaxb.getName(), Gateway.GatewayType.Parallel);
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported gateway: " + jaxb);
+ }
+ for (JAXBFlow jaxbFlow : jaxb.getOutFlows())
+ {
+ if (jaxbFlow instanceof JAXBSequenceFlow)
+ {
+ JAXBSequenceFlow jaxbSeq = (JAXBSequenceFlow)jaxbFlow;
+ if (jaxbSeq.getConditionType() == ConditionType.Expression)
+ {
+ JAXBExpression jaxbExpr = jaxbSeq.getCondition();
+ gwBuilder.addConditionalGate(jaxbFlow.getTargetName(), jaxbExpr.getLang(), jaxbExpr.getBody());
+ }
+ else if (jaxbSeq.getConditionType() == ConditionType.Default)
+ {
+ gwBuilder.addDefaultGate(jaxbFlow.getTargetName());
+ }
+ else
+ {
+ gwBuilder.addGate(jaxbFlow.getTargetName());
+ }
+ }
+ else if (jaxbFlow instanceof JAXBMessageFlow)
+ {
+ throw new NotImplementedException("JBPM-1382", "Message Flow");
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported connectiong object: " + jaxbFlow);
+ }
+ }
+ procBuilder.addExecutionHandler(loadHandler(ExecutionHandler.class, jaxb.getExecutionHandler()));
+ procBuilder.addFlowHandler(loadHandler(FlowHandler.class, jaxb.getFlowHandler()));
+ procBuilder.addSignalHandler(loadHandler(SignalHandler.class, jaxb.getSignalHandler()));
+ }
+
+ private void addOutFlow(ProcessBuilder procBuilder, JAXBFlow jaxbFlow)
+ {
+ if (jaxbFlow != null)
+ {
+ if (jaxbFlow instanceof JAXBSequenceFlow)
+ {
+ procBuilder.addSequenceFlow(jaxbFlow.getTargetName());
+ }
+ else if (jaxbFlow instanceof JAXBMessageFlow)
+ {
+ throw new NotImplementedException("JBPM-1382", "Message Flow");
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported connectiong object: " + jaxbFlow);
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private <T extends NodeHandler> Class<T> loadHandler(Class<T> clazz, JAXBHandler jaxbHandler)
+ {
+ Class<T> handlerClass = null;
+ if (jaxbHandler != null)
+ {
+ String className = jaxbHandler.getClassName();
+ try
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ handlerClass = (Class<T>)ctxLoader.loadClass(className);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new IllegalStateException("Cannot load handler class: " + className);
+ }
+ }
+ return handlerClass;
+ }
+}
Copied: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model (from rev 2529, projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model)
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBActivity.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBActivity.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBActivity.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBAssignment.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBAssignment.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBAssignment.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBBPMNElement.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBBPMNElement.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBBPMNElement.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBCancelEventDetail.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBCancelEventDetail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBCancelEventDetail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBCompensationEventDetail.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBCompensationEventDetail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBCompensationEventDetail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBComplexGateway.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBComplexGateway.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBComplexGateway.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlType;
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBConditionalEventDetail.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBConditionalEventDetail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBConditionalEventDetail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBEndEvent.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEndEvent.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBEndEvent.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBErrorEventDetail.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBErrorEventDetail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBErrorEventDetail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBEvent.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEvent.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBEvent.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBEventDetail.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBEventDetail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBEventDetail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExclusiveGateway.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExclusiveGateway.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExclusiveGateway.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExecutionHandler.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExecutionHandler.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExecutionHandler.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBExpression.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBExpression.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBFlow.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlow.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBFlow.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBFlowHandler.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowHandler.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBFlowHandler.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBFlowObject.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBFlowObject.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBFlowObject.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id: $
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGateway.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGateway.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGateway.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGraphicalElement.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBGraphicalElement.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBGraphicalElement.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBHandler.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBHandler.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBHandler.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBInclude.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclude.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBInclude.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBInclusiveGateway.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInclusiveGateway.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBInclusiveGateway.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlType;
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBInputSet.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBInputSet.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBInputSet.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBIntermediateEvent.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBIntermediateEvent.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBIntermediateEvent.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElements;
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessage.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessage.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessage.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessageEventDetail.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageEventDetail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessageEventDetail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessageFlow.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageFlow.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessageFlow.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessageRef.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBMessageRef.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBMessageRef.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBOutputSet.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBOutputSet.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBOutputSet.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBParallelGateway.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBParallelGateway.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBParallelGateway.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlType;
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBProcess.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBProcess.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBProcess.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBProperty.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBProperty.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBProperty.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSequenceFlow.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSequenceFlow.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSequenceFlow.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignal.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignal.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignal.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignalEventDetail.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignalEventDetail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignalEventDetail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignalHandler.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSignalHandler.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSignalHandler.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlType;
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBStartEvent.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBStartEvent.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBStartEvent.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSubProcess.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSubProcess.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSubProcess.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSupportingElement.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBSupportingElement.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBSupportingElement.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
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/jboss/bpm/dialect/api10/model/JAXBTask.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTask.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTerminateEventDetail.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTerminateEventDetail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTerminateEventDetail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTimerEventDetail.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/JAXBTimerEventDetail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/JAXBTimerEventDetail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.
*/
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
//$Id$
Modified: projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/ObjectFactory.java
===================================================================
--- projects/spec/trunk/modules/dialects/api10/src/main/java/org/jboss/bpm/dialect/api10/model/ObjectFactory.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/ObjectFactory.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -5,7 +5,7 @@
// Generated on: 2008.07.11 at 09:21:08 AM CEST
//
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlRegistry;
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/jboss/bpm/dialect/api10/model/package-info.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/api10/src/main/java/org/jbpm/dialect/api10/model/package-info.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
@XmlSchema(namespace="urn:bpm.jboss:pdl-0.1")
-package org.jboss.bpm.dialect.api10.model;
+package org.jbpm.dialect.api10.model;
import javax.xml.bind.annotation.XmlSchema;
Copied: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java (from rev 2529, projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/DialectHandlerImpl.java)
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java (rev 0)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/DialectHandlerImpl.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,94 @@
+/*
+ * 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.dialect.jpdl32;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.Writer;
+import java.net.URI;
+import java.net.URL;
+
+import javax.xml.bind.JAXBException;
+
+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.jpdl32.model.JPDL32ProcessDefinition;
+
+
+/**
+ * The DialectHandler converts a supported dialect to the internal Process model.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Jun-2008
+ */
+public class DialectHandlerImpl implements DialectHandler
+{
+ public static final URI NAMESPACE_URI = URI.create("urn:jbpm.org:jpdl-3.2");
+
+ public URI getNamespaceURI()
+ {
+ return NAMESPACE_URI;
+ }
+
+ @Override
+ public ProcessDefinition createProcessDefinition(String pXML)
+ {
+ try
+ {
+ ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+ JPDL32ProcessDefinition jaxbProc = unmarschaller.unmarshallProcess(new StringReader(pXML));
+ ProcessDefinition proc = new ProcessDefinitionAdapter().adaptProcessDefinition(jaxbProc);
+ return proc;
+ }
+ catch (JAXBException ex)
+ {
+ throw new InvalidProcessException("Cannot unmarschall: " + pXML, ex);
+ }
+ }
+
+ @Override
+ public ProcessDefinition createProcessDefinition(URL pURL) throws IOException
+ {
+ try
+ {
+ ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+ JPDL32ProcessDefinition jaxbProc = unmarschaller.unmarshallProcess(new InputStreamReader(pURL.openStream()));
+ ProcessDefinition proc = new ProcessDefinitionAdapter().adaptProcessDefinition(jaxbProc);
+ return proc;
+ }
+ catch (JAXBException ex)
+ {
+ throw new InvalidProcessException("Cannot unmarschall: " + pURL, ex);
+ }
+ }
+
+ public void marshallProcess(Process proc, Writer out) throws IOException
+ {
+ throw new NotImplementedException("JBPM-1638", "DialectHandler jPDL3.2 marshallProcess");
+ }
+}
\ No newline at end of file
Copied: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java (from rev 2529, projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessDefinitionAdapter.java)
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java (rev 0)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessDefinitionAdapter.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,157 @@
+/*
+ * 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.dialect.jpdl32;
+
+// $Id$
+
+import java.util.List;
+
+import org.jbpm.api.InvalidProcessException;
+import org.jbpm.api.model.Gateway;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.Task;
+import org.jbpm.api.model.builder.ProcessBuilder;
+import org.jbpm.api.runtime.ExecutionHandler;
+import org.jbpm.api.service.ProcessBuilderService;
+import org.jbpm.dialect.jpdl32.model.JPDL32Action;
+import org.jbpm.dialect.jpdl32.model.JPDL32EndState;
+import org.jbpm.dialect.jpdl32.model.JPDL32Event;
+import org.jbpm.dialect.jpdl32.model.JPDL32Fork;
+import org.jbpm.dialect.jpdl32.model.JPDL32ProcessDefinition;
+import org.jbpm.dialect.jpdl32.model.JPDL32StartState;
+import org.jbpm.dialect.jpdl32.model.JPDL32State;
+import org.jbpm.dialect.jpdl32.model.JPDL32Transition;
+
+/**
+ * Adapt the jpdl-3.2 ProcessDefinition to the API Process
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Jun-2008
+ */
+public class ProcessDefinitionAdapter
+{
+ public ProcessDefinition adaptProcessDefinition(JPDL32ProcessDefinition jpdlProcDef)
+ {
+ ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder();
+ procBuilder.addProcess(jpdlProcDef.getName());
+
+ for (Object jpdlObj : jpdlProcDef.getDescriptionOrSwimlaneOrStartState())
+ {
+ if (jpdlObj instanceof JPDL32StartState)
+ {
+ adaptStartState(procBuilder, (JPDL32StartState)jpdlObj);
+ }
+ else if (jpdlObj instanceof JPDL32State)
+ {
+ adaptState(procBuilder, (JPDL32State)jpdlObj);
+ }
+ else if (jpdlObj instanceof JPDL32Fork)
+ {
+ adaptFork(procBuilder, (JPDL32Fork)jpdlObj);
+ }
+ else if (jpdlObj instanceof JPDL32EndState)
+ {
+ adaptEndState(procBuilder, (JPDL32EndState)jpdlObj);
+ }
+ else
+ {
+ throw new InvalidProcessException("Unsupported type: " + jpdlObj);
+ }
+ }
+
+ ProcessDefinition procDef = procBuilder.getProcessDefinition();
+ return procDef;
+ }
+
+ private void adaptStartState(ProcessBuilder builder, JPDL32StartState jpdlStart)
+ {
+ builder.addStartEvent("Start");
+ adaptTransitions(builder, jpdlStart.getDescriptionOrTaskOrTransition());
+ }
+
+ private void adaptEndState(ProcessBuilder builder, JPDL32EndState jpdlEnd)
+ {
+ builder.addEndEvent(jpdlEnd.getName());
+ }
+
+ private void adaptState(ProcessBuilder builder, JPDL32State jpdlState)
+ {
+ builder.addTask(jpdlState.getName(), Task.TaskType.None);
+ adaptTransitions(builder, jpdlState.getDescriptionOrEventOrExceptionHandler());
+
+ for (Object jpdlObj : jpdlState.getDescriptionOrEventOrExceptionHandler())
+ {
+ if (jpdlObj instanceof JPDL32Event)
+ {
+ JPDL32Event jpdlEvent = (JPDL32Event)jpdlObj;
+ if (jpdlEvent.getType().equals("node-enter"))
+ {
+ for (Object jpdlAux : jpdlEvent.getActionOrScriptOrCreateTimer())
+ {
+ if (jpdlAux instanceof JPDL32Action)
+ {
+ JPDL32Action jpdlAction = (JPDL32Action)jpdlAux;
+ Class<ExecutionHandler> handler = loadHandler(jpdlAction.getClazz());
+ if (ExecutionHandler.class.isAssignableFrom(handler) == false)
+ throw new InvalidProcessException("Node action is not of type ExecutionHandler");
+
+ builder.addExecutionHandler(handler);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ private void adaptFork(ProcessBuilder builder, JPDL32Fork jpdlObj)
+ {
+ builder.addGateway(jpdlObj.getName(), Gateway.GatewayType.Parallel);
+ adaptTransitions(builder, jpdlObj.getScriptOrDescriptionOrEvent());
+ }
+
+ private void adaptTransitions(ProcessBuilder builder, List<Object> list)
+ {
+ for (Object subEl : list)
+ {
+ if (subEl instanceof JPDL32Transition)
+ {
+ JPDL32Transition trans = (JPDL32Transition)subEl;
+ String targetName = trans.getTo();
+ builder.addSequenceFlow(targetName);
+ }
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private Class<ExecutionHandler> loadHandler(String className)
+ {
+ try
+ {
+ ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
+ return (Class<ExecutionHandler>)ctxLoader.loadClass(className);
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new IllegalStateException("Cannot load handler class: " + className);
+ }
+ }
+}
Copied: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessUnmarshaller.java (from rev 2529, projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/ProcessUnmarshaller.java)
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessUnmarshaller.java (rev 0)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/ProcessUnmarshaller.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.dialect.jpdl32;
+
+// $Id$
+
+import java.io.Reader;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import org.jbpm.dialect.jpdl32.model.JPDL32ProcessDefinition;
+import org.jbpm.dialect.jpdl32.model.ObjectFactory;
+
+/**
+ * A JAXB unmarshaller for a Process
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public class ProcessUnmarshaller
+{
+ public JPDL32ProcessDefinition unmarshallProcess(Reader xml) throws JAXBException
+ {
+ JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ unmarshaller.setProperty("com.sun.xml.bind.ObjectFactory",new ObjectFactory());
+ JPDL32ProcessDefinition proc = (JPDL32ProcessDefinition)unmarshaller.unmarshal(xml);
+ return proc;
+ }
+}
Copied: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model (from rev 2529, projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model)
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/BindingType.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/BindingType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/BindingType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/BooleanType.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/BooleanType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/BooleanType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/ConfigType.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/ConfigType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/ConfigType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import javax.xml.bind.annotation.XmlEnum;
import javax.xml.bind.annotation.XmlEnumValue;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/Delegation.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/Delegation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/Delegation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Action.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Action.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Action.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Assignment.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Assignment.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Assignment.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32CancelTimer.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32CancelTimer.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32CancelTimer.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32CreateTimer.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32CreateTimer.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32CreateTimer.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Decision.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Decision.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Decision.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32EndState.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32EndState.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32EndState.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Event.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Event.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Event.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32ExceptionHandler.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Fork.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Fork.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Fork.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Join.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Join.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Join.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Mail.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Mail.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Mail.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32MailNode.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32MailNode.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32MailNode.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Node.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Node.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Node.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32ProcessDefinition.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32ProcessState.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32ProcessState.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32ProcessState.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.math.BigInteger;
import java.util.ArrayList;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Script.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Script.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Script.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32StartState.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32StartState.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32StartState.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32State.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32State.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32State.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32SuperState.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32SuperState.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32SuperState.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Swimlane.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Swimlane.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Swimlane.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Task.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Task.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Task.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32TaskNode.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32TaskNode.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32TaskNode.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Timer.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Timer.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Timer.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Transition.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Transition.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Transition.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Variable.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/JPDL32Variable.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/JPDL32Variable.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/ObjectFactory.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/ObjectFactory.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/ObjectFactory.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
Modified: projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/package-info.java
===================================================================
--- projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jboss/bpm/dialect/jpdl32/model/package-info.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/jpdl32/src/main/java/org/jbpm/dialect/jpdl32/model/package-info.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,4 +6,4 @@
//
@javax.xml.bind.annotation.XmlSchema(namespace = "urn:jbpm.org:jpdl-3.2", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.jboss.bpm.dialect.jpdl32.model;
+package org.jbpm.dialect.jpdl32.model;
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/DialectHandlerImpl.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/DialectHandlerImpl.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,87 @@
+/*
+ * 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.dialect.stp;
+
+// $Id$
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.Writer;
+import java.net.URI;
+import java.net.URL;
+
+import javax.xml.bind.JAXBException;
+
+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;
+
+/**
+ * The DialectHandler converts a supported dialect to the internal Process model.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Jun-2008
+ */
+public class DialectHandlerImpl implements DialectHandler
+{
+ public static final URI NAMESPACE_URI = URI.create("http://stp.eclipse.org/bpmn");
+
+ public URI getNamespaceURI()
+ {
+ return NAMESPACE_URI;
+ }
+
+ public ProcessDefinition createProcessDefinition(String pXML)
+ {
+ try
+ {
+ ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+ ProcessDefinition procDef = unmarschaller.unmarshallProcess(new ByteArrayInputStream(pXML.getBytes()));
+ return procDef;
+ }
+ catch (JAXBException ex)
+ {
+ throw new InvalidProcessException("Cannot unmarschall: " + pXML, ex);
+ }
+ }
+
+ public ProcessDefinition createProcessDefinition(URL pURL) throws IOException
+ {
+ try
+ {
+ ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+ ProcessDefinition procDef = unmarschaller.unmarshallProcess(pURL.openStream());
+ return procDef;
+ }
+ catch (JAXBException ex)
+ {
+ throw new InvalidProcessException("Cannot unmarschall: " + pURL, ex);
+ }
+ }
+
+ public void marshallProcess(Process proc, Writer out) throws IOException
+ {
+ throw new NotImplementedException("JBPM-1639", "DialectHandler STP marshallProcess");
+ }
+}
\ No newline at end of file
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/ProcessUnmarshaller.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/ProcessUnmarshaller.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,234 @@
+/*
+ * 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.dialect.stp;
+
+// $Id$
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+import javax.xml.namespace.QName;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import org.jboss.util.xml.DOMUtils;
+import org.jbpm.api.InvalidProcessException;
+import org.jbpm.api.model.Gateway;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.Task;
+import org.jbpm.api.model.builder.ProcessBuilder;
+import org.jbpm.api.service.ProcessBuilderService;
+import org.jbpm.dialect.stp.model.Activity;
+import org.jbpm.dialect.stp.model.ActivityType;
+import org.jbpm.dialect.stp.model.BpmnDiagram;
+import org.jbpm.dialect.stp.model.ObjectFactory;
+import org.jbpm.dialect.stp.model.Pool;
+import org.jbpm.dialect.stp.model.SequenceEdge;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/**
+ * A JAXB unmarshaller for a Process
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public class ProcessUnmarshaller
+{
+ public static final String NAMESPACE_URI = "http://stp.eclipse.org/bpmn";
+
+ private BpmnDiagram diagram;
+ private List<SequenceEdge> sequenceEdges;
+ private List<Activity> activities = new ArrayList<Activity>();
+
+ @SuppressWarnings("unchecked")
+ public ProcessDefinition unmarshallProcess(InputStream xml) throws JAXBException
+ {
+ JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ unmarshaller.setProperty("com.sun.xml.bind.ObjectFactory", new ObjectFactory());
+
+ // We need to unmarshall the elements one by one because the generated STP BPMN
+ // file does not contain xsd:type declarations so that JAXB cannot createt the types
+ // automatically
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ dbf.setNamespaceAware(true);
+ Document doc;
+ try
+ {
+ DocumentBuilder db = dbf.newDocumentBuilder();
+ doc = db.parse(xml);
+ }
+ catch (Exception ex)
+ {
+ throw new IllegalStateException("Cannot parse stpbpmn", ex);
+ }
+
+ Element root = doc.getDocumentElement();
+ diagram = unmarshaller.unmarshal(root, BpmnDiagram.class).getValue();
+ ProcessBuilder procBuilder = adaptDiagram(diagram);
+
+ // Initialize the list of sequence edges
+ Element poolEl = (Element)DOMUtils.getChildElements(root, "pools").next();
+ Pool pool = unmarshaller.unmarshal(poolEl, Pool.class).getValue();
+ sequenceEdges = pool.getSequenceEdges();
+
+ // Iterate over all 'verticies'
+ Iterator<Element> itEl = DOMUtils.getChildElements(poolEl, "vertices");
+ while (itEl.hasNext())
+ {
+ Element stpEl = itEl.next();
+ String xmiType = DOMUtils.getAttributeValue(stpEl, new QName("http://www.omg.org/XMI", "type"));
+ if ("bpmn:Activity".equals(xmiType))
+ {
+ Activity stpActivity = unmarshaller.unmarshal(stpEl, Activity.class).getValue();
+ String name = DOMUtils.getAttributeValue(stpEl, "name");
+ name = (name != null ? name : stpActivity.getId());
+ stpActivity.setLabel(name);
+
+ // Fall back to the attribute if JAXB did not initialize it
+ List<String> outEdges = stpActivity.getOutgoingEdges();
+ if (outEdges.size() == 0)
+ {
+ String edgeStr = DOMUtils.getAttributeValue(stpEl, "outgoingEdges");
+ if (edgeStr != null && edgeStr.length() > 0)
+ outEdges.add(edgeStr);
+ }
+
+ activities.add(stpActivity);
+ }
+ else
+ {
+ throw new IllegalStateException("Unsupported xmi:type: " + xmiType);
+ }
+ }
+
+ // Build the activities
+ for (Activity stpActivity : activities)
+ {
+ adaptActivity(procBuilder, stpActivity);
+ }
+
+ ProcessDefinition procDef = procBuilder.getProcessDefinition();
+ return procDef;
+ }
+
+ private ProcessBuilder adaptDiagram(BpmnDiagram bpmnDiagram)
+ {
+ List<Pool> stpPools = bpmnDiagram.getPools();
+ if (stpPools == null || stpPools.size() == 0)
+ throw new IllegalStateException("Expected at least one Pool");
+ if (stpPools.size() > 1)
+ throw new IllegalStateException("Multiple Pools not supported");
+
+ Pool stpPool = stpPools.get(0);
+ ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder();
+ procBuilder.addProcess(stpPool.getId());
+
+ return procBuilder;
+ }
+
+ private void adaptActivity(ProcessBuilder builder, Activity stpActivity)
+ {
+ ActivityType activityType = stpActivity.getActivityType();
+ if (activityType == ActivityType.EVENT_START_EMPTY)
+ {
+ builder.addStartEvent("Start");
+ adaptOutgoingEdges(builder, stpActivity);
+ }
+ else if (activityType == ActivityType.EVENT_END_EMPTY)
+ {
+ String name = stpActivity.getLabel();
+ builder.addEndEvent(name);
+ }
+ else if (activityType == ActivityType.TASK)
+ {
+ String name = stpActivity.getLabel();
+
+ Task.TaskType taskType = Task.TaskType.None;
+ if (name.startsWith("Send"))
+ taskType = Task.TaskType.Send;
+ if (name.startsWith("Receive"))
+ taskType = Task.TaskType.Receive;
+
+ builder.addTask(name, taskType);
+ adaptOutgoingEdges(builder, stpActivity);
+ }
+ else if (activityType == ActivityType.GATEWAY_DATA_BASED_EXCLUSIVE)
+ {
+ String name = stpActivity.getLabel();
+ builder.addGateway(name, Gateway.GatewayType.Exclusive);
+ adaptOutgoingEdges(builder, stpActivity);
+ }
+ else if (activityType == ActivityType.GATEWAY_PARALLEL)
+ {
+ String name = stpActivity.getLabel();
+ builder.addGateway(name, Gateway.GatewayType.Parallel);
+ adaptOutgoingEdges(builder, stpActivity);
+ }
+ else
+ {
+ throw new InvalidProcessException("Unsupported activity type: " + activityType);
+ }
+ }
+
+ private void adaptOutgoingEdges(ProcessBuilder builder, Activity stpActivity)
+ {
+ for (String edgeIds : stpActivity.getOutgoingEdges())
+ {
+ String[] edgeIdArr = edgeIds.split("\\s");
+ for (String edgeId : edgeIdArr)
+ {
+ SequenceEdge seqEdge = getSequenceEdgeById(edgeId);
+ String targetId = seqEdge.getTarget();
+ Activity targetAct = getActivityById(targetId);
+ String targetName = targetAct.getLabel();
+ builder.addSequenceFlow(targetName);
+ }
+ }
+ }
+
+ private SequenceEdge getSequenceEdgeById(String edgeId)
+ {
+ for (SequenceEdge seqEdge : sequenceEdges)
+ {
+ if (seqEdge.getId().equals(edgeId))
+ return seqEdge;
+ }
+ throw new InvalidProcessException("Cannot find SequenceEdge: " + edgeId);
+ }
+
+ private Activity getActivityById(String id)
+ {
+ for (Activity act : activities)
+ {
+ if (act.getId().equals(id))
+ return act;
+ }
+ throw new InvalidProcessException("Cannot find Activity: " + id);
+ }
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Activity.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Activity.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Activity.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Activity.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,241 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Activity complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Activity">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Vertex">
+ * <sequence>
+ * <choice maxOccurs="unbounded" minOccurs="0">
+ * <element name="incomingMessages" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="outgoingMessages" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ * </choice>
+ * <element name="groups" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="activityType" type="{http://stp.eclipse.org/bpmn}ActivityType" default="Task" />
+ * <attribute name="lane" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * <attribute name="looping" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ * <attribute name="eventHandlerFor" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Activity", propOrder = {
+ "incomingMessagesOrOutgoingMessages",
+ "groups"
+})
+@XmlSeeAlso({
+ SubProcess.class
+})
+public class Activity
+ extends Vertex
+{
+
+ @XmlElementRefs({
+ @XmlElementRef(name = "outgoingMessages", type = JAXBElement.class),
+ @XmlElementRef(name = "incomingMessages", type = JAXBElement.class)
+ })
+ protected List<JAXBElement<String>> incomingMessagesOrOutgoingMessages;
+ @XmlSchemaType(name = "anyURI")
+ protected List<String> groups;
+ @XmlAttribute
+ protected ActivityType activityType;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String lane;
+ @XmlAttribute
+ protected Boolean looping;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String eventHandlerFor;
+
+ /**
+ * Gets the value of the incomingMessagesOrOutgoingMessages property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the incomingMessagesOrOutgoingMessages property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getIncomingMessagesOrOutgoingMessages().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ * {@link JAXBElement }{@code <}{@link String }{@code >}
+ *
+ *
+ */
+ public List<JAXBElement<String>> getIncomingMessagesOrOutgoingMessages() {
+ if (incomingMessagesOrOutgoingMessages == null) {
+ incomingMessagesOrOutgoingMessages = new ArrayList<JAXBElement<String>>();
+ }
+ return this.incomingMessagesOrOutgoingMessages;
+ }
+
+ /**
+ * Gets the value of the groups property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the groups property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getGroups().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link String }
+ *
+ *
+ */
+ public List<String> getGroups() {
+ if (groups == null) {
+ groups = new ArrayList<String>();
+ }
+ return this.groups;
+ }
+
+ /**
+ * Gets the value of the activityType property.
+ *
+ * @return
+ * possible object is
+ * {@link ActivityType }
+ *
+ */
+ public ActivityType getActivityType() {
+ if (activityType == null) {
+ return ActivityType.TASK;
+ } else {
+ return activityType;
+ }
+ }
+
+ /**
+ * Sets the value of the activityType property.
+ *
+ * @param value
+ * allowed object is
+ * {@link ActivityType }
+ *
+ */
+ public void setActivityType(ActivityType value) {
+ this.activityType = value;
+ }
+
+ /**
+ * Gets the value of the lane property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getLane() {
+ return lane;
+ }
+
+ /**
+ * Sets the value of the lane property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setLane(String value) {
+ this.lane = value;
+ }
+
+ /**
+ * Gets the value of the looping property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public Boolean isLooping() {
+ return looping;
+ }
+
+ /**
+ * Sets the value of the looping property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setLooping(Boolean value) {
+ this.looping = value;
+ }
+
+ /**
+ * Gets the value of the eventHandlerFor property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getEventHandlerFor() {
+ return eventHandlerFor;
+ }
+
+ /**
+ * Sets the value of the eventHandlerFor property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setEventHandlerFor(String value) {
+ this.eventHandlerFor = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ActivityType.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ActivityType.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ActivityType.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ActivityType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,142 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ActivityType.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * <simpleType name="ActivityType">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="Task"/>
+ * <enumeration value="SubProcess"/>
+ * <enumeration value="EventStartEmpty"/>
+ * <enumeration value="EventStartMessage"/>
+ * <enumeration value="EventStartRule"/>
+ * <enumeration value="EventStartTimer"/>
+ * <enumeration value="EventStartLink"/>
+ * <enumeration value="EventStartMultiple"/>
+ * <enumeration value="EventIntermediateEmpty"/>
+ * <enumeration value="EventIntermediateMessage"/>
+ * <enumeration value="EventIntermediateTimer"/>
+ * <enumeration value="EventIntermediateError"/>
+ * <enumeration value="EventIntermediateCompensation"/>
+ * <enumeration value="EventIntermediateRule"/>
+ * <enumeration value="EventIntermediateLink"/>
+ * <enumeration value="EventIntermediateMultiple"/>
+ * <enumeration value="EventIntermediateCancel"/>
+ * <enumeration value="EventEndEmpty"/>
+ * <enumeration value="EventEndMessage"/>
+ * <enumeration value="EventEndError"/>
+ * <enumeration value="EventEndCompensation"/>
+ * <enumeration value="EventEndTerminate"/>
+ * <enumeration value="EventEndLink"/>
+ * <enumeration value="EventEndMultiple"/>
+ * <enumeration value="EventEndCancel"/>
+ * <enumeration value="GatewayDataBasedExclusive"/>
+ * <enumeration value="GatewayEventBasedExclusive"/>
+ * <enumeration value="GatewayDataBasedInclusive"/>
+ * <enumeration value="GatewayParallel"/>
+ * <enumeration value="GatewayComplex"/>
+ * </restriction>
+ * </simpleType>
+ * </pre>
+ *
+ */
+@XmlType(name = "ActivityType")
+@XmlEnum
+public enum ActivityType {
+
+ @XmlEnumValue("Task")
+ TASK("Task"),
+ @XmlEnumValue("SubProcess")
+ SUB_PROCESS("SubProcess"),
+ @XmlEnumValue("EventStartEmpty")
+ EVENT_START_EMPTY("EventStartEmpty"),
+ @XmlEnumValue("EventStartMessage")
+ EVENT_START_MESSAGE("EventStartMessage"),
+ @XmlEnumValue("EventStartRule")
+ EVENT_START_RULE("EventStartRule"),
+ @XmlEnumValue("EventStartTimer")
+ EVENT_START_TIMER("EventStartTimer"),
+ @XmlEnumValue("EventStartLink")
+ EVENT_START_LINK("EventStartLink"),
+ @XmlEnumValue("EventStartMultiple")
+ EVENT_START_MULTIPLE("EventStartMultiple"),
+ @XmlEnumValue("EventIntermediateEmpty")
+ EVENT_INTERMEDIATE_EMPTY("EventIntermediateEmpty"),
+ @XmlEnumValue("EventIntermediateMessage")
+ EVENT_INTERMEDIATE_MESSAGE("EventIntermediateMessage"),
+ @XmlEnumValue("EventIntermediateTimer")
+ EVENT_INTERMEDIATE_TIMER("EventIntermediateTimer"),
+ @XmlEnumValue("EventIntermediateError")
+ EVENT_INTERMEDIATE_ERROR("EventIntermediateError"),
+ @XmlEnumValue("EventIntermediateCompensation")
+ EVENT_INTERMEDIATE_COMPENSATION("EventIntermediateCompensation"),
+ @XmlEnumValue("EventIntermediateRule")
+ EVENT_INTERMEDIATE_RULE("EventIntermediateRule"),
+ @XmlEnumValue("EventIntermediateLink")
+ EVENT_INTERMEDIATE_LINK("EventIntermediateLink"),
+ @XmlEnumValue("EventIntermediateMultiple")
+ EVENT_INTERMEDIATE_MULTIPLE("EventIntermediateMultiple"),
+ @XmlEnumValue("EventIntermediateCancel")
+ EVENT_INTERMEDIATE_CANCEL("EventIntermediateCancel"),
+ @XmlEnumValue("EventEndEmpty")
+ EVENT_END_EMPTY("EventEndEmpty"),
+ @XmlEnumValue("EventEndMessage")
+ EVENT_END_MESSAGE("EventEndMessage"),
+ @XmlEnumValue("EventEndError")
+ EVENT_END_ERROR("EventEndError"),
+ @XmlEnumValue("EventEndCompensation")
+ EVENT_END_COMPENSATION("EventEndCompensation"),
+ @XmlEnumValue("EventEndTerminate")
+ EVENT_END_TERMINATE("EventEndTerminate"),
+ @XmlEnumValue("EventEndLink")
+ EVENT_END_LINK("EventEndLink"),
+ @XmlEnumValue("EventEndMultiple")
+ EVENT_END_MULTIPLE("EventEndMultiple"),
+ @XmlEnumValue("EventEndCancel")
+ EVENT_END_CANCEL("EventEndCancel"),
+ @XmlEnumValue("GatewayDataBasedExclusive")
+ GATEWAY_DATA_BASED_EXCLUSIVE("GatewayDataBasedExclusive"),
+ @XmlEnumValue("GatewayEventBasedExclusive")
+ GATEWAY_EVENT_BASED_EXCLUSIVE("GatewayEventBasedExclusive"),
+ @XmlEnumValue("GatewayDataBasedInclusive")
+ GATEWAY_DATA_BASED_INCLUSIVE("GatewayDataBasedInclusive"),
+ @XmlEnumValue("GatewayParallel")
+ GATEWAY_PARALLEL("GatewayParallel"),
+ @XmlEnumValue("GatewayComplex")
+ GATEWAY_COMPLEX("GatewayComplex");
+ private final String value;
+
+ ActivityType(String v) {
+ value = v;
+ }
+
+ public String value() {
+ return value;
+ }
+
+ public static ActivityType fromValue(String v) {
+ for (ActivityType c: ActivityType.values()) {
+ if (c.value.equals(v)) {
+ return c;
+ }
+ }
+ throw new IllegalArgumentException(v);
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Artifact.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Artifact.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Artifact.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Artifact.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,113 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Artifact complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Artifact">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Identifiable">
+ * <sequence>
+ * <element name="associations" type="{http://stp.eclipse.org/bpmn}Association" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="artifactsContainer" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Artifact", propOrder = {
+ "associations"
+})
+@XmlSeeAlso({
+ Group.class,
+ TextAnnotation.class,
+ DataObject.class
+})
+public class Artifact
+ extends Identifiable
+{
+
+ protected List<Association> associations;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String artifactsContainer;
+
+ /**
+ * Gets the value of the associations property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the associations property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getAssociations().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Association }
+ *
+ *
+ */
+ public List<Association> getAssociations() {
+ if (associations == null) {
+ associations = new ArrayList<Association>();
+ }
+ return this.associations;
+ }
+
+ /**
+ * Gets the value of the artifactsContainer property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getArtifactsContainer() {
+ return artifactsContainer;
+ }
+
+ /**
+ * Sets the value of the artifactsContainer property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setArtifactsContainer(String value) {
+ this.artifactsContainer = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ArtifactsContainer.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ArtifactsContainer.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ArtifactsContainer.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ArtifactsContainer.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,77 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ArtifactsContainer complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="ArtifactsContainer">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}NamedBpmnObject">
+ * <sequence>
+ * <element name="artifacts" type="{http://stp.eclipse.org/bpmn}Artifact" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ArtifactsContainer", propOrder = {
+ "artifacts"
+})
+public class ArtifactsContainer
+ extends NamedBpmnObject
+{
+
+ protected List<Artifact> artifacts;
+
+ /**
+ * Gets the value of the artifacts property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the artifacts property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getArtifacts().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Artifact }
+ *
+ *
+ */
+ public List<Artifact> getArtifacts() {
+ if (artifacts == null) {
+ artifacts = new ArrayList<Artifact>();
+ }
+ return this.artifacts;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Association.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Association.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Association.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Association.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,135 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jbpm.dialect.stp.model.ecore.EModelElement;
+
+
+/**
+ * <p>Java class for Association complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Association">
+ * <complexContent>
+ * <extension base="{http://www.eclipse.org/emf/2002/Ecore}EModelElement">
+ * <attribute name="target" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * <attribute name="direction">
+ * <simpleType>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="None"/>
+ * <enumeration value="To"/>
+ * <enumeration value="From"/>
+ * <enumeration value="Both"/>
+ * </restriction>
+ * </simpleType>
+ * </attribute>
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Association")
+public class Association
+ extends EModelElement
+{
+
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String target;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String source;
+ @XmlAttribute
+ protected String direction;
+
+ /**
+ * Gets the value of the target property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTarget() {
+ return target;
+ }
+
+ /**
+ * Sets the value of the target property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTarget(String value) {
+ this.target = value;
+ }
+
+ /**
+ * Gets the value of the source property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSource() {
+ return source;
+ }
+
+ /**
+ * Sets the value of the source property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSource(String value) {
+ this.source = value;
+ }
+
+ /**
+ * Gets the value of the direction property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDirection() {
+ return direction;
+ }
+
+ /**
+ * Sets the value of the direction property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDirection(String value) {
+ this.direction = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/BpmnDiagram.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/BpmnDiagram.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/BpmnDiagram.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/BpmnDiagram.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,164 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for BpmnDiagram complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="BpmnDiagram">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Identifiable">
+ * <sequence>
+ * <element name="pools" type="{http://stp.eclipse.org/bpmn}Pool" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="messages" type="{http://stp.eclipse.org/bpmn}MessagingEdge" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="title" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="author" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "BpmnDiagram", propOrder = {
+ "pools",
+ "messages"
+})
+public class BpmnDiagram
+ extends Identifiable
+{
+
+ protected List<Pool> pools;
+ protected List<MessagingEdge> messages;
+ @XmlAttribute
+ protected String title;
+ @XmlAttribute
+ protected String author;
+
+ /**
+ * Gets the value of the pools property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the pools property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getPools().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Pool }
+ *
+ *
+ */
+ public List<Pool> getPools() {
+ if (pools == null) {
+ pools = new ArrayList<Pool>();
+ }
+ return this.pools;
+ }
+
+ /**
+ * Gets the value of the messages property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the messages property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getMessages().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link MessagingEdge }
+ *
+ *
+ */
+ public List<MessagingEdge> getMessages() {
+ if (messages == null) {
+ messages = new ArrayList<MessagingEdge>();
+ }
+ return this.messages;
+ }
+
+ /**
+ * Gets the value of the title property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTitle() {
+ return title;
+ }
+
+ /**
+ * Sets the value of the title property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTitle(String value) {
+ this.title = value;
+ }
+
+ /**
+ * Gets the value of the author property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getAuthor() {
+ return author;
+ }
+
+ /**
+ * Sets the value of the author property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setAuthor(String value) {
+ this.author = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/DataObject.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/DataObject.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/DataObject.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/DataObject.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for DataObject complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="DataObject">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Artifact">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "DataObject")
+public class DataObject
+ extends Artifact
+{
+
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Graph.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Graph.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Graph.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Graph.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,113 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Graph complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Graph">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}IdentifiableNode">
+ * <sequence>
+ * <element name="vertices" type="{http://stp.eclipse.org/bpmn}Vertex" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="sequenceEdges" type="{http://stp.eclipse.org/bpmn}SequenceEdge" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Graph", propOrder = {
+ "vertices",
+ "sequenceEdges"
+})
+@XmlSeeAlso({
+ Pool.class
+})
+public class Graph
+ extends IdentifiableNode
+{
+
+ protected List<Vertex> vertices;
+ protected List<SequenceEdge> sequenceEdges;
+
+ /**
+ * Gets the value of the vertices property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the vertices property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getVertices().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Vertex }
+ *
+ *
+ */
+ public List<Vertex> getVertices() {
+ if (vertices == null) {
+ vertices = new ArrayList<Vertex>();
+ }
+ return this.vertices;
+ }
+
+ /**
+ * Gets the value of the sequenceEdges property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the sequenceEdges property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getSequenceEdges().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link SequenceEdge }
+ *
+ *
+ */
+ public List<SequenceEdge> getSequenceEdges() {
+ if (sequenceEdges == null) {
+ sequenceEdges = new ArrayList<SequenceEdge>();
+ }
+ return this.sequenceEdges;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Group.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Group.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Group.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Group.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,77 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Group complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Group">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Artifact">
+ * <sequence>
+ * <element name="activities" type="{http://stp.eclipse.org/bpmn}Activity" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Group", propOrder = {
+ "activities"
+})
+public class Group
+ extends Artifact
+{
+
+ protected List<Activity> activities;
+
+ /**
+ * Gets the value of the activities property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the activities property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getActivities().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Activity }
+ *
+ *
+ */
+ public List<Activity> getActivities() {
+ if (activities == null) {
+ activities = new ArrayList<Activity>();
+ }
+ return this.activities;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Identifiable.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Identifiable.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Identifiable.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Identifiable.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,50 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+import org.jbpm.dialect.stp.model.ecore.EModelElement;
+
+
+/**
+ * <p>Java class for Identifiable complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Identifiable">
+ * <complexContent>
+ * <extension base="{http://www.eclipse.org/emf/2002/Ecore}EModelElement">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Identifiable")
+@XmlSeeAlso({
+ Lane.class,
+ BpmnDiagram.class,
+ MessagingEdge.class,
+ Artifact.class,
+ IdentifiableNode.class,
+ SequenceEdge.class
+})
+public class Identifiable
+ extends EModelElement
+{
+
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/IdentifiableNode.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/IdentifiableNode.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/IdentifiableNode.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/IdentifiableNode.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,84 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for IdentifiableNode complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="IdentifiableNode">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Identifiable">
+ * <sequence>
+ * <element name="associations" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "IdentifiableNode", propOrder = {
+ "associations"
+})
+@XmlSeeAlso({
+ Vertex.class,
+ Graph.class
+})
+public class IdentifiableNode
+ extends Identifiable
+{
+
+ @XmlSchemaType(name = "anyURI")
+ protected List<String> associations;
+
+ /**
+ * Gets the value of the associations property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the associations property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getAssociations().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link String }
+ *
+ *
+ */
+ public List<String> getAssociations() {
+ if (associations == null) {
+ associations = new ArrayList<String>();
+ }
+ return this.associations;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Lane.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Lane.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Lane.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Lane.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,107 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Lane complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Lane">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Identifiable">
+ * <sequence>
+ * <element name="activities" type="{http://stp.eclipse.org/bpmn}Activity" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="pool" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Lane", propOrder = {
+ "activities"
+})
+public class Lane
+ extends Identifiable
+{
+
+ protected List<Activity> activities;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String pool;
+
+ /**
+ * Gets the value of the activities property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the activities property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getActivities().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Activity }
+ *
+ *
+ */
+ public List<Activity> getActivities() {
+ if (activities == null) {
+ activities = new ArrayList<Activity>();
+ }
+ return this.activities;
+ }
+
+ /**
+ * Gets the value of the pool property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getPool() {
+ return pool;
+ }
+
+ /**
+ * Sets the value of the pool property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setPool(String value) {
+ this.pool = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/MessagingEdge.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/MessagingEdge.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/MessagingEdge.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/MessagingEdge.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,125 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessagingEdge complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="MessagingEdge">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Identifiable">
+ * <attribute name="bpmnDiagram" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * <attribute name="target" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessagingEdge")
+public class MessagingEdge
+ extends Identifiable
+{
+
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String bpmnDiagram;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String source;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String target;
+
+ /**
+ * Gets the value of the bpmnDiagram property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getBpmnDiagram() {
+ return bpmnDiagram;
+ }
+
+ /**
+ * Sets the value of the bpmnDiagram property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setBpmnDiagram(String value) {
+ this.bpmnDiagram = value;
+ }
+
+ /**
+ * Gets the value of the source property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSource() {
+ return source;
+ }
+
+ /**
+ * Sets the value of the source property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSource(String value) {
+ this.source = value;
+ }
+
+ /**
+ * Gets the value of the target property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTarget() {
+ return target;
+ }
+
+ /**
+ * Sets the value of the target property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTarget(String value) {
+ this.target = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/NamedBpmnObject.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/NamedBpmnObject.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/NamedBpmnObject.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/NamedBpmnObject.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,123 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for NamedBpmnObject complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="NamedBpmnObject">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="documentation" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="ncname" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "NamedBpmnObject")
+@XmlSeeAlso({
+ ArtifactsContainer.class
+})
+public class NamedBpmnObject {
+
+ @XmlAttribute
+ protected String name;
+ @XmlAttribute
+ protected String documentation;
+ @XmlAttribute
+ protected String ncname;
+
+ /**
+ * Gets the value of the name property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * Sets the value of the name property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setName(String value) {
+ this.name = value;
+ }
+
+ /**
+ * Gets the value of the documentation property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDocumentation() {
+ return documentation;
+ }
+
+ /**
+ * Sets the value of the documentation property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDocumentation(String value) {
+ this.documentation = value;
+ }
+
+ /**
+ * Gets the value of the ncname property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getNcname() {
+ return ncname;
+ }
+
+ /**
+ * Sets the value of the ncname property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setNcname(String value) {
+ this.ncname = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ObjectFactory.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ObjectFactory.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ObjectFactory.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ObjectFactory.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,206 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
+
+
+/**
+ * This object contains factory methods for each
+ * Java content interface and Java element interface
+ * generated in the org.jboss.bpm.dialect.stp.model package.
+ * <p>An ObjectFactory allows you to programatically
+ * construct new instances of the Java representation
+ * for XML content. The Java representation of XML
+ * content can consist of schema derived interfaces
+ * and classes representing the binding of schema
+ * type definitions, element declarations and model
+ * groups. Factory methods for each of these are
+ * provided in this class.
+ *
+ */
+@XmlRegistry
+public class ObjectFactory {
+
+ private final static QName _ActivityIncomingMessages_QNAME = new QName("", "incomingMessages");
+ private final static QName _ActivityOutgoingMessages_QNAME = new QName("", "outgoingMessages");
+
+ /**
+ * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.bpm.dialect.stp.model
+ *
+ */
+ public ObjectFactory() {
+ }
+
+ /**
+ * Create an instance of {@link TextAnnotation }
+ *
+ */
+ public TextAnnotation createTextAnnotation() {
+ return new TextAnnotation();
+ }
+
+ /**
+ * Create an instance of {@link Group }
+ *
+ */
+ public Group createGroup() {
+ return new Group();
+ }
+
+ /**
+ * Create an instance of {@link Association }
+ *
+ */
+ public Association createAssociation() {
+ return new Association();
+ }
+
+ /**
+ * Create an instance of {@link Identifiable }
+ *
+ */
+ public Identifiable createIdentifiable() {
+ return new Identifiable();
+ }
+
+ /**
+ * Create an instance of {@link IdentifiableNode }
+ *
+ */
+ public IdentifiableNode createIdentifiableNode() {
+ return new IdentifiableNode();
+ }
+
+ /**
+ * Create an instance of {@link Pool }
+ *
+ */
+ public Pool createPool() {
+ return new Pool();
+ }
+
+ /**
+ * Create an instance of {@link NamedBpmnObject }
+ *
+ */
+ public NamedBpmnObject createNamedBpmnObject() {
+ return new NamedBpmnObject();
+ }
+
+ /**
+ * Create an instance of {@link BpmnDiagram }
+ *
+ */
+ public BpmnDiagram createBpmnDiagram() {
+ return new BpmnDiagram();
+ }
+
+ /**
+ * Create an instance of {@link Lane }
+ *
+ */
+ public Lane createLane() {
+ return new Lane();
+ }
+
+ /**
+ * Create an instance of {@link SequenceEdge }
+ *
+ */
+ public SequenceEdge createSequenceEdge() {
+ return new SequenceEdge();
+ }
+
+ /**
+ * Create an instance of {@link Activity }
+ *
+ */
+ public Activity createActivity() {
+ return new Activity();
+ }
+
+ /**
+ * Create an instance of {@link Artifact }
+ *
+ */
+ public Artifact createArtifact() {
+ return new Artifact();
+ }
+
+ /**
+ * Create an instance of {@link ArtifactsContainer }
+ *
+ */
+ public ArtifactsContainer createArtifactsContainer() {
+ return new ArtifactsContainer();
+ }
+
+ /**
+ * Create an instance of {@link SubProcess }
+ *
+ */
+ public SubProcess createSubProcess() {
+ return new SubProcess();
+ }
+
+ /**
+ * Create an instance of {@link DataObject }
+ *
+ */
+ public DataObject createDataObject() {
+ return new DataObject();
+ }
+
+ /**
+ * Create an instance of {@link Graph }
+ *
+ */
+ public Graph createGraph() {
+ return new Graph();
+ }
+
+ /**
+ * Create an instance of {@link MessagingEdge }
+ *
+ */
+ public MessagingEdge createMessagingEdge() {
+ return new MessagingEdge();
+ }
+
+ /**
+ * Create an instance of {@link Vertex }
+ *
+ */
+ public Vertex createVertex() {
+ return new Vertex();
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "", name = "incomingMessages", scope = Activity.class)
+ public JAXBElement<String> createActivityIncomingMessages(String value) {
+ return new JAXBElement<String>(_ActivityIncomingMessages_QNAME, String.class, Activity.class, value);
+ }
+
+ /**
+ * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+ *
+ */
+ @XmlElementDecl(namespace = "", name = "outgoingMessages", scope = Activity.class)
+ public JAXBElement<String> createActivityOutgoingMessages(String value) {
+ return new JAXBElement<String>(_ActivityOutgoingMessages_QNAME, String.class, Activity.class, value);
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Pool.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Pool.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Pool.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Pool.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,107 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Pool complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Pool">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Graph">
+ * <sequence>
+ * <element name="lanes" type="{http://stp.eclipse.org/bpmn}Lane" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="bpmnDiagram" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Pool", propOrder = {
+ "lanes"
+})
+public class Pool
+ extends Graph
+{
+
+ protected List<Lane> lanes;
+ @XmlAttribute
+ @XmlSchemaType(name = "anySimpleType")
+ protected String bpmnDiagram;
+
+ /**
+ * Gets the value of the lanes property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the lanes property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getLanes().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Lane }
+ *
+ *
+ */
+ public List<Lane> getLanes() {
+ if (lanes == null) {
+ lanes = new ArrayList<Lane>();
+ }
+ return this.lanes;
+ }
+
+ /**
+ * Gets the value of the bpmnDiagram property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getBpmnDiagram() {
+ return bpmnDiagram;
+ }
+
+ /**
+ * Sets the value of the bpmnDiagram property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setBpmnDiagram(String value) {
+ this.bpmnDiagram = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SequenceEdge.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/SequenceEdge.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SequenceEdge.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SequenceEdge.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,179 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for SequenceEdge complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="SequenceEdge">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Identifiable">
+ * <attribute name="graph" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * <attribute name="target" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ * <attribute name="conditionType" type="{http://stp.eclipse.org/bpmn}SequenceFlowConditionType" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SequenceEdge")
+public class SequenceEdge
+ extends Identifiable
+{
+
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String graph;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String source;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String target;
+ @XmlAttribute
+ protected Boolean isDefault;
+ @XmlAttribute
+ protected SequenceFlowConditionType conditionType;
+
+ /**
+ * Gets the value of the graph property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getGraph() {
+ return graph;
+ }
+
+ /**
+ * Sets the value of the graph property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setGraph(String value) {
+ this.graph = value;
+ }
+
+ /**
+ * Gets the value of the source property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getSource() {
+ return source;
+ }
+
+ /**
+ * Sets the value of the source property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setSource(String value) {
+ this.source = value;
+ }
+
+ /**
+ * Gets the value of the target property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getTarget() {
+ return target;
+ }
+
+ /**
+ * Sets the value of the target property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setTarget(String value) {
+ this.target = value;
+ }
+
+ /**
+ * Gets the value of the isDefault property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public Boolean isIsDefault() {
+ return isDefault;
+ }
+
+ /**
+ * Sets the value of the isDefault property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setIsDefault(Boolean value) {
+ this.isDefault = value;
+ }
+
+ /**
+ * Gets the value of the conditionType property.
+ *
+ * @return
+ * possible object is
+ * {@link SequenceFlowConditionType }
+ *
+ */
+ public SequenceFlowConditionType getConditionType() {
+ return conditionType;
+ }
+
+ /**
+ * Sets the value of the conditionType property.
+ *
+ * @param value
+ * allowed object is
+ * {@link SequenceFlowConditionType }
+ *
+ */
+ public void setConditionType(SequenceFlowConditionType value) {
+ this.conditionType = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SequenceFlowConditionType.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/SequenceFlowConditionType.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SequenceFlowConditionType.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SequenceFlowConditionType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,61 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for SequenceFlowConditionType.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * <simpleType name="SequenceFlowConditionType">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="None"/>
+ * <enumeration value="Expression"/>
+ * <enumeration value="Default"/>
+ * </restriction>
+ * </simpleType>
+ * </pre>
+ *
+ */
+@XmlType(name = "SequenceFlowConditionType")
+@XmlEnum
+public enum SequenceFlowConditionType {
+
+ @XmlEnumValue("None")
+ NONE("None"),
+ @XmlEnumValue("Expression")
+ EXPRESSION("Expression"),
+ @XmlEnumValue("Default")
+ DEFAULT("Default");
+ private final String value;
+
+ SequenceFlowConditionType(String v) {
+ value = v;
+ }
+
+ public String value() {
+ return value;
+ }
+
+ public static SequenceFlowConditionType fromValue(String v) {
+ for (SequenceFlowConditionType c: SequenceFlowConditionType.values()) {
+ if (c.value.equals(v)) {
+ return c;
+ }
+ }
+ throw new IllegalArgumentException(v);
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SubProcess.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/SubProcess.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SubProcess.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/SubProcess.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,105 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for SubProcess complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="SubProcess">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Activity">
+ * <sequence>
+ * <element name="eventHandlers" type="{http://stp.eclipse.org/bpmn}Activity" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="isTransaction" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "SubProcess", propOrder = {
+ "eventHandlers"
+})
+public class SubProcess
+ extends Activity
+{
+
+ protected List<Activity> eventHandlers;
+ @XmlAttribute
+ protected Boolean isTransaction;
+
+ /**
+ * Gets the value of the eventHandlers property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the eventHandlers property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getEventHandlers().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link Activity }
+ *
+ *
+ */
+ public List<Activity> getEventHandlers() {
+ if (eventHandlers == null) {
+ eventHandlers = new ArrayList<Activity>();
+ }
+ return this.eventHandlers;
+ }
+
+ /**
+ * Gets the value of the isTransaction property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public Boolean isIsTransaction() {
+ return isTransaction;
+ }
+
+ /**
+ * Sets the value of the isTransaction property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setIsTransaction(Boolean value) {
+ this.isTransaction = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/TextAnnotation.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/TextAnnotation.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/TextAnnotation.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/TextAnnotation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,39 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for TextAnnotation complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="TextAnnotation">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}Artifact">
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TextAnnotation")
+public class TextAnnotation
+ extends Artifact
+{
+
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Vertex.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/Vertex.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Vertex.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/Vertex.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,145 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+
+package org.jbpm.dialect.stp.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Vertex complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="Vertex">
+ * <complexContent>
+ * <extension base="{http://stp.eclipse.org/bpmn}IdentifiableNode">
+ * <sequence>
+ * <element name="outgoingEdges" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="incomingEdges" type="{http://www.w3.org/2001/XMLSchema}anyURI" maxOccurs="unbounded" minOccurs="0"/>
+ * </sequence>
+ * <attribute name="graph" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Vertex", propOrder = {
+ "outgoingEdges",
+ "incomingEdges"
+})
+@XmlSeeAlso({
+ Activity.class
+})
+public class Vertex
+ extends IdentifiableNode
+{
+
+ @XmlSchemaType(name = "anyURI")
+ protected List<String> outgoingEdges;
+ @XmlSchemaType(name = "anyURI")
+ protected List<String> incomingEdges;
+ @XmlAttribute
+ @XmlSchemaType(name = "anyURI")
+ protected String graph;
+
+ /**
+ * Gets the value of the outgoingEdges property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the outgoingEdges property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getOutgoingEdges().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link String }
+ *
+ *
+ */
+ public List<String> getOutgoingEdges() {
+ if (outgoingEdges == null) {
+ outgoingEdges = new ArrayList<String>();
+ }
+ return this.outgoingEdges;
+ }
+
+ /**
+ * Gets the value of the incomingEdges property.
+ *
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the incomingEdges property.
+ *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getIncomingEdges().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link String }
+ *
+ *
+ */
+ public List<String> getIncomingEdges() {
+ if (incomingEdges == null) {
+ incomingEdges = new ArrayList<String>();
+ }
+ return this.incomingEdges;
+ }
+
+ /**
+ * Gets the value of the graph property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getGraph() {
+ return graph;
+ }
+
+ /**
+ * Sets the value of the graph property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setGraph(String value) {
+ this.graph = value;
+ }
+
+}
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore)
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EAnnotation.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EAnnotation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EAnnotation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EAttribute.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EAttribute.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EAttribute.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EClass.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EClass.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EClass.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EClassifier.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EClassifier.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EClassifier.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EDataType.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EDataType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EDataType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EEnum.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EEnum.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EEnum.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EEnumLiteral.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EEnumLiteral.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EEnumLiteral.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EFactory.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EFactory.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EFactory.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EModelElement.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EModelElement.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EModelElement.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
@@ -16,8 +16,8 @@
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-import org.jboss.bpm.dialect.stp.model.Association;
-import org.jboss.bpm.dialect.stp.model.Identifiable;
+import org.jbpm.dialect.stp.model.Association;
+import org.jbpm.dialect.stp.model.Identifiable;
/**
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/ENamedElement.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/ENamedElement.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/ENamedElement.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EObject.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EObject.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EObject.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
@@ -24,7 +24,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
-import org.jboss.bpm.dialect.stp.model.xmi.Extension;
+import org.jbpm.dialect.stp.model.xmi.Extension;
/**
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EOperation.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EOperation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EOperation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EPackage.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EPackage.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EPackage.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EParameter.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EParameter.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EParameter.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EReference.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EReference.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EReference.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EStringToStringMapEntry.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EStringToStringMapEntry.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EStringToStringMapEntry.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
@@ -23,7 +23,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import javax.xml.namespace.QName;
-import org.jboss.bpm.dialect.stp.model.xmi.Extension;
+import org.jbpm.dialect.stp.model.xmi.Extension;
/**
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EStructuralFeature.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/EStructuralFeature.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/EStructuralFeature.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/ETypedElement.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/ETypedElement.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/ETypedElement.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/ObjectFactory.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/ObjectFactory.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/ObjectFactory.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/package-info.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/ecore/package-info.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/ecore/package-info.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,4 +6,4 @@
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.eclipse.org/emf/2002/Ecore")
-package org.jboss.bpm.dialect.stp.model.ecore;
+package org.jbpm.dialect.stp.model.ecore;
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/package-info.java (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/package-info.java)
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/package-info.java (rev 0)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/package-info.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2008.07.17 at 06:01:54 PM CEST
+//
+
+(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://stp.eclipse.org/bpmn")
+package org.jbpm.dialect.stp.model;
Copied: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi (from rev 2529, projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi)
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Add.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Add.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Add.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Any.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Any.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Any.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Delete.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Delete.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Delete.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Difference.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Difference.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Difference.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Documentation.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Documentation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Documentation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Extension.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Extension.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Extension.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Import.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Import.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Import.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/MetaModel.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/MetaModel.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/MetaModel.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Model.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Model.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Model.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/ObjectFactory.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/ObjectFactory.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/ObjectFactory.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/PackageReference.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/PackageReference.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/PackageReference.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Replace.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/Replace.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/Replace.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/XMI.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/XMI.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/XMI.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/package-info.java
===================================================================
--- projects/spec/trunk/modules/dialects/stp/src/main/java/org/jboss/bpm/dialect/stp/model/xmi/package-info.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/stp/src/main/java/org/jbpm/dialect/stp/model/xmi/package-info.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,4 +6,4 @@
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.omg.org/XMI")
-package org.jboss.bpm.dialect.stp.model.xmi;
+package org.jbpm.dialect.stp.model.xmi;
Copied: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java (from rev 2529, projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/DialectHandlerImpl.java)
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java (rev 0)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/DialectHandlerImpl.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,94 @@
+/*
+ * 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.dialect.xpdl21;
+
+// $Id$
+
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.Writer;
+import java.net.URI;
+import java.net.URL;
+
+import javax.xml.bind.JAXBException;
+
+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;
+
+/**
+ * The DialectHandler converts a supported dialect to the internal Process model.
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Jun-2008
+ */
+public class DialectHandlerImpl implements DialectHandler
+{
+ public static final URI NAMESPACE_URI = URI.create("http://www.wfmc.org/2008/XPDL2.1");
+
+ public URI getNamespaceURI()
+ {
+ return NAMESPACE_URI;
+ }
+
+ @Override
+ public ProcessDefinition createProcessDefinition(String pXML)
+ {
+ try
+ {
+ ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+ XPDLWorkflowProcess jaxbProc = unmarschaller.unmarshallProcess(new StringReader(pXML));
+ ProcessDefinition proc = new WorkflowProcessAdapter().adaptWorkflowProcess(jaxbProc);
+ return proc;
+ }
+ catch (JAXBException ex)
+ {
+ throw new InvalidProcessException("Cannot unmarschall: " + pXML, ex);
+ }
+ }
+
+ @Override
+ public ProcessDefinition createProcessDefinition(URL pURL) throws IOException
+ {
+ try
+ {
+ ProcessUnmarshaller unmarschaller = new ProcessUnmarshaller();
+ XPDLWorkflowProcess jaxbProc = unmarschaller.unmarshallProcess(new InputStreamReader(pURL.openStream()));
+ ProcessDefinition proc = new WorkflowProcessAdapter().adaptWorkflowProcess(jaxbProc);
+ return proc;
+ }
+ catch (JAXBException ex)
+ {
+ throw new InvalidProcessException("Cannot unmarschall: " + pURL, ex);
+ }
+ }
+
+ @Override
+ public void marshallProcess(Process proc, Writer out) throws IOException
+ {
+ throw new NotImplementedException("JBPM-1640", "DialectHandler XPL2.1 marshallProcess");
+ }
+}
\ No newline at end of file
Copied: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/ProcessUnmarshaller.java (from rev 2529, projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/ProcessUnmarshaller.java)
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/ProcessUnmarshaller.java (rev 0)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/ProcessUnmarshaller.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -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.dialect.xpdl21;
+
+// $Id$
+
+import java.io.Reader;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBException;
+import javax.xml.bind.Unmarshaller;
+
+import org.jbpm.dialect.xpdl21.model.ObjectFactory;
+import org.jbpm.dialect.xpdl21.model.XPDLWorkflowProcess;
+
+/**
+ * A JAXB unmarshaller for a Process
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 08-Jul-2008
+ */
+public class ProcessUnmarshaller
+{
+ public XPDLWorkflowProcess unmarshallProcess(Reader xml) throws JAXBException
+ {
+ JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ unmarshaller.setProperty("com.sun.xml.bind.ObjectFactory",new ObjectFactory());
+ XPDLWorkflowProcess proc = (XPDLWorkflowProcess)unmarshaller.unmarshal(xml);
+ return proc;
+ }
+}
Copied: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java (from rev 2529, projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/WorkflowProcessAdapter.java)
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java (rev 0)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/WorkflowProcessAdapter.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -0,0 +1,76 @@
+/*
+ * 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.dialect.xpdl21;
+
+// $Id$
+
+import org.jbpm.api.InvalidProcessException;
+import org.jbpm.api.model.ProcessDefinition;
+import org.jbpm.api.model.builder.ProcessBuilder;
+import org.jbpm.api.service.ProcessBuilderService;
+import org.jbpm.dialect.xpdl21.model.XPDLActivities;
+import org.jbpm.dialect.xpdl21.model.XPDLActivity;
+import org.jbpm.dialect.xpdl21.model.XPDLEvent;
+import org.jbpm.dialect.xpdl21.model.XPDLWorkflowProcess;
+
+/**
+ * Adapt the jpdl-3.2 ProcessDefinition to the API Process
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 18-Jun-2008
+ */
+public class WorkflowProcessAdapter
+{
+ public ProcessDefinition adaptWorkflowProcess(XPDLWorkflowProcess xpdlProc)
+ {
+ ProcessBuilder procBuilder = ProcessBuilderService.locateProcessBuilder();
+ procBuilder.addProcess(xpdlProc.getName());
+
+ XPDLActivities xpdlActivities = xpdlProc.getActivities();
+ for (XPDLActivity xpdlActivity : xpdlActivities.getActivity())
+ {
+ XPDLEvent xpdlEvent = xpdlActivity.getEvent();
+ if (xpdlEvent != null)
+ {
+ if (xpdlEvent.getStartEvent() != null)
+ {
+ procBuilder.addStartEvent("Start");
+ }
+ else if (xpdlEvent.getEndEvent() != null)
+ {
+ procBuilder.addEndEvent(xpdlActivity.getName());
+ }
+ else
+ {
+ throw new InvalidProcessException("Unsupported type: " + xpdlEvent);
+ }
+ }
+ else
+ {
+ throw new InvalidProcessException("Unsupported type: " + xpdlActivity);
+ }
+ }
+
+ ProcessDefinition procDef = procBuilder.getProcessDefinition();
+ return procDef;
+ }
+}
Copied: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model (from rev 2529, projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model)
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/ApplicationType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/ApplicationType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/ApplicationType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/ExpressionType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/ExpressionType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/ExpressionType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/MessageType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/MessageType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/MessageType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/ObjectFactory.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/ObjectFactory.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/ObjectFactory.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import javax.xml.bind.JAXBElement;
import javax.xml.bind.annotation.XmlElementDecl;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/PackageType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/PackageType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/PackageType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivities.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLActivities.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivities.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivity.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLActivity.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivity.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.math.BigInteger;
import java.util.ArrayList;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivitySet.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLActivitySet.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivitySet.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivitySets.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLActivitySets.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActivitySets.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActualParameters.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLActualParameters.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLActualParameters.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLApplication.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLApplication.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLApplication.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLApplications.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLApplications.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLApplications.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArrayType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLArrayType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArrayType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArtifact.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLArtifact.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArtifact.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArtifactInput.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLArtifactInput.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArtifactInput.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArtifacts.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLArtifacts.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLArtifacts.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssignment.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLAssignment.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssignment.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssignments.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLAssignments.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssignments.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssociation.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLAssociation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssociation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssociations.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLAssociations.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAssociations.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAuthor.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLAuthor.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLAuthor.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLBasicType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLBasicType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLBasicType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLBlockActivity.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLBlockActivity.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLBlockActivity.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCategories.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCategories.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCategories.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCategory.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCategory.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCategory.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCodepage.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCodepage.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCodepage.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCondition.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCondition.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCondition.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.io.Serializable;
import java.util.ArrayList;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLConformanceClass.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLConformanceClass.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLConformanceClass.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLConnectorGraphicsInfo.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLConnectorGraphicsInfo.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLConnectorGraphicsInfo.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLConnectorGraphicsInfos.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLConnectorGraphicsInfos.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLConnectorGraphicsInfos.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCoordinates.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCoordinates.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCoordinates.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCost.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCost.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCost.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCostStructure.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCostStructure.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCostStructure.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.math.BigInteger;
import java.util.ArrayList;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCostUnit.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCostUnit.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCostUnit.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCountrykey.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCountrykey.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCountrykey.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCreated.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLCreated.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLCreated.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataField.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDataField.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataField.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataFields.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDataFields.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataFields.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataMapping.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDataMapping.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataMapping.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataMappings.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDataMappings.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataMappings.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataObject.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDataObject.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataObject.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDataType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDataType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDeadline.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDeadline.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDeadline.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDeclaredType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDeclaredType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDeclaredType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDescription.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDescription.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDescription.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDocumentation.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDocumentation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDocumentation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDuration.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLDuration.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLDuration.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEndEvent.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLEndEvent.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEndEvent.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEndPoint.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLEndPoint.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEndPoint.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEnumerationType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLEnumerationType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEnumerationType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEnumerationValue.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLEnumerationValue.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEnumerationValue.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEvent.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLEvent.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLEvent.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExtendedAttribute.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLExtendedAttribute.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExtendedAttribute.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExtendedAttributes.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLExtendedAttributes.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExtendedAttributes.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.List;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExternalPackage.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLExternalPackage.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExternalPackage.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExternalPackages.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLExternalPackages.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExternalPackages.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExternalReference.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLExternalReference.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLExternalReference.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLFormalParameter.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLFormalParameter.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLFormalParameter.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLFormalParameters.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLFormalParameters.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLFormalParameters.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLGroup.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLGroup.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLGroup.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLIORules.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLIORules.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLIORules.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLIcon.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLIcon.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLIcon.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.math.BigInteger;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLImplementation.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLImplementation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLImplementation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLInput.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLInput.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLInput.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLInputSet.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLInputSet.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLInputSet.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLInputSets.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLInputSets.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLInputSets.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLIntermediateEvent.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLIntermediateEvent.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLIntermediateEvent.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLJoin.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLJoin.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLJoin.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLane.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLLane.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLane.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLanes.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLLanes.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLanes.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLayoutInfo.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLLayoutInfo.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLayoutInfo.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLength.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLLength.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLength.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLimit.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLLimit.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLimit.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLListType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLListType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLListType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLoop.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLLoop.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLoop.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLoopMultiInstance.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLLoopMultiInstance.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLoopMultiInstance.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.math.BigInteger;
import java.util.ArrayList;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLoopStandard.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLLoopStandard.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLLoopStandard.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.math.BigInteger;
import java.util.ArrayList;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLMember.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLMember.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLMember.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLMessageFlow.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLMessageFlow.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLMessageFlow.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLMessageFlows.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLMessageFlows.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLMessageFlows.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLModificationDate.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLModificationDate.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLModificationDate.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLNo.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLNo.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLNo.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLNodeGraphicsInfo.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLNodeGraphicsInfo.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLNodeGraphicsInfo.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLNodeGraphicsInfos.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLNodeGraphicsInfos.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLNodeGraphicsInfos.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLObject.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLObject.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLObject.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLOutput.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLOutput.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLOutput.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLOutputSet.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLOutputSet.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLOutputSet.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLOutputSets.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLOutputSets.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLOutputSets.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPackageHeader.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPackageHeader.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPackageHeader.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPage.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPage.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPage.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPages.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPages.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPages.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLParticipant.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLParticipant.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLParticipant.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLParticipantType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLParticipantType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLParticipantType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLParticipants.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLParticipants.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLParticipants.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLink.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPartnerLink.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLink.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLinkType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPartnerLinkType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLinkType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLinkTypes.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPartnerLinkTypes.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLinkTypes.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLinks.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPartnerLinks.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPartnerLinks.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPerformer.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPerformer.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPerformer.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPerformers.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPerformers.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPerformers.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPool.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPool.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPool.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPools.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPools.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPools.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPrecision.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPrecision.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPrecision.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPriority.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPriority.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPriority.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPriorityUnit.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPriorityUnit.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPriorityUnit.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLProcessHeader.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLProcessHeader.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLProcessHeader.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPropertyInput.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLPropertyInput.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLPropertyInput.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRecordType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLRecordType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRecordType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRedefinableHeader.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLRedefinableHeader.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRedefinableHeader.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLReference.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLReference.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLReference.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResourceCosts.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLResourceCosts.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResourceCosts.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.math.BigDecimal;
import javax.xml.bind.annotation.XmlAccessType;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResponsible.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLResponsible.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResponsible.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResponsibles.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLResponsibles.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResponsibles.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResultError.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLResultError.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResultError.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResultMultiple.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLResultMultiple.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLResultMultiple.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRoute.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLRoute.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRoute.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRule.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLRule.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLRule.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLScale.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLScale.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLScale.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSchemaType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLSchemaType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSchemaType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLScript.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLScript.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLScript.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSimulationInformation.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLSimulationInformation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSimulationInformation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSplit.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLSplit.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSplit.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLStartEvent.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLStartEvent.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLStartEvent.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSubFlow.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLSubFlow.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLSubFlow.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTask.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTask.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTask.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskApplication.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTaskApplication.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskApplication.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskManual.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTaskManual.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskManual.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskReceive.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTaskReceive.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskReceive.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskReference.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTaskReference.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskReference.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskScript.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTaskScript.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskScript.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskSend.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTaskSend.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskSend.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskService.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTaskService.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskService.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskUser.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTaskUser.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTaskUser.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTimeEstimation.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTimeEstimation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTimeEstimation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransaction.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTransaction.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransaction.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransition.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTransition.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransition.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRef.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTransitionRef.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRef.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRefs.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTransitionRefs.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRefs.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRestriction.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTransitionRestriction.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRestriction.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRestrictions.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTransitionRestrictions.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitionRestrictions.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitions.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTransitions.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTransitions.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerConditional.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTriggerConditional.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerConditional.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerIntermediateMultiple.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTriggerIntermediateMultiple.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerIntermediateMultiple.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerMultiple.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTriggerMultiple.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerMultiple.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultCompensation.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTriggerResultCompensation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultCompensation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultLink.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTriggerResultLink.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultLink.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultMessage.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTriggerResultMessage.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultMessage.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultSignal.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTriggerResultSignal.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerResultSignal.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerTimer.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTriggerTimer.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTriggerTimer.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTypeDeclaration.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTypeDeclaration.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTypeDeclaration.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTypeDeclarations.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLTypeDeclarations.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLTypeDeclarations.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLUnionType.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLUnionType.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLUnionType.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLValidFrom.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLValidFrom.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLValidFrom.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLValidTo.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLValidTo.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLValidTo.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVendor.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLVendor.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVendor.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVendorExtension.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLVendorExtension.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVendorExtension.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVendorExtensions.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLVendorExtensions.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVendorExtensions.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVersion.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLVersion.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLVersion.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWaitingTime.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLWaitingTime.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWaitingTime.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWebServiceFaultCatch.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLWebServiceFaultCatch.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWebServiceFaultCatch.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWebServiceOperation.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLWebServiceOperation.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWebServiceOperation.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWorkflowProcess.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLWorkflowProcess.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWorkflowProcess.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWorkflowProcesses.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLWorkflowProcesses.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWorkflowProcesses.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWorkingTime.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLWorkingTime.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLWorkingTime.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLXPDLVersion.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/XPDLXPDLVersion.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/XPDLXPDLVersion.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,7 +6,7 @@
//
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
import java.util.HashMap;
import java.util.Map;
Modified: projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/package-info.java
===================================================================
--- projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jboss/bpm/dialect/xpdl21/model/package-info.java 2008-10-10 16:04:35 UTC (rev 2529)
+++ projects/spec/trunk/modules/dialects/xpdl21/src/main/java/org/jbpm/dialect/xpdl21/model/package-info.java 2008-10-10 16:20:55 UTC (rev 2531)
@@ -6,4 +6,4 @@
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.wfmc.org/2008/XPDL2.1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.jboss.bpm.dialect.xpdl21.model;
+package org.jbpm.dialect.xpdl21.model;
17 years, 6 months
- 1
- 0