[jboss-svn-commits] JBL Code SVN: r36380 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server: contenthandler and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: KrisVerlaenen
Date: 2010-12-12 11:50:15 -0500 (Sun, 12 Dec 2010)
New Revision: 36380

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java
Log:
JBRULES-2827: Migrate Drools Flow to jBPM5
 - migrating

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java	2010-12-12 15:04:27 UTC (rev 36379)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/BRMSPackageBuilder.java	2010-12-12 16:50:15 UTC (rev 36380)
@@ -46,7 +46,6 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 
-import org.drools.bpmn2.xml.BPMNSemanticModule;
 import org.drools.compiler.PackageBuilder;
 import org.drools.compiler.PackageBuilderConfiguration;
 import org.drools.guvnor.client.common.AssetFormats;
@@ -60,6 +59,7 @@
 import org.drools.repository.RulesRepositoryException;
 import org.drools.rule.MapBackedClassLoader;
 import org.drools.util.ChainedProperties;
+import org.jbpm.bpmn2.xml.BPMNSemanticModule;
 
 /**
  * This decorates the drools-compiler PackageBuilder

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java	2010-12-12 15:04:27 UTC (rev 36379)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java	2010-12-12 16:50:15 UTC (rev 36380)
@@ -31,24 +31,24 @@
 import org.drools.guvnor.client.rulefloweditor.TransferNode;
 import org.drools.guvnor.client.rulefloweditor.WorkItemTransferNode;
 import org.drools.process.core.Work;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.impl.ConnectionRef;
-import org.drools.workflow.core.node.ActionNode;
-import org.drools.workflow.core.node.CompositeNode;
-import org.drools.workflow.core.node.EndNode;
-import org.drools.workflow.core.node.EventNode;
-import org.drools.workflow.core.node.FaultNode;
-import org.drools.workflow.core.node.ForEachNode;
-import org.drools.workflow.core.node.HumanTaskNode;
-import org.drools.workflow.core.node.Join;
-import org.drools.workflow.core.node.MilestoneNode;
-import org.drools.workflow.core.node.RuleSetNode;
-import org.drools.workflow.core.node.Split;
-import org.drools.workflow.core.node.StartNode;
-import org.drools.workflow.core.node.SubProcessNode;
-import org.drools.workflow.core.node.TimerNode;
-import org.drools.workflow.core.node.WorkItemNode;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
+import org.jbpm.workflow.core.Constraint;
+import org.jbpm.workflow.core.impl.ConnectionRef;
+import org.jbpm.workflow.core.node.ActionNode;
+import org.jbpm.workflow.core.node.CompositeNode;
+import org.jbpm.workflow.core.node.EndNode;
+import org.jbpm.workflow.core.node.EventNode;
+import org.jbpm.workflow.core.node.FaultNode;
+import org.jbpm.workflow.core.node.ForEachNode;
+import org.jbpm.workflow.core.node.HumanTaskNode;
+import org.jbpm.workflow.core.node.Join;
+import org.jbpm.workflow.core.node.MilestoneNode;
+import org.jbpm.workflow.core.node.RuleSetNode;
+import org.jbpm.workflow.core.node.Split;
+import org.jbpm.workflow.core.node.StartNode;
+import org.jbpm.workflow.core.node.SubProcessNode;
+import org.jbpm.workflow.core.node.TimerNode;
+import org.jbpm.workflow.core.node.WorkItemNode;
 
 public class RuleFlowContentModelBuilder {
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java	2010-12-12 15:04:27 UTC (rev 36379)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java	2010-12-12 16:50:15 UTC (rev 36380)
@@ -27,14 +27,14 @@
 import org.drools.guvnor.client.rulefloweditor.WorkItemTransferNode;
 import org.drools.guvnor.client.rulefloweditor.TransferNode.Type;
 import org.drools.process.core.Work;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.impl.ConnectionRef;
-import org.drools.workflow.core.node.CompositeNode;
-import org.drools.workflow.core.node.ForEachNode;
-import org.drools.workflow.core.node.HumanTaskNode;
-import org.drools.workflow.core.node.Split;
-import org.drools.workflow.core.node.WorkItemNode;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
+import org.jbpm.workflow.core.Constraint;
+import org.jbpm.workflow.core.impl.ConnectionRef;
+import org.jbpm.workflow.core.node.CompositeNode;
+import org.jbpm.workflow.core.node.ForEachNode;
+import org.jbpm.workflow.core.node.HumanTaskNode;
+import org.jbpm.workflow.core.node.Split;
+import org.jbpm.workflow.core.node.WorkItemNode;
 
 public class RuleFlowProcessBuilder {
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java	2010-12-12 15:04:27 UTC (rev 36379)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/BPMN2ProcessHandler.java	2010-12-12 16:50:15 UTC (rev 36380)
@@ -26,12 +26,8 @@
 import java.net.URL;
 import java.net.URLEncoder;
 
-import org.drools.bpmn2.xml.BPMNSemanticModule;
-import org.drools.bpmn2.xml.XmlBPMNProcessDumper;
 import org.drools.compiler.DroolsParserException;
 import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.compiler.xml.XmlProcessReader;
-import org.drools.compiler.xml.XmlRuleFlowProcessDumper;
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.guvnor.client.rpc.RuleFlowContentModel;
 import org.drools.guvnor.server.builder.BRMSPackageBuilder;
@@ -41,7 +37,11 @@
 import org.drools.guvnor.server.util.LoggingHelper;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;
-import org.drools.ruleflow.core.RuleFlowProcess;
+import org.jbpm.bpmn2.xml.BPMNSemanticModule;
+import org.jbpm.bpmn2.xml.XmlBPMNProcessDumper;
+import org.jbpm.compiler.xml.XmlProcessReader;
+import org.jbpm.compiler.xml.XmlRuleFlowProcessDumper;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
 
 import com.google.gwt.user.client.rpc.SerializationException;
 

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java	2010-12-12 15:04:27 UTC (rev 36379)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/RuleFlowHandler.java	2010-12-12 16:50:15 UTC (rev 36380)
@@ -47,9 +47,9 @@
 import org.drools.guvnor.server.builder.ContentPackageAssembler.ErrorLogger;
 import org.drools.repository.AssetItem;
 import org.drools.repository.PackageItem;
-import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.compiler.xml.XmlProcessReader;
-import org.drools.compiler.xml.XmlRuleFlowProcessDumper;
+import org.jbpm.compiler.xml.XmlProcessReader;
+import org.jbpm.compiler.xml.XmlRuleFlowProcessDumper;
+import org.jbpm.ruleflow.core.RuleFlowProcess;
 
 import com.google.gwt.user.client.rpc.SerializationException;