Skip to content

Commit

Permalink
- fixing imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@krisv
krisv committed Dec 6, 2012
1 parent 3b475f2 commit 73cee9a
Show file tree
Hide file tree
Showing 121 changed files with 752 additions and 594 deletions.
21 changes: 13 additions & 8 deletions jbpm-bam/src/test/java/org/jbpm/process/audit/JPAWorkingMemoryDbLoggerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,30 @@

package org.jbpm.process.audit;

import static org.jbpm.persistence.util.PersistenceUtil.*;
import static org.junit.Assert.*;
import static org.jbpm.persistence.util.PersistenceUtil.JBPM_PERSISTENCE_UNIT_NAME;
import static org.jbpm.persistence.util.PersistenceUtil.cleanUp;
import static org.jbpm.persistence.util.PersistenceUtil.createEnvironment;
import static org.jbpm.persistence.util.PersistenceUtil.setupWithPoolingDataSource;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;

import org.drools.io.impl.ClassPathResource;
import org.jbpm.process.instance.impl.demo.SystemOutWorkItemHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.kie.KnowledgeBase;
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
import org.kie.builder.ResourceType;
import org.drools.io.impl.ClassPathResource;
import org.kie.io.ResourceType;
import org.kie.persistence.jpa.JPAKnowledgeService;
import org.kie.runtime.Environment;
import org.kie.runtime.KnowledgeSessionConfiguration;
Expand All @@ -39,10 +48,6 @@
import org.kie.runtime.process.WorkItem;
import org.kie.runtime.process.WorkItemHandler;
import org.kie.runtime.process.WorkItemManager;
import org.jbpm.process.instance.impl.demo.SystemOutWorkItemHandler;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
1 change: 0 additions & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/AbstractNodeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@

import org.drools.compiler.xml.XmlDumper;
import org.drools.rule.builder.dialect.java.JavaDialect;
import org.drools.rule.builder.dialect.mvel.MVELDialect;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/AdHocSubProcessHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@

import java.util.List;

import org.kie.definition.process.Connection;
import org.drools.xml.ExtensibleXmlParser;
import org.jbpm.bpmn2.core.SequenceFlow;
import org.jbpm.process.core.context.variable.VariableScope;
import org.jbpm.workflow.core.Node;
import org.jbpm.workflow.core.node.DynamicNode;
import org.kie.definition.process.Connection;
import org.w3c.dom.Element;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/AssociationHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.HashSet;
import java.util.List;

import org.kie.definition.process.Process;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
Expand All @@ -29,6 +28,7 @@
import org.jbpm.bpmn2.core.SequenceFlow;
import org.jbpm.process.core.context.variable.Variable;
import org.jbpm.workflow.core.Node;
import org.kie.definition.process.Process;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;

Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/BPMNSemanticModule.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
import org.jbpm.workflow.core.node.FaultNode;
import org.jbpm.workflow.core.node.ForEachNode;
import org.jbpm.workflow.core.node.Join;
import org.jbpm.workflow.core.node.ThrowLinkNode;
import org.jbpm.workflow.core.node.Split;
import org.jbpm.workflow.core.node.StateNode;
import org.jbpm.workflow.core.node.ThrowLinkNode;
import org.jbpm.workflow.core.node.TimerNode;
import org.jbpm.workflow.core.node.WorkItemNode;

Expand Down
2 changes: 0 additions & 2 deletions jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/BoundaryEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@
import org.jbpm.process.core.event.EventTypeFilter;
import org.jbpm.workflow.core.Node;
import org.jbpm.workflow.core.NodeContainer;
import org.jbpm.workflow.core.node.EndNode;
import org.jbpm.workflow.core.node.EventNode;
import org.jbpm.workflow.core.node.StateNode;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.xml.sax.Attributes;
Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/Bpmn2ImportHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
import org.jbpm.bpmn2.core.Bpmn2Import;
import org.jbpm.bpmn2.core.DataStore;
import org.jbpm.bpmn2.core.Definitions;
import org.jbpm.bpmn2.core.Escalation;
import org.jbpm.bpmn2.core.Bpmn2Import;
import org.jbpm.bpmn2.core.Interface;
import org.jbpm.bpmn2.core.ItemDefinition;
import org.jbpm.bpmn2.core.Message;
Expand Down
1 change: 0 additions & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/BusinessRuleTaskHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.jbpm.workflow.core.node.Assignment;
import org.jbpm.workflow.core.node.DataAssociation;
import org.jbpm.workflow.core.node.RuleSetNode;
import org.jbpm.workflow.core.node.WorkItemNode;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/CompositeContextNodeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
import java.util.ArrayList;
import java.util.List;

