9:10 a.m.
Author: koen.aers(a)jboss.com
Date: 2009-12-22 10:10:53 -0500 (Tue, 22 Dec 2009)
New Revision: 6019
Modified:
jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml
Log:
- xsd update: add jms element
- update the jms processes to contain namespace
Modified: jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd
===================================================================
--- jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd 2009-12-22 13:32:20 UTC (rev
6018)
+++ jbpm4/trunk/modules/api/src/main/resources/jpdl-4.3.xsd 2009-12-22 15:10:53 UTC (rev
6019)
@@ -328,6 +328,23 @@
</complexType>
</element>
+ <!-- ~~~ JMS ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+ <element name="jms">
+ <annotation><documentation>Sends an email
+ </documentation></annotation>
+ <complexType>
+ <complexContent>
+ <extension base="tns:jmsType">
+ <sequence>
+ <element ref="tns:on" minOccurs="0"
maxOccurs="unbounded"/>
+ <element ref="tns:transition" minOccurs="0"
maxOccurs="unbounded" />
+ </sequence>
+ <attributeGroup ref="tns:activityAttributes" />
+ </extension>
+ </complexContent>
+ </complexType>
+ </element>
+
<!-- ~~~ JAVA ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<element name="java">
<annotation><documentation>Invokes a method on a java object.
@@ -607,37 +624,7 @@
</complexType>
</element>
- <element name="map">
- <annotation><documentation>A
java.util.Map</documentation></annotation>
- <complexType>
- <choice minOccurs="0" maxOccurs="unbounded">
- <element name="entry">
- <complexType>
- <choice minOccurs="0">
- <element name="key" minOccurs="0">
- <complexType>
- <group ref="tns:wireObjectGroup" />
- </complexType>
- </element>
- <element name="value" minOccurs="0">
- <complexType>
- <group ref="tns:wireObjectGroup" />
- </complexType>
- </element>
- </choice>
- </complexType>
- </element>
- </choice>
- <attribute name="class" type="string"
default="java.util.HashMap">
- <annotation><documentation>Implementation class for this map.
- </documentation></annotation>
- </attribute>
- <attribute name="synchronized"
type="tns:booleanValueType" default="false">
- <annotation><documentation>Indicates if this collection should be
synchronized
- with
Collections.synchronizedList(List)</documentation></annotation>
- </attribute>
- </complexType>
- </element>
+ <element name="map" type="tns:mapType"/>
<element name="set">
<annotation><documentation>A java.util.Set
@@ -943,6 +930,36 @@
</documentation></annotation>
</attribute>
</complexType>
+
+ <complexType name="mapType">
+ <annotation><documentation>A
java.util.Map</documentation></annotation>
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element name="entry">
+ <complexType>
+ <sequence minOccurs="0">
+ <element name="key" minOccurs="0">
+ <complexType>
+ <group ref="tns:wireObjectGroup" />
+ </complexType>
+ </element>
+ <element name="value" minOccurs="0">
+ <complexType>
+ <group ref="tns:wireObjectGroup" />
+ </complexType>
+ </element>
+ </sequence>
+ </complexType>
+ </element>
+ </choice>
+ <attribute name="class" type="string"
default="java.util.HashMap">
+ <annotation><documentation>Implementation class for this map.
+ </documentation></annotation>
+ </attribute>
+ <attribute name="synchronized" type="tns:booleanValueType"
default="false">
+ <annotation><documentation>Indicates if this collection should be
synchronized
+ with Collections.synchronizedList(List)</documentation></annotation>
+ </attribute>
+ </complexType>
<complexType name="javaType">
<sequence>
@@ -1286,6 +1303,20 @@
<attribute name="template" type="tns:templateType" />
</complexType>
+ <complexType name="jmsType">
+ <choice minOccurs="1" maxOccurs="1">
+ <element name="object" type="tns:wireObjectType"/>
+ <element name="text" type="string"/>
+ <element name="map" type="tns:mapType"/>
+ </choice>
+ <attribute name="connection-factory" type="string">
+ <annotation><documentation>jndi name of the jms connection
factory</documentation></annotation>
+ </attribute>
+ <attribute name="destination" type="string">
+ <annotation><documentation>jndi name of the destination to send the
message to</documentation></annotation>
+ </attribute>
+ </complexType>
+
<complexType name="mailRecipientType">
<attribute name="addresses" type="string">
<annotation><documentation>list of email address separated by
',' (comma) ';' (semicolon) '|' or
whitespace</documentation></annotation>
Modified:
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml
===================================================================
---
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml 2009-12-22
13:32:20 UTC (rev 6018)
+++
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/map/process.jpdl.xml 2009-12-22
15:10:53 UTC (rev 6019)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="JMS_map_queue">
+<process name="JMS_map_queue"
xmlns="http://jbpm.org/4.3/jpdl">
<start g="20,20,48,48">
<transition to="send message" />
Modified:
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml
===================================================================
---
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml 2009-12-22
13:32:20 UTC (rev 6018)
+++
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/object/process.jpdl.xml 2009-12-22
15:10:53 UTC (rev 6019)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="JMS_object_queue">
+<process name="JMS_object_queue"
xmlns="http://jbpm.org/4.3/jpdl">
<start g="20,20,48,48">
<transition to="send message" />
Modified:
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml
===================================================================
---
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml 2009-12-22
13:32:20 UTC (rev 6018)
+++
jbpm4/trunk/modules/test-enterprise/test-enterprise-suite/src/test/resources/org/jbpm/test/jms/text/process.jpdl.xml 2009-12-22
15:10:53 UTC (rev 6019)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process name="JMS_text_queue">
+<process name="JMS_text_queue"
xmlns="http://jbpm.org/4.3/jpdl">
<start g="20,20,48,48">
<transition to="send message" />