[jboss-svn-commits] JBL Code SVN: r21499 - in labs/jbossrules/trunk/drools-examples/drools-examples-drl: src/main/resources/META-INF and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Aug 12 19:30:39 EDT 2008
Author: KrisVerlaenen
Date: 2008-08-12 19:30:39 -0400 (Tue, 12 Aug 2008)
New Revision: 21499
Modified:
labs/jbossrules/trunk/drools-examples/drools-examples-drl/.classpath
labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/resources/META-INF/OrderWorkDefinitions.conf
labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/process/order/RuleSetExample.rf
labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/ruleflow/workitems.rf
Log:
JBRULES-1730: Add support for other data types when writing processes to XML
- pluggable data types support
Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/.classpath 2008-08-12 23:29:16 UTC (rev 21498)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/.classpath 2008-08-12 23:30:39 UTC (rev 21499)
@@ -1,21 +1,13 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/main/rules" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/jgoodies/forms/1.0.7/forms-1.0.7.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-templates/5.0.0.SNAPSHOT/drools-templates-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-templates/5.0.0.SNAPSHOT/drools-templates-5.0.0.SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.2.3.v_686_R32x/core-3.2.3.v_686_R32x.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-decisiontables/5.0.0.SNAPSHOT/drools-decisiontables-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-decisiontables/5.0.0.SNAPSHOT/drools-decisiontables-5.0.0.SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/foxtrot/foxtrot/2.0/foxtrot-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-dp4/mvel-2.0-dp4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0/antlr-runtime-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.10/janino-2.5.10.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/rules"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/foxtrot-2.0.jar"/>
+ <classpathentry kind="lib" path="lib/jgoodies-forms-1.0.4.jar"/>
+ <classpathentry kind="con" path="DROOLS/Drools"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/resources/META-INF/OrderWorkDefinitions.conf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/resources/META-INF/OrderWorkDefinitions.conf 2008-08-12 23:29:16 UTC (rev 21498)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/resources/META-INF/OrderWorkDefinitions.conf 2008-08-12 23:30:39 UTC (rev 21499)
@@ -3,7 +3,6 @@
// The allowed properties are name, parameters, displayName, icon and customEditor
// The returned result should thus be of type List<Map<String, Object>>
import org.drools.process.core.datatype.impl.type.StringDataType;
-import org.drools.process.core.datatype.impl.type.DateDataType;
[
Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/process/order/RuleSetExample.rf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/process/order/RuleSetExample.rf 2008-08-12 23:29:16 UTC (rev 21498)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/process/order/RuleSetExample.rf 2008-08-12 23:30:39 UTC (rev 21499)
@@ -27,10 +27,20 @@
<nodes>
<humanTask id="17" name="Verify Order" x="73" y="505" width="114" height="40" swimlane="SalesRepresentative" >
<work name="Human Task" >
- <parameter name="Priority" type="org.drools.process.core.datatype.impl.type.StringDataType" />
- <parameter name="TaskName" type="org.drools.process.core.datatype.impl.type.StringDataType" >Verify Order</parameter>
- <parameter name="Comment" type="org.drools.process.core.datatype.impl.type.StringDataType" >#{order} has been shipped, verify that it reaches its destination correctly</parameter>
- <parameter name="ActorId" type="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <parameter name="Priority" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ </parameter>
+ <parameter name="TaskName" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>Verify Order</value>
+ </parameter>
+ <parameter name="Comment" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>#{order} has been shipped, verify that it reaches its destination correctly</value>
+ </parameter>
+ <parameter name="ActorId" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ </parameter>
</work>
</humanTask>
<start id="1" name="Start" x="88" y="16" width="80" height="40" />
@@ -48,38 +58,72 @@
<end id="8" name="End" x="90" y="565" width="80" height="40" />
<humanTask id="9" name="Correct Order" x="185" y="104" width="96" height="40" swimlane="SalesRepresentative" >
<work name="Human Task" >
- <parameter name="Priority" type="org.drools.process.core.datatype.impl.type.StringDataType" />
- <parameter name="TaskName" type="org.drools.process.core.datatype.impl.type.StringDataType" >Correct Order</parameter>
- <parameter name="Comment" type="org.drools.process.core.datatype.impl.type.StringDataType" >Invalid #{order}, needs to be corrected (contact customer if necessary)</parameter>
- <parameter name="ActorId" type="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <parameter name="Priority" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ </parameter>
+ <parameter name="TaskName" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>Correct Order</value>
+ </parameter>
+ <parameter name="Comment" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>Invalid #{order}, needs to be corrected (contact customer if necessary)</value>
+ </parameter>
+ <parameter name="ActorId" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ </parameter>
</work>
</humanTask>
<humanTask id="10" name="Follow-up Order" x="8" y="204" width="106" height="40" swimlane="SalesRepresentative" >
<work name="Human Task" >
- <parameter name="Priority" type="org.drools.process.core.datatype.impl.type.StringDataType" />
- <parameter name="TaskName" type="org.drools.process.core.datatype.impl.type.StringDataType" >Follow-up Order</parameter>
- <parameter name="Comment" type="org.drools.process.core.datatype.impl.type.StringDataType" >#{order} is a large order, follow up manually</parameter>
- <parameter name="ActorId" type="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <parameter name="Priority" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ </parameter>
+ <parameter name="TaskName" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>Follow-up Order</value>
+ </parameter>
+ <parameter name="Comment" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>#{order} is a large order, follow up manually</value>
+ </parameter>
+ <parameter name="ActorId" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ </parameter>
</work>
</humanTask>
<workItem id="12" name="Email" x="89" y="441" width="80" height="40" >
<work name="Email" >
- <parameter name="Text" type="org.drools.process.core.datatype.impl.type.StringDataType" >Dear customer,
+ <parameter name="Text" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>Dear customer,
#{order} is being shipped.
You can track your shipment at our website using tracking id #{trackingId}.
John Johnsson,
Sales departement manager
-MyCompany.com</parameter>
- <parameter name="To" type="org.drools.process.core.datatype.impl.type.StringDataType" >#{email}</parameter>
- <parameter name="Subject" type="org.drools.process.core.datatype.impl.type.StringDataType" >#{order}</parameter>
- <parameter name="From" type="org.drools.process.core.datatype.impl.type.StringDataType" >orders at mycompany.com</parameter>
+MyCompany.com</value>
+ </parameter>
+ <parameter name="To" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>#{email}</value>
+ </parameter>
+ <parameter name="Subject" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>#{order}</value>
+ </parameter>
+ <parameter name="From" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>orders at mycompany.com</value>
+ </parameter>
</work>
</workItem>
<workItem id="13" name="Shipping" x="88" y="376" width="80" height="40" >
<work name="Shipping" >
- <parameter name="orderId" type="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <parameter name="orderId" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ </parameter>
</work>
<mapping type="in" from="order" to="order" />
<mapping type="out" from="trackingId" to="trackingId" />
Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/ruleflow/workitems.rf
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/ruleflow/workitems.rf 2008-08-12 23:29:16 UTC (rev 21498)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/src/main/rules/org/drools/examples/ruleflow/workitems.rf 2008-08-12 23:30:39 UTC (rev 21499)
@@ -12,21 +12,39 @@
<split id="2" name="Split" x="120" y="100" width="80" height="40" type="1" />
<workItem id="3" name="Log" x="232" y="61" width="80" height="40" >
<work name="Log" >
- <parameter name="Message" type="org.drools.process.core.datatype.impl.type.StringDataType" >This is the first log message</parameter>
+ <parameter name="Message" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>This is the first log message</value>
+ </parameter>
</work>
</workItem>
<workItem id="4" name="Email" x="231" y="139" width="80" height="40" >
<work name="Email" >
- <parameter name="From" type="org.drools.process.core.datatype.impl.type.StringDataType" >me at mail.com</parameter>
- <parameter name="Subject" type="org.drools.process.core.datatype.impl.type.StringDataType" >Urgent!</parameter>
- <parameter name="To" type="org.drools.process.core.datatype.impl.type.StringDataType" >you at mail.com</parameter>
- <parameter name="Text" type="org.drools.process.core.datatype.impl.type.StringDataType" >This is an urgent email !</parameter>
+ <parameter name="From" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>me at mail.com</value>
+ </parameter>
+ <parameter name="Subject" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>Urgent!</value>
+ </parameter>
+ <parameter name="To" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>you at mail.com</value>
+ </parameter>
+ <parameter name="Text" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>This is an urgent email !</value>
+ </parameter>
</work>
</workItem>
<join id="5" name="Join" x="333" y="99" width="80" height="40" type="1" />
<workItem id="6" name="Log" x="435" y="97" width="80" height="40" >
<work name="Log" >
- <parameter name="Message" type="org.drools.process.core.datatype.impl.type.StringDataType" >This is the second log message</parameter>
+ <parameter name="Message" >
+ <type name="org.drools.process.core.datatype.impl.type.StringDataType" />
+ <value>This is the second log message</value>
+ </parameter>
</work>
</workItem>
<end id="7" name="End" x="538" y="95" width="80" height="40" />
More information about the jboss-svn-commits
mailing list