import org.kie.definition.process.Connection;
import org.jbpm.process.core.context.variable.Variable;
import org.jbpm.process.core.context.variable.VariableScope;
import org.jbpm.workflow.core.Node;
import org.jbpm.workflow.core.node.CompositeContextNode;
import org.jbpm.workflow.core.node.CompositeNode;
import org.kie.definition.process.Connection;
import org.xml.sax.Attributes;

public class CompositeContextNodeHandler extends AbstractNodeHandler {
Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/DefinitionsHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
import java.util.HashSet;
import java.util.List;

import org.kie.definition.process.Process;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
import org.jbpm.bpmn2.core.Definitions;
import org.jbpm.compiler.xml.ProcessBuildData;
import org.jbpm.ruleflow.core.RuleFlowProcess;
import org.kie.definition.process.Process;
import org.w3c.dom.Element;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/ForEachNodeHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
import java.util.List;

import org.drools.compiler.xml.XmlDumper;
import org.kie.definition.process.Connection;
import org.jbpm.workflow.core.Node;
import org.jbpm.workflow.core.node.CompositeNode;
import org.jbpm.workflow.core.node.ForEachNode;
import org.kie.definition.process.Connection;
import org.xml.sax.Attributes;

public class ForEachNodeHandler extends AbstractNodeHandler {
Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/GlobalHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
import java.util.HashSet;
import java.util.Map;

import org.kie.definition.process.Process;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
import org.jbpm.workflow.core.impl.WorkflowProcessImpl;
import org.kie.definition.process.Process;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;

Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/ImportHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
import java.util.HashSet;
import java.util.Map;

import org.kie.definition.process.Process;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
import org.jbpm.workflow.core.impl.WorkflowProcessImpl;
import org.kie.definition.process.Process;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;

Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/LaneHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import java.util.HashSet;
import java.util.List;

import org.kie.definition.process.WorkflowProcess;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
Expand All @@ -30,6 +29,7 @@
import org.jbpm.process.core.context.variable.Variable;
import org.jbpm.ruleflow.core.RuleFlowProcess;
import org.jbpm.workflow.core.Node;
import org.kie.definition.process.WorkflowProcess;
import org.w3c.dom.Element;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Expand Down
4 changes: 2 additions & 2 deletions jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/ProcessHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
import java.util.List;
import java.util.Map;

import org.kie.definition.process.Node;
import org.kie.definition.process.NodeContainer;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
Expand Down Expand Up @@ -61,6 +59,8 @@
import org.jbpm.workflow.core.node.Split;
import org.jbpm.workflow.core.node.StateBasedNode;
import org.jbpm.workflow.core.node.StateNode;
import org.kie.definition.process.Node;
import org.kie.definition.process.NodeContainer;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;

Expand Down
1 change: 0 additions & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/UserTaskHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@

import org.drools.compiler.xml.XmlDumper;
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
import org.drools.xml.ExtensibleXmlParser;
import org.jbpm.workflow.core.Node;
import org.jbpm.workflow.core.node.HumanTaskNode;
Expand Down
8 changes: 4 additions & 4 deletions jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/XmlBPMNProcessDumper.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
import java.util.Map;

import org.drools.compiler.xml.XmlDumper;
import org.kie.definition.process.Connection;
import org.kie.definition.process.Node;
import org.kie.definition.process.NodeContainer;
import org.kie.definition.process.WorkflowProcess;
import org.drools.process.core.Work;
import org.drools.process.core.datatype.impl.type.ObjectDataType;
import org.drools.rule.builder.dialect.java.JavaDialect;
Expand Down Expand Up @@ -57,6 +53,10 @@
import org.jbpm.workflow.core.node.StartNode;
import org.jbpm.workflow.core.node.Trigger;
import org.jbpm.workflow.core.node.WorkItemNode;
import org.kie.definition.process.Connection;
import org.kie.definition.process.Node;
import org.kie.definition.process.NodeContainer;
import org.kie.definition.process.WorkflowProcess;

public class XmlBPMNProcessDumper {

Expand Down
8 changes: 4 additions & 4 deletions jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xml/di/BPMNPlaneHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
import java.util.HashSet;
import java.util.List;

import org.kie.definition.process.Connection;
import org.kie.definition.process.Node;
import org.kie.definition.process.NodeContainer;
import org.kie.definition.process.Process;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
Expand All @@ -33,6 +29,10 @@
import org.jbpm.compiler.xml.ProcessBuildData;
import org.jbpm.ruleflow.core.RuleFlowProcess;
import org.jbpm.workflow.core.impl.ConnectionImpl;
import org.kie.definition.process.Connection;
import org.kie.definition.process.Node;
import org.kie.definition.process.NodeContainer;
import org.kie.definition.process.Process;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;

Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/bpmn2/xpath/XPATHAssignmentAction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
import javax.xml.xpath.XPathFactory;

import org.drools.process.instance.WorkItem;
import org.kie.runtime.process.ProcessContext;
import org.jbpm.process.instance.impl.AssignmentAction;
import org.jbpm.workflow.core.node.Assignment;
import org.kie.runtime.process.ProcessContext;
import org.w3c.dom.Attr;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/main/java/org/jbpm/osgi/bpmn2/Activator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@

import java.util.Hashtable;

import org.kie.Service;
import org.drools.compiler.BPMN2ProcessProvider;
import org.jbpm.bpmn2.BPMN2ProcessProviderImpl;
import org.kie.Service;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Expand Down
2 changes: 1 addition & 1 deletion jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/BPMN2ProcessTestWithPersistence.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderError;
import org.kie.builder.KnowledgeBuilderFactory;
import org.kie.builder.ResourceType;
import org.kie.io.ResourceFactory;
import org.kie.io.ResourceType;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.process.ProcessInstance;
import org.kie.runtime.process.WorkflowProcessInstance;
Expand Down
4 changes: 2 additions & 2 deletions jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/BPMN2Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

import java.util.Properties;

import org.drools.impl.EnvironmentFactory;
import org.kie.KnowledgeBase;
import org.kie.KnowledgeBaseFactory;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
import org.kie.builder.ResourceType;
import org.drools.impl.EnvironmentFactory;
import org.kie.io.ResourceFactory;
import org.kie.io.ResourceType;
import org.kie.runtime.KnowledgeSessionConfiguration;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.process.ProcessInstance;
Expand Down
4 changes: 1 addition & 3 deletions jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/BPMN2XMLTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,17 @@
import org.custommonkey.xmlunit.DifferenceConstants;
import org.custommonkey.xmlunit.DifferenceListener;
import org.custommonkey.xmlunit.ElementNameAndAttributeQualifier;
import org.custommonkey.xmlunit.ElementQualifier;
import org.custommonkey.xmlunit.XMLTestCase;
import org.custommonkey.xmlunit.XMLUnit;
import org.kie.definition.process.Process;
import org.drools.xml.SemanticModules;
import org.jbpm.bpmn2.xml.BPMNDISemanticModule;
import org.jbpm.bpmn2.xml.BPMNSemanticModule;
import org.jbpm.bpmn2.xml.XmlBPMNProcessDumper;
import org.jbpm.compiler.xml.XmlProcessReader;
import org.jbpm.ruleflow.core.RuleFlowProcess;
import org.kie.definition.process.Process;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.xml.sax.SAXException;

Expand Down
14 changes: 8 additions & 6 deletions jbpm-bpmn2/src/test/java/org/jbpm/bpmn2/BoundaryEventWithCancelActivityTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
package org.jbpm.bpmn2;

import java.io.*;

import org.kie.KnowledgeBase;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;

import org.drools.core.util.DroolsStreamUtils;
import org.jbpm.bpmn2.objects.Person;
import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler;
import org.kie.KnowledgeBase;
import org.kie.builder.KnowledgeBuilder;
import org.kie.builder.KnowledgeBuilderFactory;
import org.kie.builder.ResourceType;
import org.kie.definition.KnowledgePackage;
import org.kie.io.ResourceFactory;
import org.kie.io.ResourceType;
import org.kie.runtime.StatefulKnowledgeSession;
import org.kie.runtime.process.ProcessInstance;
import org.jbpm.bpmn2.objects.Person;
import org.jbpm.process.instance.impl.demo.DoNothingWorkItemHandler;

public class BoundaryEventWithCancelActivityTest extends JbpmBpmn2TestCase {

Expand Down

0 comments on commit 73cee9a

Please sign in to comment.