Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jun 22, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23e3d85
[DROOLS-1608] move processes related classes from drools to jbpm
mariofusco Jun 7, 2017
c53b281
[DROOLS-1608] move processes related classes from drools to jbpm
mariofusco Jun 7, 2017
c566e0a
[DROOLS-1608] move processes related classes from drools to jbpm
mariofusco Jun 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...in/java/org/drools/workbench/jcr2vfsmigration/jcrExport/asset/PlainTextAssetExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down
4 changes: 4 additions & 0 deletions drools-wb-screens/drools-wb-workitems-editor/drools-wb-workitems-editor-backend/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...va/org/drools/workbench/screens/workitems/backend/server/ConfigWorkDefinitionsLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion .../org/drools/workbench/screens/workitems/backend/server/ResourceWorkDefinitionsLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions ...ain/java/org/drools/workbench/screens/workitems/backend/server/WorkDefinitionsParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions ...ava/org/drools/workbench/screens/workitems/backend/server/WorkItemsEditorServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions ...a/org/drools/workbench/screens/workitems/backend/server/WorkbenchConfigurationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/drools/workbench/screens/workitems/backend/server/WorkDefinitionsParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion ...org/drools/workbench/screens/workitems/backend/server/missingImportWorkItemDefinition.wid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import org.drools.core.process.core.datatype.impl.type.StringDataType;
import org.jbpm.process.core.datatype.impl.type.StringDataType;

[
[
Expand Down
4 changes: 2 additions & 2 deletions ...sources/org/drools/workbench/screens/workitems/backend/server/validWorkItemDefinition.wid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

[
[
Expand Down
16 changes: 8 additions & 8 deletions ...g/drools/workbench/screens/workitems/client/widget/WorkItemDefinitionElementsBrowser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 );
Expand Down