[jboss-svn-commits] JBL Code SVN: r17635 - in labs/jbossrules/trunk: drools-compiler/src/main/java/org/drools/process/builder and 23 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jan 8 20:25:38 EST 2008
Author: KrisVerlaenen
Date: 2008-01-08 20:25:37 -0500 (Tue, 08 Jan 2008)
New Revision: 17635
Added:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlRuleFlowProcesDumper.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELActivity.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELAssign.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELBasicActivity.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELFaultHandlerContainer.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELFlow.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELInvoke.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELProcess.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELReceive.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELReply.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELScope.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELSequence.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELStructuredActivity.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELAssignInstance.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELFlowInstance.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELInvokeInstance.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELLinkManager.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELNodeInstanceFactoryRegistry.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELProcessInstance.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELReceiveInstance.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELReplyInstance.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELScopeInstance.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELSequenceInstance.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/test/
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/test/BPELTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/TestXml.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/META-INF/bpelNodeBuilderRegistry.conf
labs/jbossrules/trunk/drools-compiler/src/test/resources/META-INF/bpelProcessNodeInstanceFactory.conf
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow.rf
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow_old.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/error_ruleflow_old.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow.rf
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow_old.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects_old.rf
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects_old.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects_old.rf
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects_old.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear_old.rf
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear_old.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/XmlTest.xml
labs/jbossrules/trunk/drools-core/src/test/resources/META-INF/
Removed:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/TestXmlDsl.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/error_ruleflow.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rf
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rf
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rfm
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rf
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rfm
labs/jbossrules/trunk/drools-core/src/test/resources/META-INF/
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ActionBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ProcessBuildContext.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ReturnValueEvaluatorBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueEvaluatorBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ProcessBuildData.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ActionNodeHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/EndNodeHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/StartNodeHandler.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaReturnValueConstraintEvaluatorBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueConstraintEvaluatorBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/StoreHandler.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/XmlDslTest.xml
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/processes/ActionNodeTest.xml
Log:
JBRULES-1408: Refactoring of ruleflow to act as a pluggable process engine
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -42,12 +42,12 @@
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.descr.QueryDescr;
import org.drools.lang.descr.RuleDescr;
+import org.drools.process.core.Process;
import org.drools.rule.ImportDeclaration;
import org.drools.rule.Package;
import org.drools.rule.Rule;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.RuleBuilder;
-import org.drools.ruleflow.common.core.Process;
import org.drools.xml.SemanticModules;
import org.drools.xml.XmlPackageReader;
import org.drools.xml.XmlProcessReader;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -31,12 +31,12 @@
import org.drools.base.evaluators.EvaluatorRegistry;
import org.drools.process.builder.ProcessNodeBuilder;
import org.drools.process.builder.ProcessNodeBuilderRegistry;
-import org.drools.ruleflow.core.Node;
-import org.drools.ruleflow.instance.impl.ProcessNodeInstanceFactory;
-import org.drools.ruleflow.instance.impl.ProcessNodeInstanceFactoryRegistry;
import org.drools.util.ChainedProperties;
import org.drools.util.ClassUtils;
import org.drools.util.ConfFileUtils;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.instance.impl.NodeInstanceFactory;
+import org.drools.workflow.instance.impl.NodeInstanceFactoryRegistry;
import org.drools.xml.DefaultSemanticModule;
import org.drools.xml.Handler;
import org.drools.xml.ProcessSemanticModule;
@@ -86,7 +86,7 @@
private SemanticModules semanticModules;
- private ProcessNodeBuilderRegistry nodeBuilderRegistry = new ProcessNodeBuilderRegistry();
+ private ProcessNodeBuilderRegistry nodeBuilderRegistry;
/**
* Constructor that sets the parent class loader for the package being built/compiled
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,7 +1,7 @@
package org.drools.compiler;
import org.drools.lang.descr.BaseDescr;
-import org.drools.ruleflow.common.core.Process;
+import org.drools.process.core.Process;
public class ProcessBuildError extends DescrBuildError {
private final Process process;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -20,6 +20,7 @@
import java.io.Reader;
import java.io.StringReader;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -27,19 +28,21 @@
import org.drools.lang.descr.ProcessDescr;
import org.drools.process.builder.ProcessNodeBuilder;
import org.drools.process.builder.ProcessNodeBuilderRegistry;
+import org.drools.process.core.Process;
+import org.drools.process.core.validation.ProcessValidationError;
+import org.drools.process.core.validation.ProcessValidator;
import org.drools.rule.Package;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.ruleflow.core.Connection;
-import org.drools.ruleflow.core.Constraint;
-import org.drools.ruleflow.core.MilestoneNode;
-import org.drools.ruleflow.core.Node;
import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.ruleflow.core.RuleFlowProcessValidationError;
-import org.drools.ruleflow.core.RuleFlowProcessValidator;
-import org.drools.ruleflow.core.Split;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
-import org.drools.ruleflow.core.impl.RuleFlowProcessValidatorImpl;
+import org.drools.ruleflow.core.validation.RuleFlowProcessValidator;
+import org.drools.workflow.core.Connection;
+import org.drools.workflow.core.Constraint;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.NodeContainer;
+import org.drools.workflow.core.WorkflowProcess;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
+import org.drools.workflow.core.node.MilestoneNode;
+import org.drools.workflow.core.node.Split;
import com.thoughtworks.xstream.XStream;
@@ -53,9 +56,11 @@
private PackageBuilder packageBuilder;
private final List errors = new ArrayList();
+ private Map<String, ProcessValidator> processValidators = new HashMap<String, ProcessValidator>();;
public ProcessBuilder(PackageBuilder packageBuilder) {
this.packageBuilder = packageBuilder;
+ this.processValidators.put(RuleFlowProcess.RULEFLOW_TYPE, RuleFlowProcessValidator.getInstance());
}
public List getErrors() {
@@ -63,40 +68,46 @@
}
public void buildProcess(final Process process) {
- if ( process instanceof RuleFlowProcess ) {
- RuleFlowProcessValidator validator = RuleFlowProcessValidatorImpl.getInstance();
- RuleFlowProcessValidationError[] errors = validator.validateProcess( (RuleFlowProcess) process );
+ boolean hasErrors = false;
+ ProcessValidator validator = processValidators.get(process.getType());
+ if (validator == null) {
+ System.out.println("Could not find validator for process " + process.getType() + ".");
+ System.out.println("Continuing without validation of the process " + process.getName() + "[" + process.getId() + "]");
+ } else {
+ ProcessValidationError[] errors = validator.validateProcess( (WorkflowProcess) process );
if ( errors.length != 0 ) {
+ hasErrors = true;
for ( int i = 0; i < errors.length; i++ ) {
this.errors.add( new ParserError( errors[i].toString(),
-1,
-1 ) );
}
- } else {
- // generate and add rule for process
- String rules = generateRules( process );
- try {
- packageBuilder.addPackageFromDrl( new StringReader( rules ) );
- } catch ( IOException e ) {
- // should never occur
- e.printStackTrace( System.err );
- } catch ( DroolsParserException e ) {
- // should never occur
- e.printStackTrace( System.err );
- }
- buildNodes( process );
- this.packageBuilder.getPackage().addRuleFlow( process );
+ }
+ }
+ if ( !hasErrors ) {
+ // generate and add rule for process
+ String rules = generateRules( process );
+ try {
+ packageBuilder.addPackageFromDrl( new StringReader( rules ) );
+ } catch ( IOException e ) {
+ // should never occur
+ e.printStackTrace( System.err );
+ } catch ( DroolsParserException e ) {
+ // should never occur
+ e.printStackTrace( System.err );
+ }
+ buildNodes( process );
+ this.packageBuilder.getPackage().addRuleFlow( process );
- Package pkg = this.packageBuilder.getPackage();
- if ( pkg != null ) {
- // we can only do this is this.pkg != null, as otherwise the dialects won't be properly initialised
- // as the dialects are initialised when the pkg is first created
- this.packageBuilder.getDialectRegistry().compileAll();
+ Package pkg = this.packageBuilder.getPackage();
+ if ( pkg != null ) {
+ // we can only do this is this.pkg != null, as otherwise the dialects won't be properly initialised
+ // as the dialects are initialised when the pkg is first created
+ this.packageBuilder.getDialectRegistry().compileAll();
- // some of the rules and functions may have been redefined
- if ( pkg.getPackageCompilationData().isDirty() ) {
- pkg.getPackageCompilationData().reload();
- }
+ // some of the rules and functions may have been redefined
+ if ( pkg.getPackageCompilationData().isDirty() ) {
+ pkg.getPackageCompilationData().reload();
}
}
}
@@ -107,7 +118,7 @@
public void buildNodes(Process process) {
ProcessNodeBuilderRegistry nodeBuilderRegistry = packageBuilder.getPackageBuilderConfiguration().getProcessNodeBuilderRegistry();
- RuleFlowProcess rfp = (RuleFlowProcess) process;
+ WorkflowProcess rfp = (WorkflowProcess) process;
ProcessDescr processDescr = new ProcessDescr();
processDescr.setName( rfp.getPackageName() );
@@ -122,16 +133,7 @@
this.packageBuilder.getDialectRegistry(),
dialect );
- for ( Node node : rfp.getNodes() ) {
- ProcessNodeBuilder builder = nodeBuilderRegistry.getNodeBuilder( node );
- if ( builder != null ) {
- // only build if there is a registered builder for this node type
- builder.build( process,
- processDescr,
- context,
- node );
- }
- }
+ processNodes(rfp.getNodes(), process, processDescr, context, nodeBuilderRegistry);
if ( !context.getErrors().isEmpty() ) {
this.errors.addAll( context.getErrors() );
@@ -143,6 +145,24 @@
}
}
+
+ private void processNodes(
+ Node[] nodes, Process process, ProcessDescr processDescr,
+ ProcessBuildContext context, ProcessNodeBuilderRegistry nodeBuilderRegistry) {
+ for ( Node node : nodes ) {
+ ProcessNodeBuilder builder = nodeBuilderRegistry.getNodeBuilder( node );
+ if ( builder != null ) {
+ // only build if there is a registered builder for this node type
+ builder.build( process,
+ processDescr,
+ context,
+ node );
+ }
+ if (node instanceof NodeContainer) {
+ processNodes(((NodeContainer) node).getNodes(), process, processDescr, context, nodeBuilderRegistry);
+ }
+ }
+ }
public void addProcessFromFile(final Reader reader) throws Exception {
final XStream stream = new XStream();
@@ -151,7 +171,7 @@
final ClassLoader newLoader = this.getClass().getClassLoader();
try {
Thread.currentThread().setContextClassLoader( newLoader );
- final RuleFlowProcess process = (RuleFlowProcess) stream.fromXML( reader );
+ final WorkflowProcess process = (WorkflowProcess) stream.fromXML( reader );
buildProcess( process );
} finally {
Thread.currentThread().setContextClassLoader( oldLoader );
@@ -162,8 +182,8 @@
private String generateRules(final Process process) {
StringBuilder builder = new StringBuilder();
- if ( process instanceof RuleFlowProcessImpl ) {
- RuleFlowProcessImpl ruleFlow = (RuleFlowProcessImpl) process;
+ if ( process instanceof WorkflowProcessImpl ) {
+ WorkflowProcessImpl ruleFlow = (WorkflowProcessImpl) process;
builder.append( "package " + ruleFlow.getPackageName() + "\n" );
List imports = ruleFlow.getImports();
if ( imports != null ) {
@@ -184,7 +204,7 @@
if ( nodes[i] instanceof Split ) {
Split split = (Split) nodes[i];
if ( split.getType() == Split.TYPE_XOR || split.getType() == Split.TYPE_OR ) {
- for ( Iterator iterator = split.getOutgoingConnections().iterator(); iterator.hasNext(); ) {
+ for ( Iterator iterator = split.getDefaultOutgoingConnections().iterator(); iterator.hasNext(); ) {
Connection connection = (Connection) iterator.next();
Constraint constraint = split.getConstraint( connection );
if ( "rule".equals( constraint.getType() ) ) {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -3,11 +3,11 @@
import org.drools.compiler.Dialect;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
+import org.drools.process.core.Process;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.ruleflow.core.Node;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.DroolsConsequenceAction;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.DroolsConsequenceAction;
+import org.drools.workflow.core.node.ActionNode;
public class ActionNodeBuilder
implements
@@ -17,7 +17,7 @@
ProcessDescr processDescr,
ProcessBuildContext context,
Node node) {
- ActionNodeImpl actionNode = ( ActionNodeImpl ) node;
+ ActionNode actionNode = ( ActionNode ) node;
DroolsConsequenceAction action = (DroolsConsequenceAction) actionNode.getAction();
ActionDescr actionDescr = new ActionDescr();
actionDescr.setText( action.getConsequence() );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,9 +1,9 @@
package org.drools.process.builder;
import org.drools.lang.descr.ProcessDescr;
+import org.drools.process.core.Process;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.ruleflow.core.Node;
+import org.drools.workflow.core.Node;
public interface ProcessNodeBuilder {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -3,9 +3,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.ruleflow.core.Node;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.SplitImpl;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.node.ActionNode;
+import org.drools.workflow.core.node.Split;
public class ProcessNodeBuilderRegistry {
private Map<Class< ? extends Node>, ProcessNodeBuilder> registry;
@@ -13,9 +13,9 @@
public ProcessNodeBuilderRegistry() {
this.registry = new HashMap<Class< ? extends Node>, ProcessNodeBuilder>();
- register( ActionNodeImpl.class,
+ register( ActionNode.class,
new ActionNodeBuilder() );
- register( SplitImpl.class,
+ register( Split.class,
new SplitNodeBuilder() );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -8,15 +8,14 @@
import org.drools.compiler.Dialect;
import org.drools.compiler.ReturnValueDescr;
import org.drools.lang.descr.ProcessDescr;
+import org.drools.process.core.Process;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.ruleflow.core.Connection;
-import org.drools.ruleflow.core.Node;
-import org.drools.ruleflow.core.Split;
-import org.drools.ruleflow.core.impl.ConstraintImpl;
-import org.drools.ruleflow.core.impl.ReturnValueConstraintEvaluator;
-import org.drools.ruleflow.core.impl.RuleFlowConstraintEvaluator;
-import org.drools.ruleflow.core.impl.SplitImpl;
+import org.drools.workflow.core.Connection;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.ConstraintImpl;
+import org.drools.workflow.core.node.Split;
+import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
+import org.drools.workflow.instance.impl.RuleConstraintEvaluator;
public class SplitNodeBuilder
implements
@@ -26,7 +25,7 @@
ProcessDescr processDescr,
ProcessBuildContext context,
Node node) {
- SplitImpl splitNode = ( SplitImpl ) node;
+ Split splitNode = ( Split ) node;
if ( splitNode.getType() == Split.TYPE_AND ) {
// we only process or/xor
@@ -40,7 +39,7 @@
ConstraintImpl constraint = (ConstraintImpl) entry.getValue();
if ( "rule".equals( constraint.getType() )) {
- RuleFlowConstraintEvaluator ruleConstraint = new RuleFlowConstraintEvaluator();
+ RuleConstraintEvaluator ruleConstraint = new RuleConstraintEvaluator();
ruleConstraint.setDialect( constraint.getDialect() );
ruleConstraint.setName( constraint.getName() );
ruleConstraint.setPriority( constraint.getPriority() );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ActionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ActionBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ActionBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,12 +1,12 @@
package org.drools.rule.builder;
import org.drools.lang.descr.ActionDescr;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
+import org.drools.workflow.core.node.ActionNode;
public interface ActionBuilder {
public void build(final PackageBuildContext context,
- final ActionNodeImpl actionNode,
+ final ActionNode actionNode,
final ActionDescr actionDescr);
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ProcessBuildContext.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ProcessBuildContext.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ProcessBuildContext.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -6,8 +6,8 @@
import org.drools.lang.descr.BaseDescr;
import org.drools.lang.descr.ProcessDescr;
+import org.drools.process.core.Process;
import org.drools.rule.Package;
-import org.drools.ruleflow.common.core.Process;
public class ProcessBuildContext extends PackageBuildContext {
private Process process;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ReturnValueEvaluatorBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ReturnValueEvaluatorBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ReturnValueEvaluatorBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -2,8 +2,8 @@
import org.drools.compiler.ReturnValueDescr;
import org.drools.lang.descr.ActionDescr;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.ReturnValueConstraintEvaluator;
+import org.drools.workflow.core.node.ActionNode;
+import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
public interface ReturnValueEvaluatorBuilder {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaActionBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -33,8 +33,8 @@
import org.drools.rule.builder.ProcessBuildContext;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.dialect.mvel.MVELDialect;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
import org.drools.spi.PatternExtractor;
+import org.drools.workflow.core.node.ActionNode;
/**
* @author etirelli
@@ -48,7 +48,7 @@
* @see org.drools.semantics.java.builder.ConsequenceBuilder#buildConsequence(org.drools.semantics.java.builder.BuildContext, org.drools.semantics.java.builder.BuildUtils, org.drools.lang.descr.RuleDescr)
*/
public void build(final PackageBuildContext context,
- final ActionNodeImpl actionNode,
+ final ActionNode actionNode,
final ActionDescr actionDescr) {
final String className = "action" + context.getNextId();
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -8,7 +8,7 @@
import java.util.Map;
import java.util.Set;
-import org.drools.ruleflow.common.core.Process;
+import org.drools.process.core.Process;
import org.drools.base.ClassFieldExtractorCache;
import org.drools.base.TypeResolver;
import org.drools.commons.jci.compilers.CompilationResult;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueEvaluatorBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueEvaluatorBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaReturnValueEvaluatorBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -35,9 +35,9 @@
import org.drools.rule.builder.ReturnValueEvaluatorBuilder;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.dialect.mvel.MVELDialect;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.ReturnValueConstraintEvaluator;
import org.drools.spi.PatternExtractor;
+import org.drools.workflow.core.node.ActionNode;
+import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
/**
* @author etirelli
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -16,7 +16,7 @@
import org.drools.rule.builder.ConsequenceBuilder;
import org.drools.rule.builder.PackageBuildContext;
import org.drools.rule.builder.RuleBuildContext;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
+import org.drools.workflow.core.node.ActionNode;
import org.mvel.Macro;
import org.mvel.MacroProcessor;
@@ -29,7 +29,7 @@
}
public void build(final PackageBuildContext context,
- final ActionNodeImpl actionNode,
+ final ActionNode actionNode,
final ActionDescr actionDescr) {
String text = actionDescr.getText();
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -19,9 +19,9 @@
import org.drools.rule.builder.PackageBuildContext;
import org.drools.rule.builder.ReturnValueEvaluatorBuilder;
import org.drools.rule.builder.RuleBuildContext;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.ReturnValueConstraintEvaluator;
import org.drools.spi.ReturnValueEvaluator;
+import org.drools.workflow.core.node.ActionNode;
+import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
import org.mvel.Macro;
import org.mvel.MacroProcessor;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ProcessBuildData.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ProcessBuildData.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ProcessBuildData.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -6,8 +6,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.ruleflow.core.Node;
+import org.drools.process.core.Process;
+import org.drools.workflow.core.Node;
public class ProcessBuildData {
private Process process;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -32,7 +32,7 @@
import org.drools.xml.rules.ReturnValueRestrictionHandler;
import org.drools.xml.rules.RuleHandler;
import org.drools.xml.rules.VariableRestrictionsHandler;
-import org.drools.ruleflow.common.core.Process;
+import org.drools.process.core.Process;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -98,7 +98,7 @@
return this.process;
}
- void setProcess(final Process packageDescr) {
+ void setProcess(final Process process) {
this.process = process;
}
Added: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlRuleFlowProcesDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlRuleFlowProcesDumper.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlRuleFlowProcesDumper.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,108 @@
+package org.drools.xml;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.core.Connection;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.DroolsConsequenceAction;
+import org.drools.workflow.core.node.ActionNode;
+import org.drools.workflow.core.node.EndNode;
+import org.drools.workflow.core.node.StartNode;
+
+public class XmlRuleFlowProcesDumper {
+
+ // TODO writing out should also be part of the NodeHandler ?
+
+ private final static String EOL = System.getProperty( "line.separator" );
+
+ private StringBuffer xmlDump;
+
+ public synchronized String dump(RuleFlowProcess process) {
+ this.xmlDump = new StringBuffer();
+ visitProcess(process);
+ return this.xmlDump.toString();
+ }
+
+ private void visitProcess(RuleFlowProcess process) {
+ xmlDump.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?> " + EOL
+ + "<process xmlns=\"http://drools.org/drools-4.0/process\"" + EOL
+ + " xmlns:xs=\"http://www.w3.org/2001/XMLSchema-instance\"" + EOL
+ + " xs:schemaLocation=\"http://drools.org/drools-4.0/process drools-processes-4.0.xsd\"" + EOL
+ + " name=\"" + process.getName() + "\" id=\"" + process.getId() + "\" type=\"RuleFlow\" package-name=\"" + process.getPackageName() + "\" >" + EOL + EOL);
+ visitHeader(process);
+ visitNodes(process);
+ visitConnections(process);
+ xmlDump.append("</process>");
+ }
+
+ private void visitHeader(RuleFlowProcess process) {
+ xmlDump.append(" <header>" + EOL);
+ visitImports(process.getImports());
+ visitGlobals(process.getGlobals());
+ xmlDump.append(" </header>" + EOL + EOL);
+ }
+
+ private void visitImports(List<String> imports) {
+ xmlDump.append(" <imports>" + EOL);
+ for (String importString: imports) {
+ xmlDump.append(" <import name=\"" + importString + "\" />" + EOL);
+ }
+ xmlDump.append(" </imports>" + EOL);
+ }
+
+ private void visitGlobals(Map<String, String> globals) {
+ xmlDump.append(" <globals>" + EOL);
+ for (Map.Entry<String, String> global: globals.entrySet()) {
+ xmlDump.append(" <global identifier=\"" + global.getKey() + "\" type=\"" + global.getValue() + "\" />" + EOL);
+ }
+ xmlDump.append(" </globals>" + EOL);
+ }
+
+ private void visitNodes(RuleFlowProcess process) {
+ xmlDump.append(" <nodes>" + EOL);
+ for (Node node: process.getNodes()) {
+ if (node instanceof StartNode) {
+ visitStartNode((StartNode) node);
+ } else if (node instanceof EndNode) {
+ visitEndNode((EndNode) node);
+ } else if (node instanceof ActionNode) {
+ visitActionNode((ActionNode) node);
+ } else {
+ throw new IllegalArgumentException(
+ "Unknown node type: " + node);
+ }
+ }
+ xmlDump.append(" </nodes>" + EOL + EOL);
+ }
+
+ private void visitStartNode(StartNode startNode) {
+ xmlDump.append(" <start name=\"" + startNode.getName() + "\" />" + EOL);
+ }
+
+ private void visitEndNode(EndNode endNode) {
+ xmlDump.append(" <end name=\"" + endNode.getName() + "\" />" + EOL);
+ }
+
+ private void visitActionNode(ActionNode actionNode) {
+ DroolsConsequenceAction action = (DroolsConsequenceAction) actionNode.getAction();
+ xmlDump.append(" <action name=\"" + actionNode.getName()
+ + "\" dialect=\"" + action.getDialect() + "\">"
+ + action.getConsequence() + "</action>" + EOL);
+ }
+
+ private void visitConnections(RuleFlowProcess process) {
+ List<Connection> connections = new ArrayList<Connection>();
+ for (Node node: process.getNodes()) {
+ connections.addAll(node.getIncomingConnections(Node.CONNECTION_DEFAULT_TYPE));
+ }
+ xmlDump.append(" <connections>" + EOL);
+ for (Connection connection: connections) {
+ xmlDump.append(" <connection from=\"" + connection.getFrom().getName() + "\" to=\"" + connection.getTo().getName() + "\"/>" + EOL);
+ }
+ xmlDump.append(" </connections>" + EOL + EOL);
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ActionNodeHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ActionNodeHandler.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ActionNodeHandler.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -2,18 +2,11 @@
import java.util.HashSet;
-import org.drools.ruleflow.common.core.impl.ProcessImpl;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.lang.descr.FunctionImportDescr;
-import org.drools.lang.descr.GlobalDescr;
-import org.drools.lang.descr.ImportDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.StartNode;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.DroolsConsequenceAction;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
-import org.drools.ruleflow.core.impl.StartNodeImpl;
+import org.drools.process.core.Process;
+import org.drools.workflow.core.impl.DroolsConsequenceAction;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
+import org.drools.workflow.core.node.ActionNode;
+import org.drools.workflow.core.node.StartNode;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.Configuration;
import org.drools.xml.ExtensibleXmlParser;
@@ -48,9 +41,9 @@
parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
+ WorkflowProcessImpl process = ( WorkflowProcessImpl ) parser.getParent();
- ActionNodeImpl actionNode = new ActionNodeImpl();
+ ActionNode actionNode = new ActionNode();
final String name = attrs.getValue( "name" );
emptyAttributeCheck( localName, "name", name, parser );
@@ -66,9 +59,9 @@
final String localName,
final ExtensibleXmlParser parser) throws SAXException {
final Configuration config = parser.endConfiguration();
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
+ WorkflowProcessImpl process = ( WorkflowProcessImpl ) parser.getParent();
- ActionNodeImpl actionNode = ( ActionNodeImpl ) parser.getCurrent();
+ ActionNode actionNode = ( ActionNode ) parser.getCurrent();
String text = config.getText();
if ( text == null ) {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -2,20 +2,10 @@
import java.util.HashSet;
-import org.drools.ruleflow.common.core.impl.ProcessImpl;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.lang.descr.FunctionImportDescr;
-import org.drools.lang.descr.GlobalDescr;
-import org.drools.lang.descr.ImportDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.Connection;
-import org.drools.ruleflow.core.EndNode;
-import org.drools.ruleflow.core.Node;
-import org.drools.ruleflow.core.StartNode;
-import org.drools.ruleflow.core.impl.ConnectionImpl;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
-import org.drools.ruleflow.core.impl.StartNodeImpl;
+import org.drools.process.core.Process;
+import org.drools.workflow.core.Connection;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.ConnectionImpl;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.Configuration;
import org.drools.xml.ExtensibleXmlParser;
@@ -68,7 +58,7 @@
parser.getLocator() );
}
- ConnectionImpl connection = new ConnectionImpl(fromNode, toNode, Connection.TYPE_NORMAL);
+ ConnectionImpl connection = new ConnectionImpl(fromNode, Node.CONNECTION_DEFAULT_TYPE, toNode, Node.CONNECTION_DEFAULT_TYPE);
return connection;
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/EndNodeHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/EndNodeHandler.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/EndNodeHandler.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -2,18 +2,11 @@
import java.util.HashSet;
-import org.drools.ruleflow.common.core.impl.ProcessImpl;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.lang.descr.FunctionImportDescr;
-import org.drools.lang.descr.GlobalDescr;
-import org.drools.lang.descr.ImportDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.EndNode;
-import org.drools.ruleflow.core.StartNode;
-import org.drools.ruleflow.core.impl.EndNodeImpl;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
-import org.drools.ruleflow.core.impl.StartNodeImpl;
+import org.drools.process.core.Process;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
+import org.drools.workflow.core.node.ActionNode;
+import org.drools.workflow.core.node.EndNode;
+import org.drools.workflow.core.node.StartNode;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.Configuration;
import org.drools.xml.ExtensibleXmlParser;
@@ -21,7 +14,6 @@
import org.drools.xml.ProcessBuildData;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
public class EndNodeHandler extends BaseAbstractHandler
implements
@@ -49,9 +41,9 @@
parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
+ WorkflowProcessImpl process = ( WorkflowProcessImpl ) parser.getParent();
- final EndNode endNode = new EndNodeImpl();
+ final EndNode endNode = new EndNode();
final String name = attrs.getValue( "name" );
emptyAttributeCheck( localName, "name", name, parser );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -4,26 +4,14 @@
import java.util.HashSet;
import java.util.Map;
-import org.drools.ruleflow.common.core.impl.ProcessImpl;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.lang.descr.FunctionImportDescr;
-import org.drools.lang.descr.GlobalDescr;
-import org.drools.lang.descr.ImportDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.StartNode;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.DroolsConsequenceAction;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
-import org.drools.ruleflow.core.impl.StartNodeImpl;
+import org.drools.process.core.Process;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.Configuration;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.drools.xml.ProcessBuildData;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
public class GlobalHandler extends BaseAbstractHandler
implements
@@ -50,7 +38,7 @@
parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
+ WorkflowProcessImpl process = ( WorkflowProcessImpl ) parser.getParent();
final String identifier = attrs.getValue( "identifier" );
final String type = attrs.getValue( "type" );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -3,26 +3,14 @@
import java.util.ArrayList;
import java.util.HashSet;
-import org.drools.ruleflow.common.core.impl.ProcessImpl;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.lang.descr.FunctionImportDescr;
-import org.drools.lang.descr.GlobalDescr;
-import org.drools.lang.descr.ImportDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.StartNode;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.DroolsConsequenceAction;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
-import org.drools.ruleflow.core.impl.StartNodeImpl;
+import org.drools.process.core.Process;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.Configuration;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.drools.xml.ProcessBuildData;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
public class ImportHandler extends BaseAbstractHandler
implements
@@ -49,7 +37,7 @@
parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) parser.getParent();
+ WorkflowProcessImpl process = ( WorkflowProcessImpl ) parser.getParent();
final String name = attrs.getValue( "name" );
emptyAttributeCheck( localName, "name", name, parser );
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -2,11 +2,7 @@
import java.util.HashSet;
-import org.drools.lang.descr.FunctionImportDescr;
-import org.drools.lang.descr.GlobalDescr;
-import org.drools.lang.descr.ImportDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
+import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.Configuration;
import org.drools.xml.ExtensibleXmlParser;
@@ -14,7 +10,6 @@
import org.drools.xml.ProcessBuildData;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
public class ProcessHandler extends BaseAbstractHandler
implements
@@ -52,7 +47,7 @@
emptyAttributeCheck( localName, "package-name", packageName, parser );
- RuleFlowProcessImpl process = new RuleFlowProcessImpl();
+ RuleFlowProcess process = new RuleFlowProcess();
process.setId( id );
process.setName( name );
process.setVersion( version );
@@ -72,7 +67,7 @@
}
public Class generateNodeFor() {
- return org.drools.ruleflow.common.core.Process.class;
+ return org.drools.process.core.Process.class;
}
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/StartNodeHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/StartNodeHandler.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/StartNodeHandler.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -2,17 +2,9 @@
import java.util.HashSet;
-import org.drools.ruleflow.common.core.impl.ProcessImpl;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.lang.descr.FunctionImportDescr;
-import org.drools.lang.descr.GlobalDescr;
-import org.drools.lang.descr.ImportDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.EndNode;
-import org.drools.ruleflow.core.StartNode;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
-import org.drools.ruleflow.core.impl.StartNodeImpl;
+import org.drools.process.core.Process;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
+import org.drools.workflow.core.node.StartNode;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.Configuration;
import org.drools.xml.ExtensibleXmlParser;
@@ -20,7 +12,6 @@
import org.drools.xml.ProcessBuildData;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
public class StartNodeHandler extends BaseAbstractHandler
implements
@@ -44,9 +35,9 @@
parser.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = (RuleFlowProcessImpl) parser.getParent();
+ WorkflowProcessImpl process = (WorkflowProcessImpl) parser.getParent();
- final StartNode startNode = new StartNodeImpl();
+ final StartNode startNode = new StartNode();
final String name = attrs.getValue( "name" );
emptyAttributeCheck( localName,
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELActivity.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELActivity.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELActivity.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,19 @@
+package org.drools.bpel.core;
+
+import org.drools.workflow.core.Node;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface BPELActivity extends Node {
+
+ String[] getSourceLinks();
+
+ void setSourceLinks(String[] sourceLinks);
+
+ String[] getTargetLinks();
+
+ void setTargetLinks(String[] targetLinks);
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELAssign.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELAssign.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELAssign.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,38 @@
+package org.drools.bpel.core;
+
+import org.drools.workflow.core.impl.DroolsConsequenceAction;
+import org.drools.workflow.core.node.ActionNode;
+
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELAssign extends ActionNode implements BPELBasicActivity {
+
+ private static final long serialVersionUID = 400L;
+
+ private String[] sourceLinks;
+ private String[] targetLinks;
+
+ public void setAction(String assign) {
+ setAction(new DroolsConsequenceAction("mvel", assign));
+ }
+
+ public String[] getSourceLinks() {
+ return sourceLinks;
+ }
+
+ public void setSourceLinks(String[] sourceLinks) {
+ this.sourceLinks = sourceLinks;
+ }
+
+ public String[] getTargetLinks() {
+ return targetLinks;
+ }
+
+ public void setTargetLinks(String[] targetLinks) {
+ this.targetLinks = targetLinks;
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELBasicActivity.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELBasicActivity.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELBasicActivity.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,10 @@
+package org.drools.bpel.core;
+
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface BPELBasicActivity extends BPELActivity {
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELFaultHandlerContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELFaultHandlerContainer.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELFaultHandlerContainer.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,9 @@
+package org.drools.bpel.core;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface BPELFaultHandlerContainer {
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELFlow.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELFlow.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELFlow.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,93 @@
+package org.drools.bpel.core;
+
+import java.util.Iterator;
+import java.util.List;
+
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.ConnectionImpl;
+import org.drools.workflow.core.node.CompositeNode;
+import org.drools.workflow.core.node.Join;
+import org.drools.workflow.core.node.Split;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELFlow extends CompositeNode implements BPELStructuredActivity {
+
+ private static final long serialVersionUID = 400L;
+
+ private Split split;
+ private Join join;
+ private String[] links;
+ private String[] sourceLinks;
+ private String[] targetLinks;
+
+ public BPELFlow() {
+ split = new Split();
+ split.setType(Split.TYPE_AND);
+ addNode(split);
+ join = new Join();
+ join.setType(Join.TYPE_AND);
+ addNode(join);
+ linkIncomingConnections(
+ Node.CONNECTION_DEFAULT_TYPE,
+ new CompositeNode.NodeAndType(
+ split, Node.CONNECTION_DEFAULT_TYPE));
+ linkOutgoingConnections(
+ new CompositeNode.NodeAndType(
+ join, Node.CONNECTION_DEFAULT_TYPE),
+ Node.CONNECTION_DEFAULT_TYPE);
+ }
+
+ public void setName(String name) {
+ super.setName(name);
+ split.setName(name + " split");
+ join.setName(name + " join");
+ }
+
+ public void setActivities(List<BPELActivity> activities) {
+ if (activities == null || activities.size() < 2) {
+ throw new IllegalArgumentException(
+ "A BPEL flow must contain at least two sub activities!");
+ }
+ for (Iterator<BPELActivity> iterator = activities.iterator(); iterator.hasNext(); ) {
+ addActivity(iterator.next());
+ }
+ }
+
+ private void addActivity(BPELActivity activity) {
+ addNode(activity);
+ new ConnectionImpl(
+ split, Node.CONNECTION_DEFAULT_TYPE,
+ activity, Node.CONNECTION_DEFAULT_TYPE);
+ new ConnectionImpl(
+ activity, Node.CONNECTION_DEFAULT_TYPE,
+ join, Node.CONNECTION_DEFAULT_TYPE);
+ }
+
+ public void setLinks(String[] links) {
+ this.links = links;
+ }
+
+ public String[] getLinks() {
+ return links;
+ }
+
+ public String[] getSourceLinks() {
+ return sourceLinks;
+ }
+
+ public void setSourceLinks(String[] sourceLinks) {
+ this.sourceLinks = sourceLinks;
+ }
+
+ public String[] getTargetLinks() {
+ return targetLinks;
+ }
+
+ public void setTargetLinks(String[] targetLinks) {
+ this.targetLinks = targetLinks;
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELInvoke.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELInvoke.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELInvoke.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,86 @@
+package org.drools.bpel.core;
+
+import org.drools.process.core.Work;
+import org.drools.process.core.impl.WorkImpl;
+import org.drools.workflow.core.node.WorkItemNode;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELInvoke extends WorkItemNode implements BPELBasicActivity, BPELFaultHandlerContainer {
+
+ private static final long serialVersionUID = 400L;
+
+ private static final String PARTNER_LINK = "PartnerLink";
+ private static final String PORT_TYPE = "PortType";
+ private static final String OPERATION = "Operation";
+ private static final String INPUT = "Message";
+ private static final String OUTPUT = "Result";
+
+ private String[] sourceLinks;
+ private String[] targetLinks;
+
+ public BPELInvoke() {
+ Work work = new WorkImpl();
+ work.setName("WebServiceInvocation");
+ setWork(work);
+ }
+
+ public String getPartnerLink() {
+ return (String) getWork().getParameter(PARTNER_LINK);
+ }
+
+ public void setPartnerLink(String partnerLink) {
+ getWork().setParameter(PARTNER_LINK, partnerLink);
+ }
+
+ public String getPortType() {
+ return (String) getWork().getParameter(PORT_TYPE);
+ }
+
+ public void setPortType(String porttype) {
+ getWork().setParameter(PORT_TYPE, porttype);
+ }
+
+ public String getOperation() {
+ return (String) getWork().getParameter(OPERATION);
+ }
+
+ public void setOperation(String operation) {
+ getWork().setParameter(OPERATION, operation);
+ }
+
+ public String getInputVariable() {
+ return getInMapping(INPUT);
+ }
+
+ public void setInputVariable(String inputVariable) {
+ addInMapping(INPUT, inputVariable);
+ }
+
+ public String getOutputVariable() {
+ return getOutMapping(OUTPUT);
+ }
+
+ public void setOutputVariable(String outputVariable) {
+ addOutMapping(OUTPUT, outputVariable);
+ }
+
+ public String[] getSourceLinks() {
+ return sourceLinks;
+ }
+
+ public void setSourceLinks(String[] sourceLinks) {
+ this.sourceLinks = sourceLinks;
+ }
+
+ public String[] getTargetLinks() {
+ return targetLinks;
+ }
+
+ public void setTargetLinks(String[] targetLinks) {
+ this.targetLinks = targetLinks;
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELProcess.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELProcess.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELProcess.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,48 @@
+package org.drools.bpel.core;
+
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.ConnectionImpl;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
+import org.drools.workflow.core.node.EndNode;
+
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELProcess extends WorkflowProcessImpl implements BPELFaultHandlerContainer {
+
+ private static final long serialVersionUID = 400L;
+
+ public static final String BPEL_TYPE = "BPEL";
+
+ public BPELProcess() {
+ setType(BPEL_TYPE);
+ }
+
+ public void setActivity(BPELActivity activity) {
+ if (activity == null) {
+ throw new IllegalArgumentException(
+ "The activity of a BPEL process may not be null!");
+ }
+ if (getActivity() != null) {
+ throw new IllegalArgumentException(
+ "The activity of this BPEL process has already been set!");
+ }
+ addNode(activity);
+ EndNode end = new EndNode();
+ addNode(end);
+ new ConnectionImpl(
+ activity, Node.CONNECTION_DEFAULT_TYPE,
+ end, Node.CONNECTION_DEFAULT_TYPE);
+ }
+
+ public BPELActivity getActivity() {
+ Node[] nodes = getNodes();
+ if (nodes == null || nodes.length == 0) {
+ return null;
+ }
+ return (BPELActivity) nodes[0];
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELReceive.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELReceive.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELReceive.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,94 @@
+package org.drools.bpel.core;
+
+import java.util.List;
+
+import org.drools.workflow.core.Connection;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.NodeImpl;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELReceive extends NodeImpl implements BPELBasicActivity {
+
+ private static final long serialVersionUID = 400L;
+
+ private String partnerLink;
+ private String portType;
+ private String operation;
+ private String variable;
+ private boolean createInstance;
+ private String[] sourceLinks;
+ private String[] targetLinks;
+
+
+ public BPELReceive() {
+ }
+
+ public String getPartnerLink() {
+ return partnerLink;
+ }
+
+ public void setPartnerLink(String partnerLink) {
+ this.partnerLink = partnerLink;
+ }
+
+ public String getPortType() {
+ return portType;
+ }
+
+ public void setPortType(String portType) {
+ this.portType = portType;
+ }
+
+ public String getOperation() {
+ return operation;
+ }
+
+ public void setOperation(String operation) {
+ this.operation = operation;
+ }
+
+ public String getVariable() {
+ return variable;
+ }
+
+ public void setVariable(String variable) {
+ this.variable = variable;
+ }
+
+ public boolean isCreateInstance() {
+ return createInstance;
+ }
+
+ public void setCreateInstance(boolean createInstance) {
+ this.createInstance = createInstance;
+ }
+
+ public String[] getSourceLinks() {
+ return sourceLinks;
+ }
+
+ public void setSourceLinks(String[] sourceLinks) {
+ this.sourceLinks = sourceLinks;
+ }
+
+ public String[] getTargetLinks() {
+ return targetLinks;
+ }
+
+ public void setTargetLinks(String[] targetLinks) {
+ this.targetLinks = targetLinks;
+ }
+
+ public Connection getTo() {
+ final List<Connection> list =
+ getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE);
+ if (list.size() > 0) {
+ return (Connection) list.get(0);
+ }
+ return null;
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELReply.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELReply.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELReply.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,78 @@
+package org.drools.bpel.core;
+
+import org.drools.process.core.Work;
+import org.drools.process.core.impl.WorkImpl;
+import org.drools.workflow.core.node.WorkItemNode;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELReply extends WorkItemNode implements BPELBasicActivity {
+
+ private static final long serialVersionUID = 400L;
+
+ private static final String PARTNER_LINK = "PartnerLink";
+ private static final String PORT_TYPE = "Porttype";
+ private static final String OPERATION = "Operation";
+ private static final String INPUT = "Message";
+
+ private String[] sourceLinks;
+ private String[] targetLinks;
+
+ public BPELReply() {
+ // TODO: a reply is not a simple web service invocation
+ Work work = new WorkImpl();
+ work.setName("WebServiceInvocation");
+ setWork(work);
+ }
+
+ public String getPartnerLink() {
+ return (String) getWork().getParameter(PARTNER_LINK);
+ }
+
+ public void setPartnerLink(String partnerLink) {
+ getWork().setParameter(PARTNER_LINK, partnerLink);
+ }
+
+ public String getPortType() {
+ return (String) getWork().getParameter(PORT_TYPE);
+ }
+
+ public void setPortType(String porttype) {
+ getWork().setParameter(PORT_TYPE, porttype);
+ }
+
+ public String getOperation() {
+ return (String) getWork().getParameter(OPERATION);
+ }
+
+ public void setOperation(String operation) {
+ getWork().setParameter(OPERATION, operation);
+ }
+
+ public String getVariable() {
+ return getInMapping(INPUT);
+ }
+
+ public void setVariable(String variable) {
+ addInMapping(INPUT, variable);
+ }
+
+ public String[] getSourceLinks() {
+ return sourceLinks;
+ }
+
+ public void setSourceLinks(String[] sourceLinks) {
+ this.sourceLinks = sourceLinks;
+ }
+
+ public String[] getTargetLinks() {
+ return targetLinks;
+ }
+
+ public void setTargetLinks(String[] targetLinks) {
+ this.targetLinks = targetLinks;
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELScope.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELScope.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELScope.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,42 @@
+package org.drools.bpel.core;
+
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.node.CompositeNode;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELScope extends CompositeNode implements BPELActivity, BPELFaultHandlerContainer {
+
+ private static final long serialVersionUID = 400L;
+
+ public void setActivity(BPELActivity activity) {
+ addNode(activity);
+ linkIncomingConnections(
+ Node.CONNECTION_DEFAULT_TYPE,
+ new CompositeNode.NodeAndType(
+ activity, Node.CONNECTION_DEFAULT_TYPE));
+ linkOutgoingConnections(
+ new CompositeNode.NodeAndType(
+ activity, Node.CONNECTION_DEFAULT_TYPE),
+ Node.CONNECTION_DEFAULT_TYPE);
+ }
+
+ public String[] getSourceLinks() {
+ throw new IllegalArgumentException("A scope does not support links!");
+ }
+
+ public String[] getTargetLinks() {
+ throw new IllegalArgumentException("A scope does not support links!");
+ }
+
+ public void setSourceLinks(String[] sourceLinks) {
+ throw new IllegalArgumentException("A scope does not support links!");
+ }
+
+ public void setTargetLinks(String[] targetLinks) {
+ throw new IllegalArgumentException("A scope does not support links!");
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELSequence.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELSequence.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELSequence.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,61 @@
+package org.drools.bpel.core;
+
+import java.util.List;
+
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.ConnectionImpl;
+import org.drools.workflow.core.node.CompositeNode;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELSequence extends CompositeNode implements BPELStructuredActivity {
+
+ private static final long serialVersionUID = 400L;
+
+ private String[] sourceLinks;
+ private String[] targetLinks;
+
+ public void setActivities(List<BPELActivity> activities) {
+ if (activities == null || activities.size() < 2) {
+ throw new IllegalArgumentException(
+ "A BPEL sequence must contain at least two sub activities!");
+ }
+ BPELActivity previous = activities.get(0);
+ addNode(previous);
+ linkIncomingConnections(
+ Node.CONNECTION_DEFAULT_TYPE,
+ new CompositeNode.NodeAndType(
+ previous, Node.CONNECTION_DEFAULT_TYPE));
+ for (int i = 1; i < activities.size(); i++ ) {
+ BPELActivity next = activities.get(i);
+ addNode(next);
+ new ConnectionImpl(
+ previous, Node.CONNECTION_DEFAULT_TYPE,
+ next, Node.CONNECTION_DEFAULT_TYPE);
+ previous = next;
+ }
+ linkOutgoingConnections(
+ new CompositeNode.NodeAndType(
+ previous, Node.CONNECTION_DEFAULT_TYPE),
+ Node.CONNECTION_DEFAULT_TYPE);
+ }
+
+ public String[] getSourceLinks() {
+ return sourceLinks;
+ }
+
+ public void setSourceLinks(String[] sourceLinks) {
+ this.sourceLinks = sourceLinks;
+ }
+
+ public String[] getTargetLinks() {
+ return targetLinks;
+ }
+
+ public void setTargetLinks(String[] targetLinks) {
+ this.targetLinks = targetLinks;
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELStructuredActivity.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELStructuredActivity.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/core/BPELStructuredActivity.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,13 @@
+package org.drools.bpel.core;
+
+import java.util.List;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface BPELStructuredActivity extends BPELActivity {
+
+ void setActivities(List<BPELActivity> activities);
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELAssignInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELAssignInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELAssignInstance.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,25 @@
+package org.drools.bpel.instance;
+
+import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.node.ActionNodeInstance;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELAssignInstance extends ActionNodeInstance {
+
+ private static final long serialVersionUID = 400L;
+
+ public void internalTrigger(NodeInstance from, String type) {
+ if (BPELLinkManager.checkActivityEnabled(this)) {
+ super.internalTrigger(from, type);
+ }
+ }
+
+ public void triggerCompleted() {
+ super.triggerCompleted();
+ BPELLinkManager.activateTargetLinks(this);
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELFlowInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELFlowInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELFlowInstance.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,53 @@
+package org.drools.bpel.instance;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.drools.bpel.core.BPELFlow;
+import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.node.CompositeNodeInstance;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELFlowInstance extends CompositeNodeInstance {
+
+ private static final long serialVersionUID = 400L;
+
+ private List<String> activatedLinks = new ArrayList<String>();
+ private Map<String, NodeInstance> waitingActivityInstances = new HashMap<String, NodeInstance>();
+
+ public BPELFlow getBPELFlow() {
+ return (BPELFlow) getNode();
+ }
+
+ public void activateLink(String linkName) {
+ activatedLinks.add(linkName);
+ NodeInstance waitingActivityInstance = waitingActivityInstances.get(linkName);
+ if (waitingActivityInstance != null) {
+ waitingActivityInstance.trigger(null, null);
+ }
+ }
+
+ public void addWaitingActivityInstance(NodeInstance nodeInstance, String linkName) {
+ waitingActivityInstances.put(linkName, nodeInstance);
+ }
+
+ public boolean isLinkActive(String linkName) {
+ return activatedLinks.contains(linkName);
+ }
+
+ public void internalTrigger(NodeInstance from, String type) {
+ if (BPELLinkManager.checkActivityEnabled(this)) {
+ super.internalTrigger(from, type);
+ }
+ }
+
+ public void triggerCompleted(String outType) {
+ super.triggerCompleted(outType);
+ BPELLinkManager.activateTargetLinks(this);
+ }
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELInvokeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELInvokeInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELInvokeInstance.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,43 @@
+package org.drools.bpel.instance;
+
+import org.drools.bpel.core.BPELActivity;
+import org.drools.process.instance.WorkItem;
+import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.node.WorkItemNodeInstance;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELInvokeInstance extends WorkItemNodeInstance {
+
+ private static final long serialVersionUID = 400L;
+
+ public void internalTrigger(NodeInstance from, String type) {
+ if (BPELLinkManager.checkActivityEnabled(this)) {
+ super.internalTrigger(from, type);
+ }
+ }
+
+ public void triggerCompleted(WorkItem workItem) {
+ String faultName = (String) workItem.getResult("FaultName");
+ if (faultName == null) {
+ super.triggerCompleted(workItem);
+ BPELLinkManager.activateTargetLinks(this);
+ } else {
+ String faultMessage = (String) workItem.getResult("Message");
+ getFaultHandler(faultName, faultMessage);
+ }
+ }
+
+ private BPELActivity getFaultHandler(String faultName, String faultMessage) {
+ // TODO check activity itself for fault handler
+// NodeInstanceContainer parent = getNodeInstanceContainer();
+// while (!(parent instanceof BPELFaultHandlerContainer)
+// || ((BPELFaultHandlerContainer) parent).get)) {
+// parent = ((NodeInstance) parent).getNodeInstanceContainer();
+// }
+ return null;
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELLinkManager.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELLinkManager.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELLinkManager.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,64 @@
+package org.drools.bpel.instance;
+
+import org.drools.bpel.core.BPELActivity;
+import org.drools.util.ArrayUtils;
+import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.NodeInstanceContainer;
+import org.drools.workflow.instance.impl.NodeInstanceImpl;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public final class BPELLinkManager {
+
+ private BPELLinkManager() {
+ }
+
+ private static String[] getSourceLinks(NodeInstance activityInstance) {
+ return ((BPELActivity)
+ ((NodeInstanceImpl) activityInstance).getNode())
+ .getSourceLinks();
+ }
+
+ private static String[] getTargetLinks(NodeInstance activityInstance) {
+ return ((BPELActivity)
+ ((NodeInstanceImpl) activityInstance).getNode())
+ .getTargetLinks();
+ }
+
+ public static boolean checkActivityEnabled(NodeInstance activityInstance) {
+ boolean enabled = true;
+ String[] incomingLinks = getTargetLinks(activityInstance);
+ if (incomingLinks != null) {
+ for (int i = 0; i < incomingLinks.length; i++) {
+ BPELFlowInstance flowInstance = getFlowInstance(activityInstance, incomingLinks[i]);
+ if (!flowInstance.isLinkActive(incomingLinks[i])) {
+ enabled = false;
+ flowInstance.addWaitingActivityInstance(activityInstance, incomingLinks[i]);
+ }
+ }
+ }
+ return enabled;
+ }
+
+ public static void activateTargetLinks(NodeInstance activityInstance) {
+ String[] outgoingLinks = getSourceLinks(activityInstance);
+ if (outgoingLinks != null) {
+ for (int i = 0; i < outgoingLinks.length; i++) {
+ BPELFlowInstance flowInstance = getFlowInstance(activityInstance, outgoingLinks[i]);
+ flowInstance.activateLink(outgoingLinks[i]);
+ }
+ }
+ }
+
+ private static BPELFlowInstance getFlowInstance(NodeInstance activityInstance, String linkName) {
+ NodeInstanceContainer parent = activityInstance.getNodeInstanceContainer();
+ while (!(parent instanceof BPELFlowInstance)
+ || !ArrayUtils.contains(((BPELFlowInstance) parent).getBPELFlow().getLinks(), linkName)) {
+ parent = ((NodeInstance) parent).getNodeInstanceContainer();
+ }
+ return (BPELFlowInstance) parent;
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELNodeInstanceFactoryRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELNodeInstanceFactoryRegistry.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELNodeInstanceFactoryRegistry.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,32 @@
+package org.drools.bpel.instance;
+
+import org.drools.bpel.core.BPELAssign;
+import org.drools.bpel.core.BPELFlow;
+import org.drools.bpel.core.BPELInvoke;
+import org.drools.bpel.core.BPELReceive;
+import org.drools.bpel.core.BPELReply;
+import org.drools.bpel.core.BPELScope;
+import org.drools.bpel.core.BPELSequence;
+import org.drools.workflow.instance.impl.NodeInstanceFactoryRegistry;
+import org.drools.workflow.instance.impl.factory.CreateNewNodeFactory;
+
+public class BPELNodeInstanceFactoryRegistry extends NodeInstanceFactoryRegistry {
+
+ public BPELNodeInstanceFactoryRegistry() {
+ register( BPELAssign.class,
+ new CreateNewNodeFactory( BPELAssignInstance.class ) );
+ register( BPELFlow.class,
+ new CreateNewNodeFactory( BPELFlowInstance.class ) );
+ register( BPELInvoke.class,
+ new CreateNewNodeFactory( BPELInvokeInstance.class ) );
+ register( BPELReceive.class,
+ new CreateNewNodeFactory( BPELReceiveInstance.class ) );
+ register( BPELReply.class,
+ new CreateNewNodeFactory( BPELReplyInstance.class ) );
+ register( BPELScope.class,
+ new CreateNewNodeFactory( BPELScopeInstance.class ) );
+ register( BPELSequence.class,
+ new CreateNewNodeFactory( BPELSequenceInstance.class ) );
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELProcessInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELProcessInstance.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,90 @@
+package org.drools.bpel.instance;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.drools.bpel.core.BPELActivity;
+import org.drools.bpel.core.BPELProcess;
+import org.drools.bpel.core.BPELReceive;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.NodeContainer;
+import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.NodeInstanceContainer;
+import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELProcessInstance extends WorkflowProcessInstanceImpl {
+
+ private static final long serialVersionUID = 400L;
+
+ public BPELProcess getBPELProcess() {
+ return (BPELProcess) getProcess();
+ }
+
+ public void acceptMessage(String partnerLink, String portType, String operation, String message) {
+ if (getState() == STATE_PENDING) {
+ setState(STATE_ACTIVE);
+ }
+ BPELReceive receive = findBPELReceive(partnerLink, portType, operation);
+ if (receive == null) {
+ throw new IllegalArgumentException(
+ "Could not find BPELReceive for " + partnerLink + ", " + portType + ", " + operation);
+ }
+ BPELActivity activity = receive;
+ List<BPELActivity> parents = new ArrayList<BPELActivity>();
+ while (!activity.getNodeContainer().equals(getBPELProcess())) {
+ activity = (BPELActivity) activity.getNodeContainer();
+ parents.add(0, activity);
+ }
+ NodeInstanceContainer nodeInstanceContainer = this;
+ for (Iterator<BPELActivity> iterator = parents.iterator(); iterator.hasNext(); ) {
+ BPELActivity parent = iterator.next();
+ NodeInstance nodeInstance = nodeInstanceContainer.getFirstNodeInstance(parent.getId());
+ if (nodeInstance != null) {
+ nodeInstanceContainer = (NodeInstanceContainer) nodeInstance;
+ } else if (receive.isCreateInstance()) {
+ nodeInstanceContainer = (NodeInstanceContainer) nodeInstanceContainer.getNodeInstance(parent);
+ } else {
+ // TODO: store message in cache of accepted messages
+ return;
+ }
+ }
+ ((BPELReceiveInstance) nodeInstanceContainer.getNodeInstance(receive)).triggerCompleted(message);
+ }
+
+ private BPELReceive findBPELReceive(String partnerLink, String portType, String operation) {
+ return findBPELReceive(partnerLink, portType, operation, getBPELProcess().getActivity());
+ }
+
+ private BPELReceive findBPELReceive(String partnerLink, String portType, String operation, Node node) {
+ if (node instanceof BPELReceive) {
+ BPELReceive receive = (BPELReceive) node;
+ if (receive.getPartnerLink().equals(partnerLink)
+ && receive.getPortType().equals(portType)
+ && receive.getOperation().equals(operation)) {
+ return receive;
+ }
+ return null;
+ }
+ if (node instanceof NodeContainer) {
+ Node[] nodes = ((NodeContainer) node).getNodes();
+ for (int i = 0; i < nodes.length; i++) {
+ BPELReceive result = findBPELReceive(partnerLink, portType, operation, nodes[i]);
+ if (result != null) {
+ return result;
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected void internalStart() {
+ // do nothing, BPEL Processes are started by receiving a message
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,18 @@
+package org.drools.bpel.instance;
+
+import java.io.Serializable;
+
+import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.ProcessInstanceFactory;
+
+public class BPELProcessInstanceFactory implements ProcessInstanceFactory, Serializable {
+
+ private static final long serialVersionUID = 400L;
+
+ public ProcessInstance createProcessInstance() {
+ return new BPELProcessInstance();
+ }
+
+
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELReceiveInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELReceiveInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELReceiveInstance.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,37 @@
+package org.drools.bpel.instance;
+
+import org.drools.bpel.core.BPELReceive;
+import org.drools.workflow.core.Connection;
+import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.impl.NodeInstanceImpl;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELReceiveInstance extends NodeInstanceImpl {
+
+ private static final long serialVersionUID = 400L;
+
+ public BPELReceive getBPELReceive() {
+ return (BPELReceive) getNode();
+ }
+
+ public void internalTrigger(NodeInstance from, String type) {
+ if (BPELLinkManager.checkActivityEnabled(this)) {
+ // TODO look in cache of already receive messages
+ }
+ }
+
+ public void triggerCompleted(String message) {
+ String variable = getBPELReceive().getVariable();
+ if (variable != null) {
+ getProcessInstance().setVariable(variable, message);
+ }
+ Connection to = getBPELReceive().getTo();
+ getNodeInstanceContainer().removeNodeInstance(this);
+ getNodeInstanceContainer().getNodeInstance( to.getTo() ).trigger( this, to.getToType());
+ BPELLinkManager.activateTargetLinks(this);
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELReplyInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELReplyInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELReplyInstance.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,26 @@
+package org.drools.bpel.instance;
+
+import org.drools.process.instance.WorkItem;
+import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.node.WorkItemNodeInstance;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELReplyInstance extends WorkItemNodeInstance {
+
+ private static final long serialVersionUID = 400L;
+
+ public void internalTrigger(NodeInstance from, String type) {
+ if (BPELLinkManager.checkActivityEnabled(this)) {
+ super.internalTrigger(from, type);
+ }
+ }
+
+ public void triggerCompleted(WorkItem workItem) {
+ super.triggerCompleted(workItem);
+ BPELLinkManager.activateTargetLinks(this);
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELScopeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELScopeInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELScopeInstance.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,25 @@
+package org.drools.bpel.instance;
+
+import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.node.CompositeNodeInstance;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELScopeInstance extends CompositeNodeInstance {
+
+ private static final long serialVersionUID = 400L;
+
+ public void internalTrigger(NodeInstance from, String type) {
+ if (BPELLinkManager.checkActivityEnabled(this)) {
+ super.internalTrigger(from, type);
+ }
+ }
+
+ public void triggerCompleted(String outType) {
+ super.triggerCompleted(outType);
+ BPELLinkManager.activateTargetLinks(this);
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELSequenceInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELSequenceInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/instance/BPELSequenceInstance.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,25 @@
+package org.drools.bpel.instance;
+
+import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.node.CompositeNodeInstance;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public class BPELSequenceInstance extends CompositeNodeInstance {
+
+ private static final long serialVersionUID = 400L;
+
+ public void internalTrigger(NodeInstance from, String type) {
+ if (BPELLinkManager.checkActivityEnabled(this)) {
+ super.internalTrigger(from, type);
+ }
+ }
+
+ public void triggerCompleted(String outType) {
+ super.triggerCompleted(outType);
+ BPELLinkManager.activateTargetLinks(this);
+ }
+
+}
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/test/BPELTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/test/BPELTest.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/bpel/test/BPELTest.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,350 @@
+package org.drools.bpel.test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.drools.RuleBaseConfiguration;
+import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
+import org.drools.audit.WorkingMemoryFileLogger;
+import org.drools.bpel.core.BPELActivity;
+import org.drools.bpel.core.BPELAssign;
+import org.drools.bpel.core.BPELFlow;
+import org.drools.bpel.core.BPELInvoke;
+import org.drools.bpel.core.BPELProcess;
+import org.drools.bpel.core.BPELReceive;
+import org.drools.bpel.core.BPELReply;
+import org.drools.bpel.core.BPELSequence;
+import org.drools.bpel.instance.BPELProcessInstance;
+import org.drools.bpel.instance.BPELProcessInstanceFactory;
+import org.drools.common.AbstractRuleBase;
+import org.drools.common.InternalRuleBase;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.compiler.PackageBuilder;
+import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.compiler.ProcessBuilder;
+import org.drools.process.instance.WorkItem;
+import org.drools.process.instance.WorkItemHandler;
+import org.drools.process.instance.WorkItemManager;
+import org.drools.reteoo.ReteooWorkingMemory;
+
+public class BPELTest {
+
+ public static void main1(String[] args) {
+ BPELProcess process = new BPELProcess();
+ process.setName("TestProcess");
+ process.setId("1");
+
+ // flow
+ BPELFlow flow = new BPELFlow();
+ flow.setName("flow");
+ process.setActivity(flow);
+ List<BPELActivity> flowActivities = new ArrayList<BPELActivity>();
+
+ // invoke1
+ BPELInvoke invoke1 = new BPELInvoke();
+ invoke1.setName("invoke1");
+ flowActivities.add(invoke1);
+
+ // invoke2
+ BPELInvoke invoke2 = new BPELInvoke();
+ invoke2.setName("invoke2");
+ flowActivities.add(invoke2);
+
+ flow.setActivities(flowActivities);
+
+ // execute
+ InternalWorkingMemory workingMemory = new ReteooWorkingMemory(1, (InternalRuleBase) RuleBaseFactory.newRuleBase());
+ WorkingMemoryFileLogger logger = new WorkingMemoryFileLogger(workingMemory);
+ BPELProcessInstance processInstance = new BPELProcessInstance();
+ processInstance.setProcess(process);
+ processInstance.setWorkingMemory(workingMemory);
+ processInstance.start();
+ logger.writeToDisk();
+ }
+
+ public static void main2(String[] args) {
+ BPELProcess process = new BPELProcess();
+ process.setName("TestProcess");
+ process.setId("1");
+
+ // sequence
+ BPELSequence sequence = new BPELSequence();
+ sequence.setName("sequence");
+ List<BPELActivity> sequenceActivities = new ArrayList<BPELActivity>();
+
+ // invoke1
+ BPELInvoke invoke1 = new BPELInvoke();
+ invoke1.setName("invoke1");
+ sequenceActivities.add(invoke1);
+
+ // invoke2
+ BPELInvoke invoke2 = new BPELInvoke();
+ invoke2.setName("invoke2");
+ sequenceActivities.add(invoke2);
+
+ sequence.setActivities(sequenceActivities);
+ process.setActivity(sequence);
+
+ // execute
+ InternalWorkingMemory workingMemory = new ReteooWorkingMemory(1, (InternalRuleBase) RuleBaseFactory.newRuleBase());
+ WorkingMemoryFileLogger logger = new WorkingMemoryFileLogger(workingMemory);
+ BPELProcessInstance processInstance = new BPELProcessInstance();
+ processInstance.setProcess(process);
+ processInstance.setWorkingMemory(workingMemory);
+ processInstance.start();
+ logger.writeToDisk();
+ }
+
+ public static void main(String[] args) {
+ BPELProcess process = new BPELProcess();
+ process.setName("Purchase Order Process");
+ process.setId("1");
+ process.setVersion("1");
+ process.setPackageName("org.drools.bpel.test");
+
+ // sequence
+ BPELSequence sequence = new BPELSequence();
+ sequence.setName("sequence");
+ List<BPELActivity> sequenceActivities = new ArrayList<BPELActivity>();
+
+ // Receive purchase order
+ BPELReceive receive = new BPELReceive();
+ receive.setName("Receive Purchase Order");
+ receive.setPartnerLink("purchasing");
+ receive.setPortType("lns:purchaseOrderPT");
+ receive.setOperation("sendPurchaseOrder");
+ receive.setVariable("PO");
+ receive.setCreateInstance(true);
+ sequenceActivities.add(receive);
+
+ // flow
+ BPELFlow flow = new BPELFlow();
+ flow.setName("flow");
+ flow.setLinks(new String[] { "ship-to-invoice", "ship-to-scheduling" });
+ List<BPELActivity> flowActivities = new ArrayList<BPELActivity>();
+
+ /********** sequence1 **********/
+ BPELSequence sequence1 = new BPELSequence();
+ sequence1.setName("sequence1");
+ List<BPELActivity> sequence1Activities = new ArrayList<BPELActivity>();
+
+ // assign1
+ BPELAssign assign1 = new BPELAssign();
+ // $shippingRequest.customerInfo <- $PO.customerInfo
+ assign1.setAction("");
+ sequence1Activities.add(assign1);
+
+ // invoke1
+ BPELInvoke invoke1 = new BPELInvoke();
+ invoke1.setName("Decide On Shipper");
+ invoke1.setPartnerLink("shipping");
+ invoke1.setPortType("lns:shippingPT");
+ invoke1.setOperation("requestShipping");
+ invoke1.setInputVariable("shippingRequest");
+ invoke1.setOutputVariable("shippingInfo");
+ invoke1.setSourceLinks(new String[] { "ship-to-invoice" });
+ sequence1Activities.add(invoke1);
+
+ // receive1
+ BPELReceive receive1 = new BPELReceive();
+ receive1.setName("Arrange Logistics");
+ receive1.setPartnerLink("shipping");
+ receive1.setPortType("lns:shippingCallbackPT");
+ receive1.setOperation("sendSchedule");
+ receive1.setVariable("shippingSchedule");
+ receive1.setCreateInstance(false);
+ receive1.setSourceLinks(new String[] { "ship-to-scheduling" });
+ sequence1Activities.add(receive1);
+
+ sequence1.setActivities(sequence1Activities);
+ flowActivities.add(sequence1);
+
+ /********** sequence2 **********/
+ BPELSequence sequence2 = new BPELSequence();
+ sequence2.setName("sequence2");
+ List<BPELActivity> sequence2Activities = new ArrayList<BPELActivity>();
+
+ // invoke2a
+ BPELInvoke invoke2a = new BPELInvoke();
+ invoke2a.setName("Initial Price Calculation");
+ invoke2a.setPartnerLink("invoicing");
+ invoke2a.setPortType("lns:computePricePT");
+ invoke2a.setOperation("initiatePriceCalculation");
+ invoke2a.setInputVariable("PO");
+ sequence2Activities.add(invoke2a);
+
+ // invoke2b
+ BPELInvoke invoke2b = new BPELInvoke();
+ invoke2b.setName("Complete Price Calculation");
+ invoke2b.setPartnerLink("invoicing");
+ invoke2b.setPortType("lns:computePricePT");
+ invoke2b.setOperation("sendShippingPrice");
+ invoke2b.setInputVariable("shippingInfo");
+ invoke2b.setTargetLinks(new String[] { "ship-to-invoice" });
+ sequence2Activities.add(invoke2b);
+
+ // receive2
+ BPELReceive receive2 = new BPELReceive();
+ receive2.setName("Receive Invoice");
+ receive2.setPartnerLink("invoicing");
+ receive2.setPortType("lns:invoiceCallbackPT");
+ receive2.setOperation("sendInvoice");
+ receive2.setVariable("Invoice");
+ receive2.setCreateInstance(false);
+ sequence2Activities.add(receive2);
+
+ sequence2.setActivities(sequence2Activities);
+ flowActivities.add(sequence2);
+
+ /********** sequence3 **********/
+ BPELSequence sequence3 = new BPELSequence();
+ sequence3.setName("sequence3");
+ List<BPELActivity> sequence3Activities = new ArrayList<BPELActivity>();
+
+ // invoke3a
+ BPELInvoke invoke3a = new BPELInvoke();
+ invoke3a.setName("Initiate Production Scheduling");
+ invoke3a.setPartnerLink("scheduling");
+ invoke3a.setPortType("lns:schedulingPT");
+ invoke3a.setOperation("requestProductionScheduling");
+ invoke3a.setInputVariable("PO");
+ sequence3Activities.add(invoke3a);
+
+ // invoke2b
+ BPELInvoke invoke3b = new BPELInvoke();
+ invoke3b.setName("Complete Production Scheduling");
+ invoke3b.setPartnerLink("scheduling");
+ invoke3b.setPortType("lns:schedulingPT");
+ invoke3b.setOperation("sendShippingSchedule");
+ invoke3b.setInputVariable("shippingSchedule");
+ invoke3b.setTargetLinks(new String[] { "ship-to-scheduling" });
+ sequence3Activities.add(invoke3b);
+
+ sequence3.setActivities(sequence3Activities);
+ flowActivities.add(sequence3);
+
+ flow.setActivities(flowActivities);
+ sequenceActivities.add(flow);
+
+ // reply
+ BPELReply reply = new BPELReply();
+ reply.setName("Invoice Processing");
+ reply.setPartnerLink("purchasing");
+ reply.setPortType("lns:purchaseOrderPT");
+ reply.setOperation("sendPurchaseOrder");
+ reply.setVariable("Invoice");
+ sequenceActivities.add(reply);
+
+ sequence.setActivities(sequenceActivities);
+ process.setActivity(sequence);
+
+ Properties properties = new Properties();
+ properties.put( "processNodeBuilderRegistry", "bpelNodeBuilderRegistry.conf" );
+ PackageBuilderConfiguration packageConf = new PackageBuilderConfiguration( properties );
+ PackageBuilder packageBuilder = new PackageBuilder(packageConf);
+ ProcessBuilder processBuilder = new ProcessBuilder(packageBuilder);
+ processBuilder.buildProcess(process);
+
+ // execute
+ properties = new Properties();
+ properties.put( "processNodeInstanceFactoryRegistry", "bpelProcessNodeInstanceFactory.conf" );
+ RuleBaseConfiguration ruleBaseConf = new RuleBaseConfiguration( properties );
+ AbstractRuleBase ruleBase = (AbstractRuleBase) RuleBaseFactory.newRuleBase(ruleBaseConf);
+ ruleBase.addProcess(process);
+ InternalWorkingMemory workingMemory = new ReteooWorkingMemory(1, ruleBase);
+ workingMemory.registerProcessInstanceFactory(
+ BPELProcess.BPEL_TYPE, new BPELProcessInstanceFactory());
+ WorkItemHandler handler = new WebServiceInvocationHandler();
+ workingMemory.getWorkItemManager().registerWorkItemHandler("WebServiceInvocation", handler);
+ WorkingMemoryFileLogger logger = new WorkingMemoryFileLogger(workingMemory);
+ BPELProcessInstance processInstance = (BPELProcessInstance) workingMemory.startProcess("1");
+
+ // start process
+ webServiceInvocation(processInstance, "purchasing", "lns:purchaseOrderPT", "sendPurchaseOrder", "PURCHASE ORDER");
+
+ // reply to web service invocations
+ WorkItem workItem = findWebServiceInvocation(workingMemory, "scheduling", "lns:schedulingPT", "requestProductionScheduling");
+ replyWebServiceInvocation(workingMemory, workItem, null);
+
+ workItem = findWebServiceInvocation(workingMemory, "invoicing", "lns:computePricePT", "initiatePriceCalculation");
+ replyWebServiceInvocation(workingMemory, workItem, null);
+
+ workItem = findWebServiceInvocation(workingMemory, "shipping", "lns:shippingPT", "requestShipping");
+ replyWebServiceInvocation(workingMemory, workItem, "SHIPPING");
+
+ workItem = findWebServiceInvocation(workingMemory, "invoicing", "lns:computePricePT", "sendShippingPrice");
+ replyWebServiceInvocation(workingMemory, workItem, null);
+
+ // invoke web service callbacks
+ webServiceInvocation(processInstance, "shipping", "lns:shippingCallbackPT", "sendSchedule", "SCHEDULE");
+ webServiceInvocation(processInstance, "invoicing", "lns:invoiceCallbackPT", "sendInvoice", "INVOICE");
+
+ // reply to web service invocation
+ workItem = findWebServiceInvocation(workingMemory, "scheduling", "lns:schedulingPT", "sendShippingSchedule");
+ replyWebServiceInvocation(workingMemory, workItem, null);
+
+ logger.writeToDisk();
+ }
+
+ private static WorkItem findWebServiceInvocation(WorkingMemory workingMemory, String partnerLink, String portType, String operation) {
+ Set<WorkItem> workItems = workingMemory.getWorkItemManager().getWorkItems();
+ for (Iterator<WorkItem> iterator = workItems.iterator(); iterator.hasNext(); ) {
+ WorkItem workItem = iterator.next();
+ if ("WebServiceInvocation".equals(workItem.getName())
+ && workItem.getParameter("PartnerLink").equals(partnerLink)
+ && workItem.getParameter("PortType").equals(portType)
+ && workItem.getParameter("Operation").equals(operation)) {
+ return workItem;
+ }
+ }
+ return null;
+ }
+
+ private static void replyWebServiceInvocation(WorkingMemory workingMemory, WorkItem workItem, String result) {
+ System.out.println("Replying to web service invocation "
+ + workItem.getParameter("PartnerLink") + " "
+ + workItem.getParameter("PortType") + " "
+ + workItem.getParameter("Operation") + ", message = "
+ + workItem.getParameter("Message") + ": "
+ + result);
+ Map<String, Object> results = new HashMap<String, Object>();
+ results.put("Result", result);
+ workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), results);
+ }
+
+ private static void webServiceInvocation(BPELProcessInstance processInstance, String partnerLink, String portType, String operation, String result) {
+ System.out.println("Web service invocation "
+ + partnerLink + " "
+ + portType + " "
+ + operation + ": "
+ + result);
+ processInstance.acceptMessage(partnerLink, portType, operation, result);
+ }
+
+ public static class WebServiceInvocationHandler implements WorkItemHandler {
+
+ public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {
+ System.out.println("Web service invoked "
+ + workItem.getParameter("PartnerLink") + " "
+ + workItem.getParameter("PortType") + " "
+ + workItem.getParameter("Operation") + ", message = "
+ + workItem.getParameter("Message"));
+ }
+
+ public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
+ System.out.println("Web service invocation aborted "
+ + workItem.getParameter("PartnerLink") + " "
+ + workItem.getParameter("PortType") + " "
+ + workItem.getParameter("Operation") + ", message = "
+ + workItem.getParameter("Message"));
+ }
+
+ }
+
+}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -70,6 +70,8 @@
import org.drools.lang.descr.ReturnValueRestrictionDescr;
import org.drools.lang.descr.RuleDescr;
import org.drools.lang.descr.VariableRestrictionDescr;
+import org.drools.process.core.Process;
+import org.drools.process.core.Variable;
import org.drools.reteoo.ReteooRuleBase;
import org.drools.rule.Declaration;
import org.drools.rule.EvalCondition;
@@ -82,14 +84,13 @@
import org.drools.rule.Rule;
import org.drools.rule.builder.dialect.java.JavaDialect;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.CompiledInvoker;
import org.drools.spi.PropagationContext;
import org.drools.spi.Tuple;
import org.drools.util.LinkedList;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
public class PackageBuilderTest extends DroolsTestCase {
@@ -1206,7 +1207,7 @@
assertTrue( flows.containsKey( "0" ) );
Process p = (Process) flows.get( "0" );
- assertTrue( p instanceof RuleFlowProcessImpl );
+ assertTrue( p instanceof WorkflowProcessImpl );
//now serialization
ByteArrayOutputStream data = new ByteArrayOutputStream();
@@ -1223,7 +1224,7 @@
flows.size() );
assertTrue( flows.containsKey( "0" ) );
p = (Process) flows.get( "0" );
- assertTrue( p instanceof RuleFlowProcessImpl );
+ assertTrue( p instanceof WorkflowProcessImpl );
}
public void testPackageRuleFlows() throws Exception {
@@ -1311,6 +1312,17 @@
public void setPackageName(String packageName) {
}
+ public String[] getVariableNames() {
+ return null;
+ }
+
+ public List<Variable> getVariables() {
+ return null;
+ }
+
+ public void setVariables(List<Variable> variables) {
+ }
+
}
class MockActivation
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -32,8 +32,8 @@
import org.drools.event.DefaultAgendaEventListener;
import org.drools.Message;
import org.drools.lang.descr.PackageDescr;
+import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
-import org.drools.ruleflow.common.instance.ProcessInstance;
import org.drools.spi.Activation;
import org.drools.spi.ActivationGroup;
import org.drools.spi.AgendaGroup;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -3,11 +3,11 @@
import org.drools.compiler.Dialect;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
+import org.drools.process.core.Process;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.ruleflow.core.Node;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.DroolsConsequenceAction;
+import org.drools.workflow.core.Node;
+import org.drools.workflow.core.impl.DroolsConsequenceAction;
+import org.drools.workflow.core.node.ActionNode;
public class StoreNodeBuilder
implements
@@ -17,7 +17,7 @@
ProcessDescr processDescr,
ProcessBuildContext context,
Node node) {
- ActionNodeImpl actionNode = ( ActionNodeImpl ) node;
+ ActionNode actionNode = ( ActionNode ) node;
DroolsConsequenceAction action = (DroolsConsequenceAction) actionNode.getAction();
ActionDescr actionDescr = new ActionDescr();
actionDescr.setText( action.getConsequence() );
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/TestXmlDsl.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/TestXmlDsl.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/TestXmlDsl.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,41 +0,0 @@
-package org.drools.process.builder;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.StatefulSession;
-import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.PackageBuilderConfiguration;
-
-import junit.framework.TestCase;
-
-
-public class TestXmlDsl extends TestCase {
- public void testSimpleDsl() throws Exception {
- Properties properties = new Properties();
- properties.put( "semanticModules", "mydsl.conf" );
-
- PackageBuilderConfiguration conf = new PackageBuilderConfiguration( properties );
-
- PackageBuilder builder = new PackageBuilder( conf );
- builder.addProcessFromXml( new InputStreamReader( TestXmlDsl.class.getResourceAsStream( "XmlDslTest.xml" ) ) );
-
- System.out.println( builder.getErrors() );
-
- RuleBase ruleBase = RuleBaseFactory.newRuleBase();
- ruleBase.addPackage( builder.getPackage() );
-
- StatefulSession session = ruleBase.newStatefulSession();
- List list = new ArrayList();
- session.setGlobal( "list", list );
-
- session.startProcess( "process name" );
-
- assertEquals( 2, list.size() );
- assertEquals( "action node was here", list.get(0) );
- assertEquals( "dsl was here", list.get(1) );
- }
-}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -42,11 +42,11 @@
import org.drools.rule.builder.ProcessBuildContext;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.RuleBuilder;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
import org.drools.spi.Action;
import org.drools.spi.ObjectType;
import org.drools.spi.PatternExtractor;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
+import org.drools.workflow.core.node.ActionNode;
import org.mvel.ExpressionCompiler;
import org.mvel.ParserContext;
@@ -69,7 +69,7 @@
processDescr.setClassName( "Process1" );
processDescr.setName( "Process1" );
- RuleFlowProcessImpl process = new RuleFlowProcessImpl();
+ WorkflowProcessImpl process = new WorkflowProcessImpl();
process.setName( "Process1" );
process.setPackageName( "pkg1" );
@@ -79,7 +79,7 @@
pkgBuilder.addPackageFromDrl( new StringReader("package pkg1;\nglobal java.util.List list;\n") );
- ActionNodeImpl actionNode = new ActionNodeImpl();
+ ActionNode actionNode = new ActionNode();
javaDialect.getActionBuilder().build( context, actionNode, actionDescr );
javaDialect.addProcess( context );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaReturnValueConstraintEvaluatorBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaReturnValueConstraintEvaluatorBuilderTest.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaReturnValueConstraintEvaluatorBuilderTest.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -13,11 +13,10 @@
import org.drools.lang.descr.ProcessDescr;
import org.drools.rule.Package;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.ruleflow.core.impl.ReturnValueConstraintEvaluator;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
-import org.drools.ruleflow.instance.impl.RuleFlowProcessInstanceImpl;
-import org.drools.ruleflow.instance.impl.RuleFlowSplitInstanceImpl;
+import org.drools.ruleflow.instance.RuleFlowProcessInstance;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
+import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
+import org.drools.workflow.instance.node.SplitInstance;
public class JavaReturnValueConstraintEvaluatorBuilderTest extends TestCase {
@@ -31,7 +30,7 @@
processDescr.setClassName( "Process1" );
processDescr.setName( "Process1" );
- RuleFlowProcessImpl process = new RuleFlowProcessImpl();
+ WorkflowProcessImpl process = new WorkflowProcessImpl();
process.setName( "Process1" );
process.setPackageName( "pkg1" );
@@ -69,10 +68,10 @@
wm.setGlobal( "value",
true );
- RuleFlowProcessInstanceImpl processInstance = new RuleFlowProcessInstanceImpl();
+ RuleFlowProcessInstance processInstance = new RuleFlowProcessInstance();
processInstance.setWorkingMemory( wm );
- RuleFlowSplitInstanceImpl splitInstance = new RuleFlowSplitInstanceImpl();
+ SplitInstance splitInstance = new SplitInstance();
splitInstance.setProcessInstance( processInstance );
assertTrue( node.evaluate( splitInstance,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -40,10 +40,10 @@
import org.drools.rule.builder.PackageBuildContext;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.RuleBuilder;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
import org.drools.spi.Action;
import org.drools.spi.ObjectType;
import org.drools.spi.PatternExtractor;
+import org.drools.workflow.core.node.ActionNode;
import org.mvel.ExpressionCompiler;
import org.mvel.ParserContext;
@@ -67,7 +67,7 @@
pkgBuilder.addPackageFromDrl( new StringReader("package pkg1;\nglobal java.util.List list;\n") );
- ActionNodeImpl actionNode = new ActionNodeImpl();
+ ActionNode actionNode = new ActionNode();
final MVELActionBuilder builder = new MVELActionBuilder();
builder.build( context,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -40,10 +40,10 @@
import org.drools.rule.builder.PackageBuildContext;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.RuleBuilder;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
import org.drools.spi.Action;
import org.drools.spi.ObjectType;
import org.drools.spi.PatternExtractor;
+import org.drools.workflow.core.node.ActionNode;
import org.mvel.ExpressionCompiler;
import org.mvel.ParserContext;
@@ -67,7 +67,7 @@
pkgBuilder.addPackageFromDrl( new StringReader("package pkg1;\nglobal java.util.List list;\n") );
- ActionNodeImpl actionNode = new ActionNodeImpl();
+ ActionNode actionNode = new ActionNode();
final MVELActionBuilder builder = new MVELActionBuilder();
builder.build( context,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueConstraintEvaluatorBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueConstraintEvaluatorBuilderTest.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueConstraintEvaluatorBuilderTest.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -12,9 +12,9 @@
import org.drools.compiler.ReturnValueDescr;
import org.drools.rule.Package;
import org.drools.rule.builder.PackageBuildContext;
-import org.drools.ruleflow.core.impl.ReturnValueConstraintEvaluator;
-import org.drools.ruleflow.instance.impl.RuleFlowProcessInstanceImpl;
-import org.drools.ruleflow.instance.impl.RuleFlowSplitInstanceImpl;
+import org.drools.ruleflow.instance.RuleFlowProcessInstance;
+import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
+import org.drools.workflow.instance.node.SplitInstance;
public class MVELReturnValueConstraintEvaluatorBuilderTest extends TestCase {
@@ -54,10 +54,10 @@
wm.setGlobal( "value", true );
- RuleFlowProcessInstanceImpl processInstance = new RuleFlowProcessInstanceImpl();
+ RuleFlowProcessInstance processInstance = new RuleFlowProcessInstance();
processInstance.setWorkingMemory( wm );
- RuleFlowSplitInstanceImpl splitInstance = new RuleFlowSplitInstanceImpl();
+ SplitInstance splitInstance = new SplitInstance();
splitInstance.setProcessInstance( processInstance );
assertTrue( node.evaluate( splitInstance,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -27,13 +27,14 @@
import org.drools.event.RuleFlowEventSupport;
import org.drools.event.WorkingMemoryEventListener;
import org.drools.event.WorkingMemoryEventSupport;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.ProcessInstanceFactory;
+import org.drools.process.instance.WorkItemManager;
import org.drools.reteoo.LIANodePropagation;
import org.drools.reteoo.ObjectTypeConf;
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
import org.drools.rule.TimeMachine;
-import org.drools.ruleflow.common.instance.ProcessInstance;
-import org.drools.ruleflow.common.instance.WorkItemManager;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AgendaGroup;
@@ -317,6 +318,12 @@
return null;
}
+ public ProcessInstance startProcess(String processId,
+ Map<String, Object> parameters) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
public void update(FactHandle handle, Object object) throws FactException {
// TODO Auto-generated method stub
@@ -447,4 +454,10 @@
return null;
}
+ public void registerProcessInstanceFactory(String type,
+ ProcessInstanceFactory nodeInstanceFactory) {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/StoreHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/StoreHandler.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/StoreHandler.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -2,26 +2,13 @@
import java.util.HashSet;
-import org.drools.ruleflow.common.core.impl.ProcessImpl;
-import org.drools.ruleflow.common.core.Process;
-import org.drools.lang.descr.FunctionImportDescr;
-import org.drools.lang.descr.GlobalDescr;
-import org.drools.lang.descr.ImportDescr;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.ruleflow.core.ActionNode;
-import org.drools.ruleflow.core.StartNode;
-import org.drools.ruleflow.core.impl.ActionNodeImpl;
-import org.drools.ruleflow.core.impl.DroolsConsequenceAction;
-import org.drools.ruleflow.core.impl.RuleFlowProcessImpl;
-import org.drools.ruleflow.core.impl.StartNodeImpl;
-import org.drools.xml.BaseAbstractHandler;
-import org.drools.xml.Configuration;
-import org.drools.xml.ExtensibleXmlParser;
-import org.drools.xml.Handler;
-import org.drools.xml.ProcessBuildData;
+import org.drools.process.core.Process;
+import org.drools.workflow.core.impl.DroolsConsequenceAction;
+import org.drools.workflow.core.impl.WorkflowProcessImpl;
+import org.drools.workflow.core.node.ActionNode;
+import org.drools.workflow.core.node.StartNode;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
public class StoreHandler extends BaseAbstractHandler
implements
@@ -48,9 +35,9 @@
xmlPackageReader.startConfiguration( localName,
attrs );
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) xmlPackageReader.getParent();
+ WorkflowProcessImpl process = ( WorkflowProcessImpl ) xmlPackageReader.getParent();
- ActionNodeImpl actionNode = new ActionNodeImpl();
+ ActionNode actionNode = new ActionNode();
final String name = attrs.getValue( "name" );
emptyAttributeCheck( localName, "name", name, xmlPackageReader );
@@ -66,9 +53,9 @@
final String localName,
final ExtensibleXmlParser xmlPackageReader) throws SAXException {
final Configuration config = xmlPackageReader.endConfiguration();
- RuleFlowProcessImpl process = ( RuleFlowProcessImpl ) xmlPackageReader.getParent();
+ WorkflowProcessImpl process = ( WorkflowProcessImpl ) xmlPackageReader.getParent();
- ActionNodeImpl actionNode = ( ActionNodeImpl ) xmlPackageReader.getCurrent();
+ ActionNode actionNode = ( ActionNode ) xmlPackageReader.getCurrent();
String text = config.getText();
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/TestXml.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/TestXml.java (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/TestXml.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,26 @@
+package org.drools.xml;
+
+import java.io.InputStreamReader;
+import java.io.StringReader;
+
+import junit.framework.TestCase;
+
+import org.drools.ruleflow.core.RuleFlowProcess;
+
+public class TestXml extends TestCase {
+
+ public void testSimpleXml() throws Exception {
+ SemanticModules modules = new SemanticModules();
+ modules.addSemanticModule(new ProcessSemanticModule());
+ XmlProcessReader reader = new XmlProcessReader(modules);
+ reader.read(new InputStreamReader(TestXml.class.getResourceAsStream("XmlTest.xml")));
+ RuleFlowProcess process = (RuleFlowProcess) reader.getProcess();
+ assertNotNull(process);
+
+ XmlRuleFlowProcesDumper dumper = new XmlRuleFlowProcesDumper();
+ String output = dumper.dump(process);
+ System.out.println(output);
+ reader = new XmlProcessReader(new SemanticModules());
+ reader.read(new StringReader(output));
+ }
+}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/ActionNodeTest.java 2008-01-09 01:25:37 UTC (rev 17635)
@@ -10,7 +10,7 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.compiler.PackageBuilder;
-import org.drools.ruleflow.common.core.Process;
+import org.drools.process.core.Process;
import org.drools.xml.XmlProcessReader;
public class ActionNodeTest extends TestCase {
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/META-INF/bpelNodeBuilderRegistry.conf
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/META-INF/bpelNodeBuilderRegistry.conf (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/META-INF/bpelNodeBuilderRegistry.conf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,7 @@
+// we use MVEL to configure our nodes, simply populate a map, which will be added to the main registry
+import org.drools.bpel.core.BPELAssign;
+import org.drools.process.builder.ActionNodeBuilder;
+
+[
+ BPELAssign : new ActionNodeBuilder(),
+]
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/META-INF/bpelProcessNodeInstanceFactory.conf
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/META-INF/bpelProcessNodeInstanceFactory.conf (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/META-INF/bpelProcessNodeInstanceFactory.conf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,26 @@
+// we use MVEL to configure our nodes, simply populate a map, which will be added to the main registry
+import org.drools.bpel.core.BPELAssign;
+import org.drools.bpel.core.BPELFlow;
+import org.drools.bpel.core.BPELInvoke;
+import org.drools.bpel.core.BPELReceive;
+import org.drools.bpel.core.BPELReply;
+import org.drools.bpel.core.BPELScope;
+import org.drools.bpel.core.BPELSequence;
+import org.drools.bpel.instance.BPELAssignInstance;
+import org.drools.bpel.instance.BPELFlowInstance;
+import org.drools.bpel.instance.BPELInvokeInstance;
+import org.drools.bpel.instance.BPELReceiveInstance;
+import org.drools.bpel.instance.BPELReplyInstance;
+import org.drools.bpel.instance.BPELScopeInstance;
+import org.drools.bpel.instance.BPELSequenceInstance;
+import org.drools.workflow.instance.impl.factory.CreateNewNodeFactory;
+
+[
+ BPELAssign : new CreateNewNodeFactory( BPELAssignInstance ),
+ BPELFlow : new CreateNewNodeFactory( BPELFlowInstance ),
+ BPELInvoke : new CreateNewNodeFactory( BPELInvokeInstance ),
+ BPELReceive : new CreateNewNodeFactory( BPELReceiveInstance ),
+ BPELReply : new CreateNewNodeFactory( BPELReplyInstance ),
+ BPELScope : new CreateNewNodeFactory( BPELScopeInstance ),
+ BPELSequence : new CreateNewNodeFactory( BPELSequenceInstance ),
+]
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow.rf
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow.rf (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow.rf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,118 @@
+<org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper id="1" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+ <default>
+ <elements id="2">
+ <entry>
+ <string>2-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper id="3" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="4">
+ <x>179</x>
+ <y>100</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.EndNode" id="5">
+ <id>2</id>
+ <name>End</name>
+ <incomingConnections id="6">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="7">
+ <org.drools.workflow.core.impl.ConnectionImpl id="8">
+ <from class="org.drools.workflow.core.node.StartNode" id="9">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="10"/>
+ <outgoingConnections id="11">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="12">
+ <org.drools.workflow.core.impl.ConnectionImpl reference="8"/>
+ </list>
+ </entry>
+ </outgoingConnections>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" id="13">
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess$WorkflowProcessNodeContainer" id="14">
+ <outer-class class="org.drools.ruleflow.core.RuleFlowProcess" reference="13"/>
+ <nodes id="15">
+ <entry>
+ <long>1</long>
+ <org.drools.workflow.core.node.StartNode reference="9"/>
+ </entry>
+ <entry>
+ <long>2</long>
+ <org.drools.workflow.core.node.EndNode reference="5"/>
+ </entry>
+ </nodes>
+ <lastNodeId>2</lastNodeId>
+ </nodeContainer>
+ <id>com.sample.ruleflow</id>
+ <name>empty_ruleflow</name>
+ <version>1.0</version>
+ <type>RuleFlow</type>
+ <packageName>com.empty</packageName>
+ <variableScope class="org.drools.process.core.impl.VariableScopeImpl" id="16">
+ <variables id="17"/>
+ </variableScope>
+ </nodeContainer>
+ </from>
+ <to class="org.drools.workflow.core.node.EndNode" reference="5"/>
+ <fromType>DROOLS_DEFAULT</fromType>
+ <toType>DROOLS_DEFAULT</toType>
+ </org.drools.workflow.core.impl.ConnectionImpl>
+ </list>
+ </entry>
+ </incomingConnections>
+ <outgoingConnections id="18"/>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" reference="13"/>
+ </element>
+ <incomingConnections id="19">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="20" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <bendpoints id="21"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="22" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="23">
+ <x>34</x>
+ <y>100</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.StartNode" reference="9"/>
+ <incomingConnections id="24"/>
+ <outgoingConnections id="25">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="20"/>
+ </outgoingConnections>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" reference="3"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection reference="8"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="26"/>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper>
+ </entry>
+ <entry>
+ <string>1-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="22"/>
+ </entry>
+ </elements>
+ <process class="org.drools.ruleflow.core.RuleFlowProcess" reference="13"/>
+ <routerLayout>2</routerLayout>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+</org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow.rfm
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow.rfm 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,46 +0,0 @@
-<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
- <nodes id="2">
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="4"/>
- <outgoingConnections id="5">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="7">
- <id>4</id>
- <name>End</name>
- <incomingConnections id="8">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
- </incomingConnections>
- <outgoingConnections id="9"/>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </org.drools.ruleflow.core.impl.StartNodeImpl>
- </entry>
- <entry>
- <long>4</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl reference="7"/>
- </entry>
- </nodes>
- <variables id="10"/>
- <lastNodeId>9</lastNodeId>
- <imports id="11">
- <string>com.sample.Property</string>
- </imports>
- <globals id="12">
- <entry>
- <string>property</string>
- <string>Property</string>
- </entry>
- </globals>
- <id>com.sample.ruleflow</id>
- <name>Ruleflow</name>
- <version>1.0</version>
- <type>RuleFlow</type>
- <packageName>com.empty</packageName>
-</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow_old.rfm (from rev 17569, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow.rfm)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow_old.rfm (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/empty_ruleflow_old.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,46 @@
+<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
+ <nodes id="2">
+ <entry>
+ <long>1</long>
+ <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="4"/>
+ <outgoingConnections id="5">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
+ <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="7">
+ <id>4</id>
+ <name>End</name>
+ <incomingConnections id="8">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
+ </incomingConnections>
+ <outgoingConnections id="9"/>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </org.drools.ruleflow.core.impl.StartNodeImpl>
+ </entry>
+ <entry>
+ <long>4</long>
+ <org.drools.ruleflow.core.impl.EndNodeImpl reference="7"/>
+ </entry>
+ </nodes>
+ <variables id="10"/>
+ <lastNodeId>9</lastNodeId>
+ <imports id="11">
+ <string>com.sample.Property</string>
+ </imports>
+ <globals id="12">
+ <entry>
+ <string>property</string>
+ <string>Property</string>
+ </entry>
+ </globals>
+ <id>com.sample.ruleflow</id>
+ <name>Ruleflow</name>
+ <version>1.0</version>
+ <type>RuleFlow</type>
+ <packageName>com.empty</packageName>
+</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/error_ruleflow.rfm
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/error_ruleflow.rfm 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/error_ruleflow.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,45 +0,0 @@
-<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
- <nodes id="2">
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="4"/>
- <outgoingConnections id="5">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="7">
- <id>4</id>
- <name>End</name>
- <incomingConnections id="8">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
- </incomingConnections>
- <outgoingConnections id="9"/>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </org.drools.ruleflow.core.impl.StartNodeImpl>
- </entry>
- <entry>
- <long>4</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl reference="7"/>
- </entry>
- </nodes>
- <variables id="10"/>
- <lastNodeId>9</lastNodeId>
- <imports id="11">
- <string>com.sample.Property</string>
- </imports>
- <globals id="12">
- <entry>
- <string>property</string>
- <string>Property</string>
- </entry>
- </globals>
- <id>com.sample.ruleflow</id>
- <name>Ruleflow</name>
- <version>1.0</version>
- <type>RuleFlow</type>
-</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/error_ruleflow_old.rfm (from rev 17569, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/error_ruleflow.rfm)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/error_ruleflow_old.rfm (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/error_ruleflow_old.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,45 @@
+<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
+ <nodes id="2">
+ <entry>
+ <long>1</long>
+ <org.drools.ruleflow.core.impl.StartNodeImpl id="3">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="4"/>
+ <outgoingConnections id="5">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="3"/>
+ <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="7">
+ <id>4</id>
+ <name>End</name>
+ <incomingConnections id="8">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
+ </incomingConnections>
+ <outgoingConnections id="9"/>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </org.drools.ruleflow.core.impl.StartNodeImpl>
+ </entry>
+ <entry>
+ <long>4</long>
+ <org.drools.ruleflow.core.impl.EndNodeImpl reference="7"/>
+ </entry>
+ </nodes>
+ <variables id="10"/>
+ <lastNodeId>9</lastNodeId>
+ <imports id="11">
+ <string>com.sample.Property</string>
+ </imports>
+ <globals id="12">
+ <entry>
+ <string>property</string>
+ <string>Property</string>
+ </entry>
+ </globals>
+ <id>com.sample.ruleflow</id>
+ <name>Ruleflow</name>
+ <version>1.0</version>
+ <type>RuleFlow</type>
+</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow.rf
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow.rf (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow.rf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,540 @@
+<org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper id="1" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+ <default>
+ <elements id="2">
+ <entry>
+ <string>4-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper id="3" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="4">
+ <x>462</x>
+ <y>103</y>
+ <width>56</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.EndNode" id="5">
+ <id>4</id>
+ <name>End</name>
+ <incomingConnections id="6">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="7">
+ <org.drools.workflow.core.impl.ConnectionImpl id="8">
+ <from class="org.drools.workflow.core.node.RuleSetNode" id="9">
+ <ruleFlowGroup>flowgroup-4</ruleFlowGroup>
+ <id>9</id>
+ <name>RuleSet4</name>
+ <incomingConnections id="10">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="11">
+ <org.drools.workflow.core.impl.ConnectionImpl id="12">
+ <from class="org.drools.workflow.core.node.Join" id="13">
+ <type>1</type>
+ <id>6</id>
+ <name>Join</name>
+ <incomingConnections id="14">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="15">
+ <org.drools.workflow.core.impl.ConnectionImpl id="16">
+ <from class="org.drools.workflow.core.node.RuleSetNode" id="17">
+ <ruleFlowGroup>flowgroup-2</ruleFlowGroup>
+ <id>10</id>
+ <name>RuleSet2</name>
+ <incomingConnections id="18">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="19">
+ <org.drools.workflow.core.impl.ConnectionImpl id="20">
+ <from class="org.drools.workflow.core.node.Split" id="21">
+ <type>1</type>
+ <constraints id="22"/>
+ <id>5</id>
+ <name>Split</name>
+ <incomingConnections id="23">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="24">
+ <org.drools.workflow.core.impl.ConnectionImpl id="25">
+ <from class="org.drools.workflow.core.node.RuleSetNode" id="26">
+ <ruleFlowGroup>flowgroup-1</ruleFlowGroup>
+ <id>2</id>
+ <name>RuleSet1</name>
+ <incomingConnections id="27">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="28">
+ <org.drools.workflow.core.impl.ConnectionImpl id="29">
+ <from class="org.drools.workflow.core.node.StartNode" id="30">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="31"/>
+ <outgoingConnections id="32">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="33">
+ <org.drools.workflow.core.impl.ConnectionImpl reference="29"/>
+ </list>
+ </entry>
+ </outgoingConnections>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" id="34">
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess$WorkflowProcessNodeContainer" id="35">
+ <outer-class class="org.drools.ruleflow.core.RuleFlowProcess" reference="34"/>
+ <nodes id="36">
+ <entry>
+ <long>1</long>
+ <org.drools.workflow.core.node.StartNode reference="30"/>
+ </entry>
+ <entry>
+ <long>2</long>
+ <org.drools.workflow.core.node.RuleSetNode reference="26"/>
+ </entry>
+ <entry>
+ <long>4</long>
+ <org.drools.workflow.core.node.EndNode reference="5"/>
+ </entry>
+ <entry>
+ <long>5</long>
+ <org.drools.workflow.core.node.Split reference="21"/>
+ </entry>
+ <entry>
+ <long>6</long>
+ <org.drools.workflow.core.node.Join reference="13"/>
+ </entry>
+ <entry>
+ <long>9</long>
+ <org.drools.workflow.core.node.RuleSetNode reference="9"/>
+ </entry>
+ <entry>
+ <long>10</long>
+ <org.drools.workflow.core.node.RuleSetNode reference="17"/>
+ </entry>
+ <entry>
+ <long>11</long>
+ <org.drools.workflow.core.node.RuleSetNode id="37">
+ <ruleFlowGroup>flowgroup-3</ruleFlowGroup>
+ <id>11</id>
+ <name>RuleSet3</name>
+ <incomingConnections id="38">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="39">
+ <org.drools.workflow.core.impl.ConnectionImpl id="40">
+ <from class="org.drools.workflow.core.node.Split" reference="21"/>
+ <to class="org.drools.workflow.core.node.RuleSetNode" reference="37"/>
+ <fromType>DROOLS_DEFAULT</fromType>
+ <toType>DROOLS_DEFAULT</toType>
+ </org.drools.workflow.core.impl.ConnectionImpl>
+ </list>
+ </entry>
+ </incomingConnections>
+ <outgoingConnections id="41">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="42">
+ <org.drools.workflow.core.impl.ConnectionImpl id="43">
+ <from class="org.drools.workflow.core.node.RuleSetNode" reference="37"/>
+ <to class="org.drools.workflow.core.node.Join" reference="13"/>
+ <fromType>DROOLS_DEFAULT</fromType>
+ <toType>DROOLS_DEFAULT</toType>
+ </org.drools.workflow.core.impl.ConnectionImpl>
+ </list>
+ </entry>
+ </outgoingConnections>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" reference="34"/>
+ </org.drools.workflow.core.node.RuleSetNode>
+ </entry>
+ </nodes>
+ <lastNodeId>11</lastNodeId>
+ </nodeContainer>
+ <id>0</id>
+ <name>ruleflow</name>
+ <version>1</version>
+ <type>RuleFlow</type>
+ <packageName>com.sample</packageName>
+ <variableScope class="org.drools.process.core.impl.VariableScopeImpl" id="44">
+ <variables id="45"/>
+ </variableScope>
+ </nodeContainer>
+ </from>
+ <to class="org.drools.workflow.core.node.RuleSetNode" reference="26"/>
+ <fromType>DROOLS_DEFAULT</fromType>
+ <toType>DROOLS_DEFAULT</toType>
+ </org.drools.workflow.core.impl.ConnectionImpl>
+ </list>
+ </entry>
+ </incomingConnections>
+ <outgoingConnections id="46">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="47">
+ <org.drools.workflow.core.impl.ConnectionImpl reference="25"/>
+ </list>
+ </entry>
+ </outgoingConnections>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" reference="34"/>
+ </from>
+ <to class="org.drools.workflow.core.node.Split" reference="21"/>
+ <fromType>DROOLS_DEFAULT</fromType>
+ <toType>DROOLS_DEFAULT</toType>
+ </org.drools.workflow.core.impl.ConnectionImpl>
+ </list>
+ </entry>
+ </incomingConnections>
+ <outgoingConnections id="48">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="49">
+ <org.drools.workflow.core.impl.ConnectionImpl reference="20"/>
+ <org.drools.workflow.core.impl.ConnectionImpl reference="40"/>
+ </list>
+ </entry>
+ </outgoingConnections>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" reference="34"/>
+ </from>
+ <to class="org.drools.workflow.core.node.RuleSetNode" reference="17"/>
+ <fromType>DROOLS_DEFAULT</fromType>
+ <toType>DROOLS_DEFAULT</toType>
+ </org.drools.workflow.core.impl.ConnectionImpl>
+ </list>
+ </entry>
+ </incomingConnections>
+ <outgoingConnections id="50">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="51">
+ <org.drools.workflow.core.impl.ConnectionImpl reference="16"/>
+ </list>
+ </entry>
+ </outgoingConnections>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" reference="34"/>
+ </from>
+ <to class="org.drools.workflow.core.node.Join" reference="13"/>
+ <fromType>DROOLS_DEFAULT</fromType>
+ <toType>DROOLS_DEFAULT</toType>
+ </org.drools.workflow.core.impl.ConnectionImpl>
+ <org.drools.workflow.core.impl.ConnectionImpl reference="43"/>
+ </list>
+ </entry>
+ </incomingConnections>
+ <outgoingConnections id="52">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="53">
+ <org.drools.workflow.core.impl.ConnectionImpl reference="12"/>
+ </list>
+ </entry>
+ </outgoingConnections>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" reference="34"/>
+ </from>
+ <to class="org.drools.workflow.core.node.RuleSetNode" reference="9"/>
+ <fromType>DROOLS_DEFAULT</fromType>
+ <toType>DROOLS_DEFAULT</toType>
+ </org.drools.workflow.core.impl.ConnectionImpl>
+ </list>
+ </entry>
+ </incomingConnections>
+ <outgoingConnections id="54">
+ <entry>
+ <string>DROOLS_DEFAULT</string>
+ <list id="55">
+ <org.drools.workflow.core.impl.ConnectionImpl reference="8"/>
+ </list>
+ </entry>
+ </outgoingConnections>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" reference="34"/>
+ </from>
+ <to class="org.drools.workflow.core.node.EndNode" reference="5"/>
+ <fromType>DROOLS_DEFAULT</fromType>
+ <toType>DROOLS_DEFAULT</toType>
+ </org.drools.workflow.core.impl.ConnectionImpl>
+ </list>
+ </entry>
+ </incomingConnections>
+ <outgoingConnections id="56"/>
+ <nodeContainer class="org.drools.ruleflow.core.RuleFlowProcess" reference="34"/>
+ </element>
+ <incomingConnections id="57">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="58" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <bendpoints id="59"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="60" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="61">
+ <x>366</x>
+ <y>103</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.RuleSetNode" reference="9"/>
+ <incomingConnections id="62">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="63" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <bendpoints id="64"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="65" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="66">
+ <x>309</x>
+ <y>104</y>
+ <width>40</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.Join" reference="13"/>
+ <incomingConnections id="67">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="68" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <bendpoints id="69"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="70" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="71">
+ <x>218</x>
+ <y>46</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.RuleSetNode" reference="17"/>
+ <incomingConnections id="72">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="73" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <bendpoints id="74"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" id="75" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="76">
+ <x>166</x>
+ <y>104</y>
+ <width>38</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.Split" reference="21"/>
+ <incomingConnections id="77">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="78" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <bendpoints id="79"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="80" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="81">
+ <x>86</x>
+ <y>104</y>
+ <width>63</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.RuleSetNode" reference="26"/>
+ <incomingConnections id="82">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="83" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <bendpoints id="84"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="85" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="86">
+ <x>13</x>
+ <y>104</y>
+ <width>59</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.StartNode" reference="30"/>
+ <incomingConnections id="87"/>
+ <outgoingConnections id="88">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="83"/>
+ </outgoingConnections>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="80"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection reference="29"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="89">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="78"/>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="75"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection reference="25"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="90">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="73"/>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="91" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <bendpoints id="92"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="75"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="93" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="94">
+ <x>221</x>
+ <y>158</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.workflow.core.node.RuleSetNode" reference="37"/>
+ <incomingConnections id="95">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="91"/>
+ </incomingConnections>
+ <outgoingConnections id="96">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="97" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <bendpoints id="98"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="93"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="65"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection reference="43"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </target>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection reference="40"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+ <default/>
+ </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="70"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection reference="20"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="99">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="68"/>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="65"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection reference="16"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="97"/>
+ </incomingConnections>
+ <outgoingConnections id="100">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="63"/>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="60"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection reference="12"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="101">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="58"/>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" reference="3"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection reference="8"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="102"/>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper>
+ </entry>
+ <entry>
+ <string>9-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="60"/>
+ </entry>
+ <entry>
+ <string>2-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="80"/>
+ </entry>
+ <entry>
+ <string>11-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="93"/>
+ </entry>
+ <entry>
+ <string>10-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="70"/>
+ </entry>
+ <entry>
+ <string>1-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="85"/>
+ </entry>
+ <entry>
+ <string>6-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="65"/>
+ </entry>
+ <entry>
+ <string>5-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.SplitWrapper reference="75"/>
+ </entry>
+ </elements>
+ <process class="org.drools.ruleflow.core.RuleFlowProcess" reference="34"/>
+ <routerLayout>2</routerLayout>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+</org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow.rfm
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow.rfm 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,151 +0,0 @@
-<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
- <nodes id="2">
- <entry>
- <long>2</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl id="3">
- <ruleFlowGroup>flowgroup-1</ruleFlowGroup>
- <id>2</id>
- <name>RuleSet1</name>
- <incomingConnections id="4">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="6">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="7"/>
- <outgoingConnections id="8">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="9">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
- <to class="org.drools.ruleflow.core.impl.SplitImpl" id="11">
- <type>1</type>
- <constraints id="12"/>
- <id>5</id>
- <name>Split</name>
- <incomingConnections id="13">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
- </incomingConnections>
- <outgoingConnections id="14">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="15">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="11"/>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="16">
- <ruleFlowGroup>flowgroup-2</ruleFlowGroup>
- <id>3</id>
- <name>RuleSet2</name>
- <incomingConnections id="17">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
- </incomingConnections>
- <outgoingConnections id="18">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="16"/>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" id="20">
- <type>1</type>
- <id>6</id>
- <name>Join</name>
- <incomingConnections id="21">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="22">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="23">
- <ruleFlowGroup>flowgroup-3</ruleFlowGroup>
- <id>4</id>
- <name>RuleSet3</name>
- <incomingConnections id="24">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="25">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="11"/>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="23"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="26">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="20"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
- </incomingConnections>
- <outgoingConnections id="27">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="28">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="20"/>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="29">
- <ruleFlowGroup>flowgroup-4</ruleFlowGroup>
- <id>7</id>
- <name>RuleSet4</name>
- <incomingConnections id="30">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="28"/>
- </incomingConnections>
- <outgoingConnections id="31">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="32">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="29"/>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="33">
- <id>8</id>
- <name>End</name>
- <incomingConnections id="34">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="32"/>
- </incomingConnections>
- <outgoingConnections id="35"/>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="25"/>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </org.drools.ruleflow.core.impl.RuleSetNodeImpl>
- </entry>
- <entry>
- <long>4</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="23"/>
- </entry>
- <entry>
- <long>8</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl reference="33"/>
- </entry>
- <entry>
- <long>6</long>
- <org.drools.ruleflow.core.impl.JoinImpl reference="20"/>
- </entry>
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl reference="6"/>
- </entry>
- <entry>
- <long>3</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="16"/>
- </entry>
- <entry>
- <long>7</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="29"/>
- </entry>
- <entry>
- <long>5</long>
- <org.drools.ruleflow.core.impl.SplitImpl reference="11"/>
- </entry>
- </nodes>
- <variables id="36"/>
- <lastNodeId>8</lastNodeId>
- <id>0</id>
- <name>flow</name>
- <type>Workflow</type>
- <packageName>com.sample</packageName>
-</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow_old.rfm (from rev 17569, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow.rfm)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow_old.rfm (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/ruleflow_old.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,151 @@
+<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
+ <nodes id="2">
+ <entry>
+ <long>2</long>
+ <org.drools.ruleflow.core.impl.RuleSetNodeImpl id="3">
+ <ruleFlowGroup>flowgroup-1</ruleFlowGroup>
+ <id>2</id>
+ <name>RuleSet1</name>
+ <incomingConnections id="4">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="6">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="7"/>
+ <outgoingConnections id="8">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="9">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="3"/>
+ <to class="org.drools.ruleflow.core.impl.SplitImpl" id="11">
+ <type>1</type>
+ <constraints id="12"/>
+ <id>5</id>
+ <name>Split</name>
+ <incomingConnections id="13">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
+ </incomingConnections>
+ <outgoingConnections id="14">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="15">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="11"/>
+ <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="16">
+ <ruleFlowGroup>flowgroup-2</ruleFlowGroup>
+ <id>3</id>
+ <name>RuleSet2</name>
+ <incomingConnections id="17">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
+ </incomingConnections>
+ <outgoingConnections id="18">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="16"/>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" id="20">
+ <type>1</type>
+ <id>6</id>
+ <name>Join</name>
+ <incomingConnections id="21">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="22">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="23">
+ <ruleFlowGroup>flowgroup-3</ruleFlowGroup>
+ <id>4</id>
+ <name>RuleSet3</name>
+ <incomingConnections id="24">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="25">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="11"/>
+ <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="23"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="26">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="20"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
+ </incomingConnections>
+ <outgoingConnections id="27">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="28">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="20"/>
+ <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="29">
+ <ruleFlowGroup>flowgroup-4</ruleFlowGroup>
+ <id>7</id>
+ <name>RuleSet4</name>
+ <incomingConnections id="30">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="28"/>
+ </incomingConnections>
+ <outgoingConnections id="31">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="32">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="29"/>
+ <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="33">
+ <id>8</id>
+ <name>End</name>
+ <incomingConnections id="34">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="32"/>
+ </incomingConnections>
+ <outgoingConnections id="35"/>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="25"/>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </org.drools.ruleflow.core.impl.RuleSetNodeImpl>
+ </entry>
+ <entry>
+ <long>4</long>
+ <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="23"/>
+ </entry>
+ <entry>
+ <long>8</long>
+ <org.drools.ruleflow.core.impl.EndNodeImpl reference="33"/>
+ </entry>
+ <entry>
+ <long>6</long>
+ <org.drools.ruleflow.core.impl.JoinImpl reference="20"/>
+ </entry>
+ <entry>
+ <long>1</long>
+ <org.drools.ruleflow.core.impl.StartNodeImpl reference="6"/>
+ </entry>
+ <entry>
+ <long>3</long>
+ <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="16"/>
+ </entry>
+ <entry>
+ <long>7</long>
+ <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="29"/>
+ </entry>
+ <entry>
+ <long>5</long>
+ <org.drools.ruleflow.core.impl.SplitImpl reference="11"/>
+ </entry>
+ </nodes>
+ <variables id="36"/>
+ <lastNodeId>8</lastNodeId>
+ <id>0</id>
+ <name>flow</name>
+ <type>Workflow</type>
+ <packageName>com.sample</packageName>
+</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rf
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rf 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,257 +0,0 @@
-<org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper id="1" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
- <default>
- <elements id="2">
- <entry>
- <string>2-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper id="3" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="4">
- <x>105</x>
- <y>78</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="5">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="6">
- <dialect>mvel</dialect>
- <consequence>list.add( "mvel was here" )</consequence>
- </action>
- <id>2</id>
- <name>MVELAction</name>
- <incomingConnections id="7">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="9">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="10"/>
- <outgoingConnections id="11">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="12">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="13">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="14">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="15">
- <dialect>java</dialect>
- <consequence>list.add( "java was here" );</consequence>
- </action>
- <id>3</id>
- <name>JavaAction</name>
- <incomingConnections id="16">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
- </incomingConnections>
- <outgoingConnections id="17">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="18">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="14"/>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="19">
- <id>4</id>
- <name>End</name>
- <incomingConnections id="20">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="18"/>
- </incomingConnections>
- <outgoingConnections id="21"/>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </element>
- <incomingConnections id="22">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="23" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="24"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="25" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="26">
- <x>105</x>
- <y>17</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="9"/>
- <incomingConnections id="27"/>
- <outgoingConnections id="28">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="23"/>
- </outgoingConnections>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </source>
- <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="8"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </incomingConnections>
- <outgoingConnections id="29">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="30" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="31"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="32" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="33">
- <x>105</x>
- <y>149</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="14"/>
- <incomingConnections id="34">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="30"/>
- </incomingConnections>
- <outgoingConnections id="35">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="36" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="37"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="32"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="38" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="39">
- <x>104</x>
- <y>217</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="19"/>
- <incomingConnections id="40">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="36"/>
- </incomingConnections>
- <outgoingConnections id="41"/>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </target>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="18"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- <default>
- <descriptors id="42">
- <org.eclipse.ui.views.properties.TextPropertyDescriptor id="43">
- <id class="string">Name</id>
- <display>Name</display>
- <incompatible>false</incompatible>
- </org.eclipse.ui.views.properties.TextPropertyDescriptor>
- <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="44">
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="45">
- <nodes id="46">
- <entry>
- <long>2</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="5"/>
- </entry>
- <entry>
- <long>4</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl reference="19"/>
- </entry>
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl reference="9"/>
- </entry>
- <entry>
- <long>3</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="14"/>
- </entry>
- </nodes>
- <variables id="47"/>
- <lastNodeId>4</lastNodeId>
- <imports id="48">
- <string>java.util.List</string>
- </imports>
- <globals id="49">
- <entry>
- <string>list</string>
- <string>List</string>
- </entry>
- </globals>
- <id>ActionDialects</id>
- <name>ActionDialects</name>
- <type>RuleFlow</type>
- <packageName>org.drools.test</packageName>
- </process>
- <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="14"/>
- <id class="string">Action</id>
- <display>Action</display>
- <incompatible>false</incompatible>
- </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
- </descriptors>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- </target>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="13"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- <default>
- <descriptors id="50">
- <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="43"/>
- <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="51">
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="45"/>
- <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
- <id class="string">Action</id>
- <display>Action</display>
- <incompatible>false</incompatible>
- </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
- </descriptors>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- </entry>
- <entry>
- <string>4-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="38"/>
- </entry>
- <entry>
- <string>3-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="32"/>
- </entry>
- <entry>
- <string>1-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="25"/>
- </entry>
- </elements>
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="45"/>
- <routerLayout>2</routerLayout>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
-</org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rfm
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rfm 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,87 +0,0 @@
-<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
- <nodes id="2">
- <entry>
- <long>2</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl id="3">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="4">
- <dialect>mvel</dialect>
- <consequence>list.add( "mvel was here" )</consequence>
- </action>
- <id>2</id>
- <name>MVELAction</name>
- <incomingConnections id="5">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="7">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="8"/>
- <outgoingConnections id="9">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="3"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="10">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="11">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="3"/>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="12">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="13">
- <dialect>java</dialect>
- <consequence>list.add( "java was here" );</consequence>
- </action>
- <id>3</id>
- <name>JavaAction</name>
- <incomingConnections id="14">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="11"/>
- </incomingConnections>
- <outgoingConnections id="15">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="12"/>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="17">
- <id>4</id>
- <name>End</name>
- <incomingConnections id="18">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
- </incomingConnections>
- <outgoingConnections id="19"/>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </org.drools.ruleflow.core.impl.ActionNodeImpl>
- </entry>
- <entry>
- <long>4</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl reference="17"/>
- </entry>
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl reference="7"/>
- </entry>
- <entry>
- <long>3</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="12"/>
- </entry>
- </nodes>
- <variables id="20"/>
- <lastNodeId>4</lastNodeId>
- <imports id="21">
- <string>java.util.List</string>
- </imports>
- <globals id="22">
- <entry>
- <string>list</string>
- <string>List</string>
- </entry>
- </globals>
- <id>ActionDialects</id>
- <name>ActionDialects</name>
- <type>RuleFlow</type>
- <packageName>org.drools.test</packageName>
-</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects_old.rf (from rev 17569, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rf)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects_old.rf (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects_old.rf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,257 @@
+<org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper id="1" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+ <default>
+ <elements id="2">
+ <entry>
+ <string>2-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper id="3" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="4">
+ <x>105</x>
+ <y>78</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="5">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="6">
+ <dialect>mvel</dialect>
+ <consequence>list.add( "mvel was here" )</consequence>
+ </action>
+ <id>2</id>
+ <name>MVELAction</name>
+ <incomingConnections id="7">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="9">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="10"/>
+ <outgoingConnections id="11">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="12">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="13">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="14">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="15">
+ <dialect>java</dialect>
+ <consequence>list.add( "java was here" );</consequence>
+ </action>
+ <id>3</id>
+ <name>JavaAction</name>
+ <incomingConnections id="16">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="13"/>
+ </incomingConnections>
+ <outgoingConnections id="17">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="18">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="14"/>
+ <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="19">
+ <id>4</id>
+ <name>End</name>
+ <incomingConnections id="20">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="18"/>
+ </incomingConnections>
+ <outgoingConnections id="21"/>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </element>
+ <incomingConnections id="22">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="23" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="24"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="25" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="26">
+ <x>105</x>
+ <y>17</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="9"/>
+ <incomingConnections id="27"/>
+ <outgoingConnections id="28">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="23"/>
+ </outgoingConnections>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="8"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="29">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="30" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="31"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="3"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="32" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="33">
+ <x>105</x>
+ <y>149</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="14"/>
+ <incomingConnections id="34">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="30"/>
+ </incomingConnections>
+ <outgoingConnections id="35">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="36" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="37"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="32"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="38" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="39">
+ <x>104</x>
+ <y>217</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="19"/>
+ <incomingConnections id="40">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="36"/>
+ </incomingConnections>
+ <outgoingConnections id="41"/>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </target>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="18"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ <default>
+ <descriptors id="42">
+ <org.eclipse.ui.views.properties.TextPropertyDescriptor id="43">
+ <id class="string">Name</id>
+ <display>Name</display>
+ <incompatible>false</incompatible>
+ </org.eclipse.ui.views.properties.TextPropertyDescriptor>
+ <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="44">
+ <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="45">
+ <nodes id="46">
+ <entry>
+ <long>2</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="5"/>
+ </entry>
+ <entry>
+ <long>4</long>
+ <org.drools.ruleflow.core.impl.EndNodeImpl reference="19"/>
+ </entry>
+ <entry>
+ <long>1</long>
+ <org.drools.ruleflow.core.impl.StartNodeImpl reference="9"/>
+ </entry>
+ <entry>
+ <long>3</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="14"/>
+ </entry>
+ </nodes>
+ <variables id="47"/>
+ <lastNodeId>4</lastNodeId>
+ <imports id="48">
+ <string>java.util.List</string>
+ </imports>
+ <globals id="49">
+ <entry>
+ <string>list</string>
+ <string>List</string>
+ </entry>
+ </globals>
+ <id>ActionDialects</id>
+ <name>ActionDialects</name>
+ <type>RuleFlow</type>
+ <packageName>org.drools.test</packageName>
+ </process>
+ <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="14"/>
+ <id class="string">Action</id>
+ <display>Action</display>
+ <incompatible>false</incompatible>
+ </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+ </descriptors>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ </target>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="13"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ <default>
+ <descriptors id="50">
+ <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="43"/>
+ <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="51">
+ <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="45"/>
+ <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="5"/>
+ <id class="string">Action</id>
+ <display>Action</display>
+ <incompatible>false</incompatible>
+ </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+ </descriptors>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ </entry>
+ <entry>
+ <string>4-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="38"/>
+ </entry>
+ <entry>
+ <string>3-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="32"/>
+ </entry>
+ <entry>
+ <string>1-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="25"/>
+ </entry>
+ </elements>
+ <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="45"/>
+ <routerLayout>2</routerLayout>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+</org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects_old.rfm (from rev 17569, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects.rfm)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects_old.rfm (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ActionDialects_old.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,87 @@
+<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
+ <nodes id="2">
+ <entry>
+ <long>2</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl id="3">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="4">
+ <dialect>mvel</dialect>
+ <consequence>list.add( "mvel was here" )</consequence>
+ </action>
+ <id>2</id>
+ <name>MVELAction</name>
+ <incomingConnections id="5">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="6">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="7">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="8"/>
+ <outgoingConnections id="9">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="6"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="3"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="10">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="11">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="3"/>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="12">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="13">
+ <dialect>java</dialect>
+ <consequence>list.add( "java was here" );</consequence>
+ </action>
+ <id>3</id>
+ <name>JavaAction</name>
+ <incomingConnections id="14">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="11"/>
+ </incomingConnections>
+ <outgoingConnections id="15">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="16">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="12"/>
+ <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="17">
+ <id>4</id>
+ <name>End</name>
+ <incomingConnections id="18">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="16"/>
+ </incomingConnections>
+ <outgoingConnections id="19"/>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </org.drools.ruleflow.core.impl.ActionNodeImpl>
+ </entry>
+ <entry>
+ <long>4</long>
+ <org.drools.ruleflow.core.impl.EndNodeImpl reference="17"/>
+ </entry>
+ <entry>
+ <long>1</long>
+ <org.drools.ruleflow.core.impl.StartNodeImpl reference="7"/>
+ </entry>
+ <entry>
+ <long>3</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="12"/>
+ </entry>
+ </nodes>
+ <variables id="20"/>
+ <lastNodeId>4</lastNodeId>
+ <imports id="21">
+ <string>java.util.List</string>
+ </imports>
+ <globals id="22">
+ <entry>
+ <string>list</string>
+ <string>List</string>
+ </entry>
+ </globals>
+ <id>ActionDialects</id>
+ <name>ActionDialects</name>
+ <type>RuleFlow</type>
+ <packageName>org.drools.test</packageName>
+</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rf
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rf 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,628 +0,0 @@
-<org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper id="1" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
- <default>
- <elements id="2">
- <entry>
- <string>5-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.SplitWrapper id="3" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="4">
- <x>259</x>
- <y>112</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.SplitImpl" id="5">
- <type>3</type>
- <constraints id="6">
- <entry>
- <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="8">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="9">
- <dialect>java</dialect>
- <consequence>outList.add("JavaCodeConstraint was here");</consequence>
- </action>
- <id>7</id>
- <name>JavaCodeConstraintAction</name>
- <incomingConnections id="10">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
- </incomingConnections>
- <outgoingConnections id="11">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" id="13">
- <type>1</type>
- <id>10</id>
- <name>Join</name>
- <incomingConnections id="14">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="15">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="16">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="17">
- <dialect>mvel</dialect>
- <consequence>outList.add("MVELCodeConstraint was here");</consequence>
- </action>
- <id>6</id>
- <name>MVELCodeConstraintAction</name>
- <incomingConnections id="18">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="16"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="20">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
- <org.drools.ruleflow.core.impl.ConnectionImpl id="21">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="22">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="23">
- <dialect>mvel</dialect>
- <consequence>outList.add("MVELRuleConstraint was here");</consequence>
- </action>
- <id>8</id>
- <name>MVELRuleConstraintAction</name>
- <incomingConnections id="24">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="25">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="22"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="26">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="21"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="28">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="29">
- <dialect>java</dialect>
- <consequence>outList.add("JavaRuleConstraint was here");</consequence>
- </action>
- <id>9</id>
- <name>JavaRuleConstraintAction</name>
- <incomingConnections id="30">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="31">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="28"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="32">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="33">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="35">
- <id>4</id>
- <name>End</name>
- <incomingConnections id="36">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
- </incomingConnections>
- <outgoingConnections id="37"/>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- <org.drools.ruleflow.core.impl.ConstraintImpl id="38">
- <name>JavaCodeConstraint</name>
- <constraint>return inList.contains( 3 );</constraint>
- <priority>3</priority>
- <dialect>java</dialect>
- <type>eval</type>
- </org.drools.ruleflow.core.impl.ConstraintImpl>
- </entry>
- <entry>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
- <org.drools.ruleflow.core.impl.ConstraintImpl id="39">
- <name>JavaRuleConstraint</name>
- <constraint>list : List()
-eval( list.contains( 25 ) )</constraint>
- <priority>25</priority>
- <dialect>java</dialect>
- <type>rule</type>
- </org.drools.ruleflow.core.impl.ConstraintImpl>
- </entry>
- <entry>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="25"/>
- <org.drools.ruleflow.core.impl.ConstraintImpl id="40">
- <name>MVELRuleConstraint</name>
- <constraint>list : List()
-eval( list.contains( 6 ) )</constraint>
- <priority>6</priority>
- <dialect>mvel</dialect>
- <type>rule</type>
- </org.drools.ruleflow.core.impl.ConstraintImpl>
- </entry>
- <entry>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
- <org.drools.ruleflow.core.impl.ConstraintImpl id="41">
- <name>MVELCodeConstraint</name>
- <constraint>return inList.contains( 1 );</constraint>
- <priority>1</priority>
- <dialect>mvel</dialect>
- <type>eval</type>
- </org.drools.ruleflow.core.impl.ConstraintImpl>
- </entry>
- </constraints>
- <id>5</id>
- <name>Split</name>
- <incomingConnections id="42">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="43">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="44">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="45"/>
- <outgoingConnections id="46">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="43"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="47">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="25"/>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
- </outgoingConnections>
- </element>
- <incomingConnections id="48">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="49" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="50"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="51" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="52">
- <x>259</x>
- <y>12</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="44"/>
- <incomingConnections id="53"/>
- <outgoingConnections id="54">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="49"/>
- </outgoingConnections>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </source>
- <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="43"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </incomingConnections>
- <outgoingConnections id="55">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="56" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="57"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="58" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="59">
- <x>11</x>
- <y>279</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="16"/>
- <incomingConnections id="60">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="56"/>
- </incomingConnections>
- <outgoingConnections id="61">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="62" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="63"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="58"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="64" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="65">
- <x>259</x>
- <y>451</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
- <incomingConnections id="66">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="62"/>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="67" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="68"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="69" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="70">
- <x>193</x>
- <y>279</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
- <incomingConnections id="71">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="72" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="73"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="69"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </incomingConnections>
- <outgoingConnections id="74">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="67"/>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- <default>
- <descriptors id="75">
- <org.eclipse.ui.views.properties.TextPropertyDescriptor id="76">
- <id class="string">Name</id>
- <display>Name</display>
- <incompatible>false</incompatible>
- </org.eclipse.ui.views.properties.TextPropertyDescriptor>
- <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="77">
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="78">
- <nodes id="79">
- <entry>
- <long>4</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl reference="35"/>
- </entry>
- <entry>
- <long>8</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="22"/>
- </entry>
- <entry>
- <long>9</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="28"/>
- </entry>
- <entry>
- <long>6</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="16"/>
- </entry>
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl reference="44"/>
- </entry>
- <entry>
- <long>7</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="8"/>
- </entry>
- <entry>
- <long>10</long>
- <org.drools.ruleflow.core.impl.JoinImpl reference="13"/>
- </entry>
- <entry>
- <long>5</long>
- <org.drools.ruleflow.core.impl.SplitImpl reference="5"/>
- </entry>
- </nodes>
- <variables id="80"/>
- <lastNodeId>10</lastNodeId>
- <imports id="81">
- <string>java.util.List</string>
- </imports>
- <globals id="82">
- <entry>
- <string>inList</string>
- <string>List</string>
- </entry>
- <entry>
- <string>outList</string>
- <string>List</string>
- </entry>
- </globals>
- <id>ConstraintDialects</id>
- <name>ConstraintDialects</name>
- <type>RuleFlow</type>
- <packageName>org.drools.test</packageName>
- </process>
- <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
- <id class="string">Action</id>
- <display>Action</display>
- <incompatible>false</incompatible>
- </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
- </descriptors>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- </source>
- <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="64"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="12"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="83" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="84"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="85" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="86">
- <x>327</x>
- <y>279</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="22"/>
- <incomingConnections id="87">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="88" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="89"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="85"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="25"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </incomingConnections>
- <outgoingConnections id="90">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="83"/>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- <default>
- <descriptors id="91">
- <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="76"/>
- <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="92">
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="78"/>
- <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="22"/>
- <id class="string">Action</id>
- <display>Action</display>
- <incompatible>false</incompatible>
- </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
- </descriptors>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- </source>
- <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="64"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="21"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="93" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="94"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="95" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="96">
- <x>505</x>
- <y>279</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="28"/>
- <incomingConnections id="97">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="98" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="99"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="95"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="31"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </incomingConnections>
- <outgoingConnections id="100">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="93"/>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- <default>
- <descriptors id="101">
- <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="76"/>
- <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="102">
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="78"/>
- <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="28"/>
- <id class="string">Action</id>
- <display>Action</display>
- <incompatible>false</incompatible>
- </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
- </descriptors>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- </source>
- <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="64"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="27"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </incomingConnections>
- <outgoingConnections id="103">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="104" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="105"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="64"/>
- <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="106" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="107">
- <x>259</x>
- <y>556</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="35"/>
- <incomingConnections id="108">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="104"/>
- </incomingConnections>
- <outgoingConnections id="109"/>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </target>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="34"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </target>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="15"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- <default>
- <descriptors id="110">
- <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="76"/>
- <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="111">
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="78"/>
- <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="16"/>
- <id class="string">Action</id>
- <display>Action</display>
- <incompatible>false</incompatible>
- </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
- </descriptors>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
- </target>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="19"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="72"/>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="88"/>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="98"/>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
- <default/>
- </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
- </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
- </entry>
- <entry>
- <string>9-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="95"/>
- </entry>
- <entry>
- <string>7-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="69"/>
- </entry>
- <entry>
- <string>4-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="106"/>
- </entry>
- <entry>
- <string>6-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="58"/>
- </entry>
- <entry>
- <string>10-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="64"/>
- </entry>
- <entry>
- <string>1-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="51"/>
- </entry>
- <entry>
- <string>8-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="85"/>
- </entry>
- </elements>
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="78"/>
- <routerLayout>2</routerLayout>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
-</org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rfm
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rfm 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,231 +0,0 @@
-<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
- <nodes id="2">
- <entry>
- <long>4</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl id="3">
- <id>4</id>
- <name>End</name>
- <incomingConnections id="4">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.JoinImpl" id="6">
- <type>1</type>
- <id>10</id>
- <name>Join</name>
- <incomingConnections id="7">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="9">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="10">
- <dialect>mvel</dialect>
- <consequence>outList.add("MVELCodeConstraint was here");</consequence>
- </action>
- <id>6</id>
- <name>MVELCodeConstraintAction</name>
- <incomingConnections id="11">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" id="13">
- <type>3</type>
- <constraints id="14">
- <entry>
- <org.drools.ruleflow.core.impl.ConnectionImpl id="15">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="16">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="17">
- <dialect>java</dialect>
- <consequence>outList.add("JavaCodeConstraint was here");</consequence>
- </action>
- <id>7</id>
- <name>JavaCodeConstraintAction</name>
- <incomingConnections id="18">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
- </incomingConnections>
- <outgoingConnections id="19">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="20">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="16"/>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- <org.drools.ruleflow.core.impl.ConstraintImpl id="21">
- <name>JavaCodeConstraint</name>
- <constraint>return inList.contains( 3 );</constraint>
- <priority>3</priority>
- <dialect>java</dialect>
- <type>code</type>
- </org.drools.ruleflow.core.impl.ConstraintImpl>
- </entry>
- <entry>
- <org.drools.ruleflow.core.impl.ConnectionImpl id="22">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="23">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="24">
- <dialect>java</dialect>
- <consequence>outList.add("JavaRuleConstraint was here");</consequence>
- </action>
- <id>9</id>
- <name>JavaRuleConstraintAction</name>
- <incomingConnections id="25">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
- </incomingConnections>
- <outgoingConnections id="26">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="23"/>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- <org.drools.ruleflow.core.impl.ConstraintImpl id="28">
- <name>JavaRuleConstraint</name>
- <constraint>list : List()
-eval( list.contains( 25 ) )</constraint>
- <priority>25</priority>
- <dialect>java</dialect>
- <type>rule</type>
- </org.drools.ruleflow.core.impl.ConstraintImpl>
- </entry>
- <entry>
- <org.drools.ruleflow.core.impl.ConnectionImpl id="29">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="30">
- <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="31">
- <dialect>mvel</dialect>
- <consequence>outList.add("MVELRuleConstraint was here");</consequence>
- </action>
- <id>8</id>
- <name>MVELRuleConstraintAction</name>
- <incomingConnections id="32">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="29"/>
- </incomingConnections>
- <outgoingConnections id="33">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="30"/>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </outgoingConnections>
- </to>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- <org.drools.ruleflow.core.impl.ConstraintImpl id="35">
- <name>MVELRuleConstraint</name>
- <constraint>list : List()
-eval( list.contains( 6 ) )</constraint>
- <priority>6</priority>
- <dialect>mvel</dialect>
- <type>rule</type>
- </org.drools.ruleflow.core.impl.ConstraintImpl>
- </entry>
- <entry>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
- <org.drools.ruleflow.core.impl.ConstraintImpl id="36">
- <name>MVELCodeConstraint</name>
- <constraint>return inList.contains( 1 );</constraint>
- <priority>1</priority>
- <dialect>mvel</dialect>
- <type>code</type>
- </org.drools.ruleflow.core.impl.ConstraintImpl>
- </entry>
- </constraints>
- <id>5</id>
- <name>Split</name>
- <incomingConnections id="37">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="38">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="39">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="40"/>
- <outgoingConnections id="41">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="38"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="42">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="29"/>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="9"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="43">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
- </incomingConnections>
- <outgoingConnections id="44">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="3"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="45"/>
- </org.drools.ruleflow.core.impl.EndNodeImpl>
- </entry>
- <entry>
- <long>8</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="30"/>
- </entry>
- <entry>
- <long>9</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="23"/>
- </entry>
- <entry>
- <long>6</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="9"/>
- </entry>
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl reference="39"/>
- </entry>
- <entry>
- <long>7</long>
- <org.drools.ruleflow.core.impl.ActionNodeImpl reference="16"/>
- </entry>
- <entry>
- <long>10</long>
- <org.drools.ruleflow.core.impl.JoinImpl reference="6"/>
- </entry>
- <entry>
- <long>5</long>
- <org.drools.ruleflow.core.impl.SplitImpl reference="13"/>
- </entry>
- </nodes>
- <variables id="46"/>
- <lastNodeId>10</lastNodeId>
- <imports id="47">
- <string>java.util.List</string>
- </imports>
- <globals id="48">
- <entry>
- <string>inList</string>
- <string>List</string>
- </entry>
- <entry>
- <string>outList</string>
- <string>List</string>
- </entry>
- </globals>
- <id>ConstraintDialects</id>
- <name>ConstraintDialects</name>
- <type>RuleFlow</type>
- <packageName>org.drools.test</packageName>
-</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects_old.rf (from rev 17569, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rf)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects_old.rf (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects_old.rf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,628 @@
+<org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper id="1" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+ <default>
+ <elements id="2">
+ <entry>
+ <string>5-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.SplitWrapper id="3" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="4">
+ <x>259</x>
+ <y>112</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.SplitImpl" id="5">
+ <type>3</type>
+ <constraints id="6">
+ <entry>
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="8">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="9">
+ <dialect>java</dialect>
+ <consequence>outList.add("JavaCodeConstraint was here");</consequence>
+ </action>
+ <id>7</id>
+ <name>JavaCodeConstraintAction</name>
+ <incomingConnections id="10">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
+ </incomingConnections>
+ <outgoingConnections id="11">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" id="13">
+ <type>1</type>
+ <id>10</id>
+ <name>Join</name>
+ <incomingConnections id="14">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="15">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="16">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="17">
+ <dialect>mvel</dialect>
+ <consequence>outList.add("MVELCodeConstraint was here");</consequence>
+ </action>
+ <id>6</id>
+ <name>MVELCodeConstraintAction</name>
+ <incomingConnections id="18">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="19">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="16"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="20">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="21">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="22">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="23">
+ <dialect>mvel</dialect>
+ <consequence>outList.add("MVELRuleConstraint was here");</consequence>
+ </action>
+ <id>8</id>
+ <name>MVELRuleConstraintAction</name>
+ <incomingConnections id="24">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="25">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="22"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="26">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="21"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="28">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="29">
+ <dialect>java</dialect>
+ <consequence>outList.add("JavaRuleConstraint was here");</consequence>
+ </action>
+ <id>9</id>
+ <name>JavaRuleConstraintAction</name>
+ <incomingConnections id="30">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="31">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="28"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="32">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="33">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
+ <to class="org.drools.ruleflow.core.impl.EndNodeImpl" id="35">
+ <id>4</id>
+ <name>End</name>
+ <incomingConnections id="36">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
+ </incomingConnections>
+ <outgoingConnections id="37"/>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ <org.drools.ruleflow.core.impl.ConstraintImpl id="38">
+ <name>JavaCodeConstraint</name>
+ <constraint>return inList.contains( 3 );</constraint>
+ <priority>3</priority>
+ <dialect>java</dialect>
+ <type>eval</type>
+ </org.drools.ruleflow.core.impl.ConstraintImpl>
+ </entry>
+ <entry>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
+ <org.drools.ruleflow.core.impl.ConstraintImpl id="39">
+ <name>JavaRuleConstraint</name>
+ <constraint>list : List()
+eval( list.contains( 25 ) )</constraint>
+ <priority>25</priority>
+ <dialect>java</dialect>
+ <type>rule</type>
+ </org.drools.ruleflow.core.impl.ConstraintImpl>
+ </entry>
+ <entry>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="25"/>
+ <org.drools.ruleflow.core.impl.ConstraintImpl id="40">
+ <name>MVELRuleConstraint</name>
+ <constraint>list : List()
+eval( list.contains( 6 ) )</constraint>
+ <priority>6</priority>
+ <dialect>mvel</dialect>
+ <type>rule</type>
+ </org.drools.ruleflow.core.impl.ConstraintImpl>
+ </entry>
+ <entry>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
+ <org.drools.ruleflow.core.impl.ConstraintImpl id="41">
+ <name>MVELCodeConstraint</name>
+ <constraint>return inList.contains( 1 );</constraint>
+ <priority>1</priority>
+ <dialect>mvel</dialect>
+ <type>eval</type>
+ </org.drools.ruleflow.core.impl.ConstraintImpl>
+ </entry>
+ </constraints>
+ <id>5</id>
+ <name>Split</name>
+ <incomingConnections id="42">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="43">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="44">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="45"/>
+ <outgoingConnections id="46">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="43"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="5"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="47">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="19"/>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="25"/>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="31"/>
+ </outgoingConnections>
+ </element>
+ <incomingConnections id="48">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="49" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="50"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="51" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="52">
+ <x>259</x>
+ <y>12</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="44"/>
+ <incomingConnections id="53"/>
+ <outgoingConnections id="54">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="49"/>
+ </outgoingConnections>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="43"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="55">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="56" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="57"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="58" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="59">
+ <x>11</x>
+ <y>279</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="16"/>
+ <incomingConnections id="60">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="56"/>
+ </incomingConnections>
+ <outgoingConnections id="61">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="62" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="63"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="58"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" id="64" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="65">
+ <x>259</x>
+ <y>451</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.JoinImpl" reference="13"/>
+ <incomingConnections id="66">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="62"/>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="67" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="68"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="69" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="70">
+ <x>193</x>
+ <y>279</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
+ <incomingConnections id="71">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="72" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="73"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="69"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="74">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="67"/>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ <default>
+ <descriptors id="75">
+ <org.eclipse.ui.views.properties.TextPropertyDescriptor id="76">
+ <id class="string">Name</id>
+ <display>Name</display>
+ <incompatible>false</incompatible>
+ </org.eclipse.ui.views.properties.TextPropertyDescriptor>
+ <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="77">
+ <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="78">
+ <nodes id="79">
+ <entry>
+ <long>4</long>
+ <org.drools.ruleflow.core.impl.EndNodeImpl reference="35"/>
+ </entry>
+ <entry>
+ <long>8</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="22"/>
+ </entry>
+ <entry>
+ <long>9</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="28"/>
+ </entry>
+ <entry>
+ <long>6</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="16"/>
+ </entry>
+ <entry>
+ <long>1</long>
+ <org.drools.ruleflow.core.impl.StartNodeImpl reference="44"/>
+ </entry>
+ <entry>
+ <long>7</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="8"/>
+ </entry>
+ <entry>
+ <long>10</long>
+ <org.drools.ruleflow.core.impl.JoinImpl reference="13"/>
+ </entry>
+ <entry>
+ <long>5</long>
+ <org.drools.ruleflow.core.impl.SplitImpl reference="5"/>
+ </entry>
+ </nodes>
+ <variables id="80"/>
+ <lastNodeId>10</lastNodeId>
+ <imports id="81">
+ <string>java.util.List</string>
+ </imports>
+ <globals id="82">
+ <entry>
+ <string>inList</string>
+ <string>List</string>
+ </entry>
+ <entry>
+ <string>outList</string>
+ <string>List</string>
+ </entry>
+ </globals>
+ <id>ConstraintDialects</id>
+ <name>ConstraintDialects</name>
+ <type>RuleFlow</type>
+ <packageName>org.drools.test</packageName>
+ </process>
+ <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="8"/>
+ <id class="string">Action</id>
+ <display>Action</display>
+ <incompatible>false</incompatible>
+ </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+ </descriptors>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="64"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="12"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="83" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="84"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="85" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="86">
+ <x>327</x>
+ <y>279</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="22"/>
+ <incomingConnections id="87">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="88" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="89"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="85"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="25"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="90">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="83"/>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ <default>
+ <descriptors id="91">
+ <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="76"/>
+ <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="92">
+ <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="78"/>
+ <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="22"/>
+ <id class="string">Action</id>
+ <display>Action</display>
+ <incompatible>false</incompatible>
+ </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+ </descriptors>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="64"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="21"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="93" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="94"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" id="95" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="96">
+ <x>505</x>
+ <y>279</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="28"/>
+ <incomingConnections id="97">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="98" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="99"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.SplitWrapper" reference="3"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.ActionWrapper" reference="95"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="31"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="100">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="93"/>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ <default>
+ <descriptors id="101">
+ <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="76"/>
+ <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="102">
+ <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="78"/>
+ <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="28"/>
+ <id class="string">Action</id>
+ <display>Action</display>
+ <incompatible>false</incompatible>
+ </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+ </descriptors>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="64"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="27"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="103">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="104" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="105"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.JoinWrapper" reference="64"/>
+ <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" id="106" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="107">
+ <x>259</x>
+ <y>556</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="35"/>
+ <incomingConnections id="108">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="104"/>
+ </incomingConnections>
+ <outgoingConnections id="109"/>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </target>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="34"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </target>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="15"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ <default>
+ <descriptors id="110">
+ <org.eclipse.ui.views.properties.TextPropertyDescriptor reference="76"/>
+ <org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor id="111">
+ <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="78"/>
+ <actionNode class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="16"/>
+ <id class="string">Action</id>
+ <display>Action</display>
+ <incompatible>false</incompatible>
+ </org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor>
+ </descriptors>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ActionWrapper>
+ </target>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="19"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="72"/>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="88"/>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="98"/>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+ <default/>
+ </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.SplitWrapper>
+ </entry>
+ <entry>
+ <string>9-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="95"/>
+ </entry>
+ <entry>
+ <string>7-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="69"/>
+ </entry>
+ <entry>
+ <string>4-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper reference="106"/>
+ </entry>
+ <entry>
+ <string>6-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="58"/>
+ </entry>
+ <entry>
+ <string>10-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.JoinWrapper reference="64"/>
+ </entry>
+ <entry>
+ <string>1-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="51"/>
+ </entry>
+ <entry>
+ <string>8-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.ActionWrapper reference="85"/>
+ </entry>
+ </elements>
+ <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" reference="78"/>
+ <routerLayout>2</routerLayout>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+</org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects_old.rfm (from rev 17569, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects.rfm)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects_old.rfm (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ConstraintDialects_old.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,231 @@
+<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
+ <nodes id="2">
+ <entry>
+ <long>4</long>
+ <org.drools.ruleflow.core.impl.EndNodeImpl id="3">
+ <id>4</id>
+ <name>End</name>
+ <incomingConnections id="4">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.JoinImpl" id="6">
+ <type>1</type>
+ <id>10</id>
+ <name>Join</name>
+ <incomingConnections id="7">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="9">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="10">
+ <dialect>mvel</dialect>
+ <consequence>outList.add("MVELCodeConstraint was here");</consequence>
+ </action>
+ <id>6</id>
+ <name>MVELCodeConstraintAction</name>
+ <incomingConnections id="11">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="12">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" id="13">
+ <type>3</type>
+ <constraints id="14">
+ <entry>
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="15">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="16">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="17">
+ <dialect>java</dialect>
+ <consequence>outList.add("JavaCodeConstraint was here");</consequence>
+ </action>
+ <id>7</id>
+ <name>JavaCodeConstraintAction</name>
+ <incomingConnections id="18">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
+ </incomingConnections>
+ <outgoingConnections id="19">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="20">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="16"/>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ <org.drools.ruleflow.core.impl.ConstraintImpl id="21">
+ <name>JavaCodeConstraint</name>
+ <constraint>return inList.contains( 3 );</constraint>
+ <priority>3</priority>
+ <dialect>java</dialect>
+ <type>code</type>
+ </org.drools.ruleflow.core.impl.ConstraintImpl>
+ </entry>
+ <entry>
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="22">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="23">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="24">
+ <dialect>java</dialect>
+ <consequence>outList.add("JavaRuleConstraint was here");</consequence>
+ </action>
+ <id>9</id>
+ <name>JavaRuleConstraintAction</name>
+ <incomingConnections id="25">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
+ </incomingConnections>
+ <outgoingConnections id="26">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="27">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="23"/>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ <org.drools.ruleflow.core.impl.ConstraintImpl id="28">
+ <name>JavaRuleConstraint</name>
+ <constraint>list : List()
+eval( list.contains( 25 ) )</constraint>
+ <priority>25</priority>
+ <dialect>java</dialect>
+ <type>rule</type>
+ </org.drools.ruleflow.core.impl.ConstraintImpl>
+ </entry>
+ <entry>
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="29">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" id="30">
+ <action class="org.drools.ruleflow.core.impl.DroolsConsequenceAction" id="31">
+ <dialect>mvel</dialect>
+ <consequence>outList.add("MVELRuleConstraint was here");</consequence>
+ </action>
+ <id>8</id>
+ <name>MVELRuleConstraintAction</name>
+ <incomingConnections id="32">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="29"/>
+ </incomingConnections>
+ <outgoingConnections id="33">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="34">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="30"/>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </outgoingConnections>
+ </to>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ <org.drools.ruleflow.core.impl.ConstraintImpl id="35">
+ <name>MVELRuleConstraint</name>
+ <constraint>list : List()
+eval( list.contains( 6 ) )</constraint>
+ <priority>6</priority>
+ <dialect>mvel</dialect>
+ <type>rule</type>
+ </org.drools.ruleflow.core.impl.ConstraintImpl>
+ </entry>
+ <entry>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
+ <org.drools.ruleflow.core.impl.ConstraintImpl id="36">
+ <name>MVELCodeConstraint</name>
+ <constraint>return inList.contains( 1 );</constraint>
+ <priority>1</priority>
+ <dialect>mvel</dialect>
+ <type>code</type>
+ </org.drools.ruleflow.core.impl.ConstraintImpl>
+ </entry>
+ </constraints>
+ <id>5</id>
+ <name>Split</name>
+ <incomingConnections id="37">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="38">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="39">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="40"/>
+ <outgoingConnections id="41">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="38"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.SplitImpl" reference="13"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="42">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="12"/>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="15"/>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="29"/>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="22"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.ActionNodeImpl" reference="9"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="43">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.JoinImpl" reference="6"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="20"/>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="34"/>
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="27"/>
+ </incomingConnections>
+ <outgoingConnections id="44">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="3"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="45"/>
+ </org.drools.ruleflow.core.impl.EndNodeImpl>
+ </entry>
+ <entry>
+ <long>8</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="30"/>
+ </entry>
+ <entry>
+ <long>9</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="23"/>
+ </entry>
+ <entry>
+ <long>6</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="9"/>
+ </entry>
+ <entry>
+ <long>1</long>
+ <org.drools.ruleflow.core.impl.StartNodeImpl reference="39"/>
+ </entry>
+ <entry>
+ <long>7</long>
+ <org.drools.ruleflow.core.impl.ActionNodeImpl reference="16"/>
+ </entry>
+ <entry>
+ <long>10</long>
+ <org.drools.ruleflow.core.impl.JoinImpl reference="6"/>
+ </entry>
+ <entry>
+ <long>5</long>
+ <org.drools.ruleflow.core.impl.SplitImpl reference="13"/>
+ </entry>
+ </nodes>
+ <variables id="46"/>
+ <lastNodeId>10</lastNodeId>
+ <imports id="47">
+ <string>java.util.List</string>
+ </imports>
+ <globals id="48">
+ <entry>
+ <string>inList</string>
+ <string>List</string>
+ </entry>
+ <entry>
+ <string>outList</string>
+ <string>List</string>
+ </entry>
+ </globals>
+ <id>ConstraintDialects</id>
+ <name>ConstraintDialects</name>
+ <type>RuleFlow</type>
+ <packageName>org.drools.test</packageName>
+</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rf
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rf 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,154 +0,0 @@
-<org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper id="1" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
- <default>
- <elements id="2">
- <entry>
- <string>2-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper id="3" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="4">
- <x>530</x>
- <y>111</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.EndNodeImpl" id="5">
- <id>2</id>
- <name>End</name>
- <incomingConnections id="6">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="8">
- <ruleFlowGroup>flowgroup-1</ruleFlowGroup>
- <id>3</id>
- <name>flowgroup-1</name>
- <incomingConnections id="9">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="11">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="12"/>
- <outgoingConnections id="13">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="14">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="5"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="15"/>
- </element>
- <incomingConnections id="16">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="17" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="18"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="19" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="20">
- <x>297</x>
- <y>112</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
- <incomingConnections id="21">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="22" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <default>
- <type>1</type>
- <bendpoints id="23"/>
- <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="24" serialization="custom">
- <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- <default>
- <constraint id="25">
- <x>100</x>
- <y>100</y>
- <width>80</width>
- <height>40</height>
- </constraint>
- <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="11"/>
- <incomingConnections id="26"/>
- <outgoingConnections id="27">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="22"/>
- </outgoingConnections>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </source>
- <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="19"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="10"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </incomingConnections>
- <outgoingConnections id="28">
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="17"/>
- </outgoingConnections>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </source>
- <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" reference="3"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ElementConnection>
- <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- <default>
- <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
- </default>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
- </incomingConnections>
- <outgoingConnections id="29"/>
- <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
- </default>
- </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
- </org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper>
- </entry>
- <entry>
- <string>3-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="19"/>
- </entry>
- <entry>
- <string>1-Wrapper</string>
- <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="24"/>
- </entry>
- </elements>
- <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="30">
- <nodes id="31">
- <entry>
- <long>2</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl reference="5"/>
- </entry>
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl reference="11"/>
- </entry>
- <entry>
- <long>3</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="8"/>
- </entry>
- </nodes>
- <variables id="32"/>
- <lastNodeId>3</lastNodeId>
- <id>ruleFlowClear</id>
- <name>test_ruleflowClear</name>
- <type>RuleFlow</type>
- </process>
- <routerLayout>2</routerLayout>
- </default>
- </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
-</org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper>
\ No newline at end of file
Deleted: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rfm
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rfm 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,54 +0,0 @@
-<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
- <nodes id="2">
- <entry>
- <long>2</long>
- <org.drools.ruleflow.core.impl.EndNodeImpl id="3">
- <id>2</id>
- <name>End</name>
- <incomingConnections id="4">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="6">
- <ruleFlowGroup>flowgroup-1</ruleFlowGroup>
- <id>3</id>
- <name>flowgroup-1</name>
- <incomingConnections id="7">
- <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
- <type>1</type>
- <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="9">
- <id>1</id>
- <name>Start</name>
- <incomingConnections id="10"/>
- <outgoingConnections id="11">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="6"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="12">
- <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
- </outgoingConnections>
- </from>
- <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="3"/>
- </org.drools.ruleflow.core.impl.ConnectionImpl>
- </incomingConnections>
- <outgoingConnections id="13"/>
- </org.drools.ruleflow.core.impl.EndNodeImpl>
- </entry>
- <entry>
- <long>1</long>
- <org.drools.ruleflow.core.impl.StartNodeImpl reference="9"/>
- </entry>
- <entry>
- <long>3</long>
- <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="6"/>
- </entry>
- </nodes>
- <variables id="14"/>
- <lastNodeId>3</lastNodeId>
- <id>ruleFlowClear</id>
- <name>test_ruleflowClear</name>
- <type>RuleFlow</type>
- <packageName>com.sample</packageName>
-</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear_old.rf (from rev 17569, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rf)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear_old.rf (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear_old.rf 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,154 @@
+<org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper id="1" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+ <default>
+ <elements id="2">
+ <entry>
+ <string>2-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper id="3" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="4">
+ <x>530</x>
+ <y>111</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.EndNodeImpl" id="5">
+ <id>2</id>
+ <name>End</name>
+ <incomingConnections id="6">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="7">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="8">
+ <ruleFlowGroup>flowgroup-1</ruleFlowGroup>
+ <id>3</id>
+ <name>flowgroup-1</name>
+ <incomingConnections id="9">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="10">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="11">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="12"/>
+ <outgoingConnections id="13">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="10"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="14">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="7"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="5"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="15"/>
+ </element>
+ <incomingConnections id="16">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="17" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="18"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" id="19" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="20">
+ <x>297</x>
+ <y>112</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="8"/>
+ <incomingConnections id="21">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper id="22" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <default>
+ <type>1</type>
+ <bendpoints id="23"/>
+ <source class="org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper" id="24" serialization="custom">
+ <org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ <default>
+ <constraint id="25">
+ <x>100</x>
+ <y>100</y>
+ <width>80</width>
+ <height>40</height>
+ </constraint>
+ <element class="org.drools.ruleflow.core.impl.StartNodeImpl" reference="11"/>
+ <incomingConnections id="26"/>
+ <outgoingConnections id="27">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="22"/>
+ </outgoingConnections>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper" reference="19"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="10"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="28">
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper reference="17"/>
+ </outgoingConnections>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </source>
+ <target class="org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper" reference="3"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ElementConnection>
+ <org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ <default>
+ <connection class="org.drools.ruleflow.core.impl.ConnectionImpl" reference="7"/>
+ </default>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.ConnectionWrapper>
+ </incomingConnections>
+ <outgoingConnections id="29"/>
+ <parent class="org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper" reference="1"/>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper>
+ </org.drools.eclipse.flow.ruleflow.core.EndNodeWrapper>
+ </entry>
+ <entry>
+ <string>3-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.RuleSetNodeWrapper reference="19"/>
+ </entry>
+ <entry>
+ <string>1-Wrapper</string>
+ <org.drools.eclipse.flow.ruleflow.core.StartNodeWrapper reference="24"/>
+ </entry>
+ </elements>
+ <process class="org.drools.ruleflow.core.impl.RuleFlowProcessImpl" id="30">
+ <nodes id="31">
+ <entry>
+ <long>2</long>
+ <org.drools.ruleflow.core.impl.EndNodeImpl reference="5"/>
+ </entry>
+ <entry>
+ <long>1</long>
+ <org.drools.ruleflow.core.impl.StartNodeImpl reference="11"/>
+ </entry>
+ <entry>
+ <long>3</long>
+ <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="8"/>
+ </entry>
+ </nodes>
+ <variables id="32"/>
+ <lastNodeId>3</lastNodeId>
+ <id>ruleFlowClear</id>
+ <name>test_ruleflowClear</name>
+ <type>RuleFlow</type>
+ </process>
+ <routerLayout>2</routerLayout>
+ </default>
+ </org.drools.eclipse.flow.common.editor.core.ProcessWrapper>
+</org.drools.eclipse.flow.ruleflow.core.RuleFlowProcessWrapper>
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear_old.rfm (from rev 17569, labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear.rfm)
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear_old.rfm (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ruleflowClear_old.rfm 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,54 @@
+<org.drools.ruleflow.core.impl.RuleFlowProcessImpl id="1">
+ <nodes id="2">
+ <entry>
+ <long>2</long>
+ <org.drools.ruleflow.core.impl.EndNodeImpl id="3">
+ <id>2</id>
+ <name>End</name>
+ <incomingConnections id="4">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="5">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" id="6">
+ <ruleFlowGroup>flowgroup-1</ruleFlowGroup>
+ <id>3</id>
+ <name>flowgroup-1</name>
+ <incomingConnections id="7">
+ <org.drools.ruleflow.core.impl.ConnectionImpl id="8">
+ <type>1</type>
+ <from class="org.drools.ruleflow.core.impl.StartNodeImpl" id="9">
+ <id>1</id>
+ <name>Start</name>
+ <incomingConnections id="10"/>
+ <outgoingConnections id="11">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="8"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.RuleSetNodeImpl" reference="6"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="12">
+ <org.drools.ruleflow.core.impl.ConnectionImpl reference="5"/>
+ </outgoingConnections>
+ </from>
+ <to class="org.drools.ruleflow.core.impl.EndNodeImpl" reference="3"/>
+ </org.drools.ruleflow.core.impl.ConnectionImpl>
+ </incomingConnections>
+ <outgoingConnections id="13"/>
+ </org.drools.ruleflow.core.impl.EndNodeImpl>
+ </entry>
+ <entry>
+ <long>1</long>
+ <org.drools.ruleflow.core.impl.StartNodeImpl reference="9"/>
+ </entry>
+ <entry>
+ <long>3</long>
+ <org.drools.ruleflow.core.impl.RuleSetNodeImpl reference="6"/>
+ </entry>
+ </nodes>
+ <variables id="14"/>
+ <lastNodeId>3</lastNodeId>
+ <id>ruleFlowClear</id>
+ <name>test_ruleflowClear</name>
+ <type>RuleFlow</type>
+ <packageName>com.sample</packageName>
+</org.drools.ruleflow.core.impl.RuleFlowProcessImpl>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/XmlDslTest.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/XmlDslTest.xml 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/XmlDslTest.xml 2008-01-09 01:25:37 UTC (rev 17635)
@@ -2,7 +2,7 @@
xmlns:mydsl="http://domain/org/mydsl"
xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:schemaLocation="http://drools.org/drools-4.0/process drools-processes-4.0.xsd"
- name="process name" id="process name" package-name="org.domain" >
+ name="process name" id="process name" type="RuleFlow" package-name="org.domain" >
<header>
<imports>
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/XmlTest.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/XmlTest.xml (rev 0)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/XmlTest.xml 2008-01-09 01:25:37 UTC (rev 17635)
@@ -0,0 +1,29 @@
+<process xmlns="http://drools.org/drools-4.0/process"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="http://drools.org/drools-4.0/process drools-processes-4.0.xsd"
+ name="process name" id="process name" package-name="org.domain" >
+
+ <header>
+ <imports>
+ <import name="java.util.List" />
+ </imports>
+
+ <globals>
+ <global identifier="list" type="List" />
+ </globals>
+ </header>
+
+ <nodes>
+ <start name="start node" />
+
+ <action name="action node" dialect="java">list.add( "action node was here" );</action>
+
+ <end name="end node" />
+ </nodes>
+
+ <connections>
+ <connection from="start node" to="action node" />
+ <connection from="action node" to="end node" />
+ </connections>
+
+</process>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/processes/ActionNodeTest.xml
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/processes/ActionNodeTest.xml 2008-01-08 19:22:16 UTC (rev 17634)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/xml/processes/ActionNodeTest.xml 2008-01-09 01:25:37 UTC (rev 17635)
@@ -1,7 +1,7 @@
<process xmlns="http://drools.org/drools-4.0/process"
xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:schemaLocation="http://drools.org/drools-4.0/process drools-processes-4.0.xsd"
- name="process name" id="process name" package-name="org.domain" >
+ name="process name" id="process name" type="RuleFlow" package-name="org.domain" >
<header>
<imports>
<import name="java.util.List" />
More information about the jboss-svn-commits
mailing list