[DROOLS-1608] move processes related classes from drools to jbpm (#524)

* [DROOLS-1608] move processes related classes from drools to jbpm * [DROOLS-1608] move processes related classes from drools to jbpm * [DROOLS-1608] move processes related classes from drools to jbpm
kiegroup · Jun 22, 2017 · 541fd77 · 541fd77
1 parent f54772f
commit 541fd77
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 29 deletions.
diff --git a/...in/java/org/drools/workbench/jcr2vfsmigration/jcrExport/asset/PlainTextAssetExporter.java b/...in/java/org/drools/workbench/jcr2vfsmigration/jcrExport/asset/PlainTextAssetExporter.java
@@ -40,7 +40,7 @@ public PlainTextAsset export( ExportContext exportContext ) {
             content = content.replaceAll("org.drools.guvnor.client.modeldriven.dt.TemplateModel","rule");
         }
         if (AssetFormats.WORKITEM_DEFINITION.equals(format)){
-            content = content.replaceAll("org.drools.process.core.","org.drools.core.process.core.");
+            content = content.replaceAll("org.drools.process.core.","org.jbpm.process.core.");
         }
 
         return new PlainTextAsset( exportContext.getJcrAssetItem().getName(),

diff --git a/drools-wb-screens/drools-wb-workitems-editor/drools-wb-workitems-editor-backend/pom.xml b/drools-wb-screens/drools-wb-workitems-editor/drools-wb-workitems-editor-backend/pom.xml
@@ -42,6 +42,10 @@
       <groupId>org.jboss.errai</groupId>
       <artifactId>errai-bus</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jbpm</groupId>
+      <artifactId>jbpm-flow</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.jbpm</groupId>
       <artifactId>jbpm-flow-builder</artifactId>

diff --git a/...va/org/drools/workbench/screens/workitems/backend/server/ConfigWorkDefinitionsLoader.java b/...va/org/drools/workbench/screens/workitems/backend/server/ConfigWorkDefinitionsLoader.java
@@ -22,7 +22,7 @@
 import java.util.Map;
 import javax.inject.Inject;
 
-import org.drools.core.process.core.WorkDefinition;
+import org.jbpm.process.core.WorkDefinition;
 import org.drools.workbench.screens.workitems.service.WorkItemsEditorService;
 import org.guvnor.structure.server.config.ConfigGroup;
 import org.guvnor.structure.server.config.ConfigItem;

diff --git a/.../org/drools/workbench/screens/workitems/backend/server/ResourceWorkDefinitionsLoader.java b/.../org/drools/workbench/screens/workitems/backend/server/ResourceWorkDefinitionsLoader.java
@@ -24,7 +24,7 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.drools.core.process.core.WorkDefinition;
+import org.jbpm.process.core.WorkDefinition;
 import org.guvnor.common.services.backend.file.FileDiscoveryService;
 import org.guvnor.common.services.backend.file.FileExtensionFilter;
 import org.uberfire.io.IOService;

diff --git a/...ain/java/org/drools/workbench/screens/workitems/backend/server/WorkDefinitionsParser.java b/...ain/java/org/drools/workbench/screens/workitems/backend/server/WorkDefinitionsParser.java
@@ -23,10 +23,10 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.drools.core.process.core.ParameterDefinition;
-import org.drools.core.process.core.WorkDefinition;
-import org.drools.core.process.core.datatype.DataType;
-import org.drools.core.process.core.impl.ParameterDefinitionImpl;
+import org.jbpm.process.core.ParameterDefinition;
+import org.jbpm.process.core.WorkDefinition;
+import org.jbpm.process.core.datatype.DataType;
+import org.jbpm.process.core.impl.ParameterDefinitionImpl;
 import org.drools.core.util.MVELSafeHelper;
 import org.jbpm.process.workitem.WorkDefinitionImpl;
 import org.mvel2.MVEL;

diff --git a/...ava/org/drools/workbench/screens/workitems/backend/server/WorkItemsEditorServiceImpl.java b/...ava/org/drools/workbench/screens/workitems/backend/server/WorkItemsEditorServiceImpl.java
@@ -29,14 +29,14 @@
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import org.drools.core.process.core.ParameterDefinition;
-import org.drools.core.process.core.WorkDefinition;
-import org.drools.core.process.core.datatype.DataType;
-import org.drools.core.process.core.datatype.impl.type.BooleanDataType;
-import org.drools.core.process.core.datatype.impl.type.FloatDataType;
-import org.drools.core.process.core.datatype.impl.type.IntegerDataType;
-import org.drools.core.process.core.datatype.impl.type.ObjectDataType;
-import org.drools.core.process.core.datatype.impl.type.StringDataType;
+import org.jbpm.process.core.ParameterDefinition;
+import org.jbpm.process.core.WorkDefinition;
+import org.jbpm.process.core.datatype.DataType;
+import org.jbpm.process.core.datatype.impl.type.BooleanDataType;
+import org.jbpm.process.core.datatype.impl.type.FloatDataType;
+import org.jbpm.process.core.datatype.impl.type.IntegerDataType;
+import org.jbpm.process.core.datatype.impl.type.ObjectDataType;
+import org.jbpm.process.core.datatype.impl.type.StringDataType;
 import org.drools.workbench.models.datamodel.workitems.PortableBooleanParameterDefinition;
 import org.drools.workbench.models.datamodel.workitems.PortableFloatParameterDefinition;
 import org.drools.workbench.models.datamodel.workitems.PortableIntegerParameterDefinition;

diff --git a/...a/org/drools/workbench/screens/workitems/backend/server/WorkbenchConfigurationHelper.java b/...a/org/drools/workbench/screens/workitems/backend/server/WorkbenchConfigurationHelper.java
@@ -42,8 +42,8 @@ public ConfigGroup getWorkItemElementDefinitions() {
                                                                        WorkItemsEditorService.WORK_ITEMS_EDITOR_SETTINGS,
                                                                        "" );
         group.addConfigItem( configurationFactory.newConfigItem( WorkItemsEditorService.WORK_ITEMS_EDITOR_SETTINGS_DEFINITION,
-                                                                 "import org.drools.core.process.core.datatype.impl.type.StringDataType;\n" +
-                                                                         "import org.drools.core.process.core.datatype.impl.type.ObjectDataType;\n" +
+                                                                 "import org.jbpm.process.core.datatype.impl.type.StringDataType;\n" +
+                                                                         "import org.jbpm.process.core.datatype.impl.type.ObjectDataType;\n" +
                                                                          "\n" +
                                                                          "[\n" +
                                                                          "  [\n" +

diff --git a/...java/org/drools/workbench/screens/workitems/backend/server/WorkDefinitionsParserTest.java b/...java/org/drools/workbench/screens/workitems/backend/server/WorkDefinitionsParserTest.java
@@ -16,7 +16,7 @@
 package org.drools.workbench.screens.workitems.backend.server;
 
 
-import org.drools.core.process.core.WorkDefinition;
+import org.jbpm.process.core.WorkDefinition;
 import org.junit.Test;
 import org.mvel2.CompileException;
 

diff --git a/...org/drools/workbench/screens/workitems/backend/server/missingImportWorkItemDefinition.wid b/...org/drools/workbench/screens/workitems/backend/server/missingImportWorkItemDefinition.wid
@@ -1,4 +1,4 @@
-import org.drools.core.process.core.datatype.impl.type.StringDataType;
+import org.jbpm.process.core.datatype.impl.type.StringDataType;
 
 [
   [

diff --git a/...sources/org/drools/workbench/screens/workitems/backend/server/validWorkItemDefinition.wid b/...sources/org/drools/workbench/screens/workitems/backend/server/validWorkItemDefinition.wid
@@ -1,5 +1,5 @@
-import org.drools.core.process.core.datatype.impl.type.StringDataType;
-import org.drools.core.process.core.datatype.impl.type.ObjectDataType;
+import org.jbpm.process.core.datatype.impl.type.StringDataType;
+import org.jbpm.process.core.datatype.impl.type.ObjectDataType;
 
 [
   [

diff --git a/...g/drools/workbench/screens/workitems/client/widget/WorkItemDefinitionElementsBrowser.java b/...g/drools/workbench/screens/workitems/client/widget/WorkItemDefinitionElementsBrowser.java
@@ -81,21 +81,21 @@ public WorkItemDefinitionElementsBrowser() {
         }} );
         importsList.addItem( WorkItemsEditorConstants.INSTANCE.ChooseImportClass() );
         importsList.addItem( "BooleanDataType",
-                             "import org.drools.core.process.core.datatype.impl.type.BooleanDataType;" );
+                             "import org.jbpm.process.core.datatype.impl.type.BooleanDataType;" );
         importsList.addItem( "EnumDataType",
-                             "import org.drools.core.process.core.datatype.impl.type.EnumDataType;" );
+                             "import org.jbpm.process.core.datatype.impl.type.EnumDataType;" );
         importsList.addItem( "FloatDataType",
-                             "import org.drools.core.process.core.datatype.impl.type.FloatDataType;" );
+                             "import org.jbpm.process.core.datatype.impl.type.FloatDataType;" );
         importsList.addItem( "IntegerDataType",
-                             "import org.drools.core.process.core.datatype.impl.type.IntegerDataType;" );
+                             "import org.jbpm.process.core.datatype.impl.type.IntegerDataType;" );
         importsList.addItem( "ListDataType",
-                             "import org.drools.core.process.core.datatype.impl.type.ListDataType;" );
+                             "import org.jbpm.process.core.datatype.impl.type.ListDataType;" );
         importsList.addItem( "ObjectDataType",
-                             "import org.drools.core.process.core.datatype.impl.type.ObjectDataType;" );
+                             "import org.jbpm.process.core.datatype.impl.type.ObjectDataType;" );
         importsList.addItem( "StringDataType",
-                             "import org.drools.core.process.core.datatype.impl.type.StringDataType;" );
+                             "import org.jbpm.process.core.datatype.impl.type.StringDataType;" );
         importsList.addItem( "UndefinedDataType",
-                             "import org.drools.core.process.core.datatype.impl.type.UndefinedDataType;" );
+                             "import org.jbpm.process.core.datatype.impl.type.UndefinedDataType;" );
 
         importsList.setVisibleItemCount( 9 );
         importsList.setSelectedIndex( 0 );