7:03 a.m.
Author: tom.baeyens(a)jboss.com
Date: 2008-12-22 08:03:21 -0500 (Mon, 22 Dec 2008)
New Revision: 3500
Modified:
jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml
Log:
added schema for new node types
Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-22 11:21:33 UTC (rev
3499)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl.xsd 2008-12-22 13:03:21 UTC (rev
3500)
@@ -133,6 +133,7 @@
</documentation></annotation>
<complexType>
<sequence>
+ <element name="handler" minOccurs="0"
type="tns:wireObjectType" />
<element name="flow" minOccurs="0"
maxOccurs="unbounded">
<complexType>
<complexContent>
@@ -141,8 +142,7 @@
<element name="condition" minOccurs="0"
maxOccurs="unbounded">
<complexType>
<attribute name="expr"
type="string">
- <annotation><documentation>The script text that
will be evaluated. This
- is mutually exclusive with the expression element.
+ <annotation><documentation>The script text that
will be evaluated.
</documentation></annotation>
</attribute>
<attribute name="lang"
type="string">
@@ -159,6 +159,15 @@
</element>
</sequence>
<attributeGroup ref="tns:nodeAttributes" />
+ <attribute name="expr" type="string">
+ <annotation><documentation>The script that will be evaluated and
resolve to
+ the name of the outgoing flow.
+ </documentation></annotation>
+ </attribute>
+ <attribute name="lang" type="string">
+ <annotation><documentation>Identification of the scripting
language
+ to use for the expr attribute.</documentation></annotation>
+ </attribute>
</complexType>
</element>
@@ -201,6 +210,36 @@
</complexType>
</element>
+ <element name="hql">
+ <annotation><documentation>Performs a hibernate query
+ </documentation></annotation>
+ <complexType>
+ <complexContent>
+ <extension base="tns:qlType">
+ <sequence>
+ <element ref="tns:flow" minOccurs="0"
maxOccurs="unbounded" />
+ </sequence>
+ <attributeGroup ref="tns:nodeAttributes" />
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+
+ <element name="sql">
+ <annotation><documentation>Performs a hibernate SQL query
+ </documentation></annotation>
+ <complexType>
+ <complexContent>
+ <extension base="tns:qlType">
+ <sequence>
+ <element ref="tns:flow" minOccurs="0"
maxOccurs="unbounded" />
+ </sequence>
+ <attributeGroup ref="tns:nodeAttributes" />
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+
<element name="java">
<annotation><documentation>Invokes a method on a java object.
Either the java class is instantiated with reflection, or the
@@ -340,19 +379,33 @@
</attribute>
</complexType>
</element>
- <element name="object">
- <complexType>
- <attribute name="name">
- <annotation><documentation>the name of the string
object</documentation></annotation>
- </attribute>
- <attribute name="class">
- <annotation><documentation>the fully qualified
classname</documentation></annotation>
- </attribute>
- </complexType>
- </element>
+ <element name="object" type="tns:wireObjectType" />
</choice>
</group>
+ <complexType name="wireObjectType">
+ <sequence>
+ <element name="field" minOccurs="0"
maxOccurs="unbounded">
+ <annotation><documentation>Field injections from the environment
+ invocation.</documentation></annotation>
+ <complexType >
+ <group ref="tns:wireObjectGroup" />
+ </complexType>
+ </element>
+ </sequence>
+ <attribute name="object" type="string">
+ <annotation><documentation>Name of the object in the environment
+ </documentation></annotation>
+ </attribute>
+ <attribute name="class" type="string">
+ <annotation><documentation>The class to instantiate.
+ </documentation></annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation><documentation>The name of this object.
+ </documentation></annotation>
+ </attribute>
+ </complexType>
<complexType name="javaType">
<sequence>
@@ -405,6 +458,30 @@
</attribute>
</complexType>
+ <complexType name="qlType">
+ <sequence>
+ <element name="query" type="string">
+ <annotation><documentation>The query
text.</documentation></annotation>
+ </element>
+ <element name="parameters" minOccurs="0">
+ <annotation><documentation>Query
parameters.</documentation></annotation>
+ <complexType>
+ <sequence>
+ <group ref="tns:wireObjectGroup" maxOccurs="unbounded"
/>
+ </sequence>
+ </complexType>
+ </element>
+ </sequence>
+ <attribute name="var" type="string">
+ <annotation><documentation>Name of the variable in which the result
+ of the script evaluation will be stored</documentation></annotation>
+ </attribute>
+ <attribute name="unique" type="string">
+ <annotation><documentation>Does this query return a unique result or a
list
+ </documentation></annotation>
+ </attribute>
+ </complexType>
+
<complexType name="esbType">
<sequence>
<element name="part" minOccurs="0"
maxOccurs="unbounded">
Modified:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml
===================================================================
---
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2008-12-22
11:21:33 UTC (rev 3499)
+++
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/expression/process.jpdl.xml 2008-12-22
13:03:21 UTC (rev 3500)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="ExclusiveExpression">
+<process name="ExclusiveExpression"
xmlns="http://jbpm.org/4/jpdl">
<start g="70,143,48,48">
<flow to="evaluate document" />
Modified:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml
===================================================================
---
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2008-12-22
11:21:33 UTC (rev 3499)
+++
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/exclusive/handler/process.jpdl.xml 2008-12-22
13:03:21 UTC (rev 3500)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="ExclusiveHandler">
+<process name="ExclusiveHandler"
xmlns="http://jbpm.org/4/jpdl">
<start g="70,143,48,48">
<flow to="evaluate document" />
Modified:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml
===================================================================
---
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml 2008-12-22
11:21:33 UTC (rev 3499)
+++
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/hql/process.jpdl.xml 2008-12-22
13:03:21 UTC (rev 3500)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="Hql">
+<process name="Hql" xmlns="http://jbpm.org/4/jpdl">
<start g="55,85,48,48">
<flow to="get process names" />
Modified:
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml
===================================================================
---
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2008-12-22
11:21:33 UTC (rev 3499)
+++
jbpm4/trunk/modules/examples/src/test/resources/org/jbpm/examples/sql/process.jpdl.xml 2008-12-22
13:03:21 UTC (rev 3500)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="Sql">
+<process name="Sql" xmlns="http://jbpm.org/4/jpdl">
<start g="55,85,48,48">
<flow to="get process names" />