[jboss-svn-commits] JBL Code SVN: r23762 - in labs/jbossrules/trunk: drools-api/src/main/java/org/drools/process/instance and 57 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 6 11:43:59 EST 2008
Author: KrisVerlaenen
Date: 2008-11-06 11:43:58 -0500 (Thu, 06 Nov 2008)
New Revision: 23762
Added:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/EventListener.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstance.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstanceContainer.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/ProcessInstance.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItem.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemHandler.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemManager.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkflowProcessInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItem.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemHandler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemManager.java
Removed:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/EventListener.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstance.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstanceContainer.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItem.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemHandler.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemManager.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkflowProcessInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItem.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItemManager.java
Modified:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/process/ProcessEvent.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/process/ProcessNodeEvent.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/ProcessRuntime.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/RuleCoverageListener.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.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/processes/ExceptionHandlerHandler.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.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/AccumulateTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessEventTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMultiThreadTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessTimerTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/example/ExampleScenario.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.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/mvel/MVELAccumulateBuilderTest.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/MVELConsequenceBuilderTest.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/MVELEvalBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedWorkingMemoryContext.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ProcessEvent.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowNodeTriggeredEvent.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/process/impl/ProcessEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeEventImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemListener.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemManagerFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/event/DefaultSignalManager.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/event/SignalManager.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManager.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/WorkItemImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/DoNothingWorkItemHandler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/SystemOutWorkItemHandler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/UIWorkItemHandler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/UIWorkItemHandlerDialog.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/humantask/HumanTaskDialog.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/humantask/HumanTaskHandler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ProcessContext.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeContextNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EventBasedNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EventNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/HumanTaskNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/RuleSetNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/StartNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/TimerNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/EventTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/SubProcessTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/EndNodeInstanceTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELAssignInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFlowInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELLinkManager.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELReceiveInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELWaitInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/CopyOfBPELAssignInstance.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/xpath/XPathReturnValueEvaluator.java
labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELTestUtil.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/DroolsWorkflow.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstance.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstanceFactory.java
labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/node/StepNodeInstance.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAProcessInstanceManager.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPASignalManager.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManager.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManagerFactory.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/jpa/JPAPersisterTest.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java
labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/TestWorkItemHandler.java
labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/archive/ArchiveWorkItemHandler.java
labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/email/EmailWorkItemHandler.java
labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/exec/ExecWorkItemHandler.java
labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/finder/FinderWorkItemHandler.java
labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/com/sample/RuleFlowTest.java
labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
Log:
JBRULES-1734: Drools-API
- renamed all org.drools.process.instance classes to org.drools.runtime.process
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/process/ProcessEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/process/ProcessEvent.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/process/ProcessEvent.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -17,7 +17,7 @@
*/
import org.drools.event.KnowledgeRuntimeEvent;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.ProcessInstance;
public interface ProcessEvent extends KnowledgeRuntimeEvent {
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/process/ProcessNodeEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/process/ProcessNodeEvent.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/event/process/ProcessNodeEvent.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,6 +1,6 @@
package org.drools.event.process;
-import org.drools.process.instance.NodeInstance;
+import org.drools.runtime.process.NodeInstance;
public interface ProcessNodeEvent extends ProcessEvent {
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/EventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/EventListener.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/EventListener.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,13 +0,0 @@
-package org.drools.process.instance;
-
-public interface EventListener {
-
- void signalEvent(String type, Object event);
-
- /**
- * Returns the event types this event listener is interested in.
- * May return null if the event types are unknown.
- */
- String[] getEventTypes();
-
-}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,15 +0,0 @@
-package org.drools.process.instance;
-
-public interface NodeInstance {
-
- long getId();
-
- long getNodeId();
-
- String getNodeName();
-
- WorkflowProcessInstance getProcessInstance();
-
- NodeInstanceContainer getNodeInstanceContainer();
-
-}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstanceContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstanceContainer.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstanceContainer.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,9 +0,0 @@
-package org.drools.process.instance;
-
-import java.util.Collection;
-
-public interface NodeInstanceContainer {
-
- Collection<NodeInstance> getNodeInstances();
-
-}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,18 +0,0 @@
-package org.drools.process.instance;
-
-public interface ProcessInstance extends EventListener {
-
- int STATE_PENDING = 0;
- int STATE_ACTIVE = 1;
- int STATE_COMPLETED = 2;
- int STATE_ABORTED = 3;
- int STATE_SUSPENDED = 4;
-
- String getProcessId();
-
- long getId();
-
- String getProcessName();
-
- int getState();
-}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItem.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItem.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItem.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,26 +0,0 @@
-package org.drools.process.instance;
-
-import java.util.Map;
-
-public interface WorkItem {
-
- int PENDING = 0;
- int ACTIVE = 1;
- int COMPLETED = 2;
- int ABORTED = 3;
-
- long getId();
-
- String getName();
-
- int getState();
-
- Object getParameter(String name);
- Map<String, Object> getParameters();
-
- Object getResult(String name);
- Map<String, Object> getResults();
-
- long getProcessInstanceId();
-
-}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,9 +0,0 @@
-package org.drools.process.instance;
-
-public interface WorkItemHandler {
-
- void executeWorkItem(WorkItem workItem, WorkItemManager manager);
-
- void abortWorkItem(WorkItem workItem, WorkItemManager manager);
-
-}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemManager.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,13 +0,0 @@
-package org.drools.process.instance;
-
-import java.util.Map;
-
-public interface WorkItemManager {
-
- void completeWorkItem(long id, Map<String, Object> results);
-
- void abortWorkItem(long id);
-
- void registerWorkItemHandler(String workItemName, WorkItemHandler handler);
-
-}
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkflowProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkflowProcessInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkflowProcessInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,5 +0,0 @@
-package org.drools.process.instance;
-
-public interface WorkflowProcessInstance extends ProcessInstance, NodeInstanceContainer {
-
-}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/EventListener.java (from rev 23757, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/EventListener.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/EventListener.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/EventListener.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,13 @@
+package org.drools.runtime.process;
+
+public interface EventListener {
+
+ void signalEvent(String type, Object event);
+
+ /**
+ * Returns the event types this event listener is interested in.
+ * May return null if the event types are unknown.
+ */
+ String[] getEventTypes();
+
+}
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstance.java (from rev 23757, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstance.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,15 @@
+package org.drools.runtime.process;
+
+public interface NodeInstance {
+
+ long getId();
+
+ long getNodeId();
+
+ String getNodeName();
+
+ WorkflowProcessInstance getProcessInstance();
+
+ NodeInstanceContainer getNodeInstanceContainer();
+
+}
Property changes on: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstance.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstanceContainer.java (from rev 23757, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/NodeInstanceContainer.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstanceContainer.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstanceContainer.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,9 @@
+package org.drools.runtime.process;
+
+import java.util.Collection;
+
+public interface NodeInstanceContainer {
+
+ Collection<NodeInstance> getNodeInstances();
+
+}
Property changes on: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/NodeInstanceContainer.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/ProcessInstance.java (from rev 23757, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/ProcessInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/ProcessInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,18 @@
+package org.drools.runtime.process;
+
+public interface ProcessInstance extends EventListener {
+
+ int STATE_PENDING = 0;
+ int STATE_ACTIVE = 1;
+ int STATE_COMPLETED = 2;
+ int STATE_ABORTED = 3;
+ int STATE_SUSPENDED = 4;
+
+ String getProcessId();
+
+ long getId();
+
+ String getProcessName();
+
+ int getState();
+}
Property changes on: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/ProcessInstance.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/ProcessRuntime.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/ProcessRuntime.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/ProcessRuntime.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -4,8 +4,6 @@
import java.util.Map;
import org.drools.event.process.ProcessEventManager;
-import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.WorkItemManager;
public interface ProcessRuntime extends ProcessEventManager {
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItem.java (from rev 23757, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItem.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItem.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItem.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,26 @@
+package org.drools.runtime.process;
+
+import java.util.Map;
+
+public interface WorkItem {
+
+ int PENDING = 0;
+ int ACTIVE = 1;
+ int COMPLETED = 2;
+ int ABORTED = 3;
+
+ long getId();
+
+ String getName();
+
+ int getState();
+
+ Object getParameter(String name);
+ Map<String, Object> getParameters();
+
+ Object getResult(String name);
+ Map<String, Object> getResults();
+
+ long getProcessInstanceId();
+
+}
Property changes on: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItem.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemHandler.java (from rev 23757, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemHandler.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemHandler.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,9 @@
+package org.drools.runtime.process;
+
+public interface WorkItemHandler {
+
+ void executeWorkItem(WorkItem workItem, WorkItemManager manager);
+
+ void abortWorkItem(WorkItem workItem, WorkItemManager manager);
+
+}
Property changes on: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemHandler.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemManager.java (from rev 23757, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkItemManager.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemManager.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,13 @@
+package org.drools.runtime.process;
+
+import java.util.Map;
+
+public interface WorkItemManager {
+
+ void completeWorkItem(long id, Map<String, Object> results);
+
+ void abortWorkItem(long id);
+
+ void registerWorkItemHandler(String workItemName, WorkItemHandler handler);
+
+}
Property changes on: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkItemManager.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkflowProcessInstance.java (from rev 23757, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/process/instance/WorkflowProcessInstance.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkflowProcessInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkflowProcessInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,5 @@
+package org.drools.runtime.process;
+
+public interface WorkflowProcessInstance extends ProcessInstance, NodeInstanceContainer {
+
+}
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/runtime/process/WorkflowProcessInstance.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderProviderImpl.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,11 +1,8 @@
package org.drools.builder.impl;
-import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseProvider;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderProvider;
import org.drools.compiler.PackageBuilder;
-import org.drools.spi.KnowledgeHelper;
public class KnowledgeBuilderProviderImpl implements KnowledgeBuilderProvider {
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-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -67,7 +67,6 @@
import org.drools.rule.builder.RuleBuilder;
import org.drools.spi.InternalReadAccessor;
import org.drools.xml.XmlPackageReader;
-import org.drools.xml.XmlProcessReader;
import org.xml.sax.SAXException;
/**
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-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,7 +1,7 @@
package org.drools.compiler;
+import org.drools.definition.process.Process;
import org.drools.lang.descr.BaseDescr;
-import org.drools.definition.process.Process;
public class ProcessBuildError extends DescrBuildError {
private final Process process;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/RuleDescr.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -19,7 +19,6 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/RuleCoverageListener.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/RuleCoverageListener.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/RuleCoverageListener.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -3,6 +3,7 @@
import java.util.HashSet;
import java.util.Set;
+import org.drools.WorkingMemory;
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
import org.drools.event.AfterActivationFiredEvent;
@@ -10,7 +11,6 @@
import org.drools.event.AgendaGroupPoppedEvent;
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
-import org.drools.WorkingMemory;
/**
* Measure the rule coverage.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,6 +9,7 @@
import java.util.Iterator;
import java.util.Map;
+import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.base.ClassTypeResolver;
import org.drools.base.TypeResolver;
@@ -27,7 +28,6 @@
import org.drools.guvnor.server.util.ScenarioXMLPersistence;
import org.drools.rule.Package;
import org.drools.rule.TimeMachine;
-import org.drools.FactHandle;
import org.mvel2.MVEL;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,6 +9,7 @@
import java.util.Map;
import java.util.Map.Entry;
+import org.drools.WorkingMemory;
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
import org.drools.event.AfterActivationFiredEvent;
@@ -17,7 +18,6 @@
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
import org.drools.rule.Rule;
-import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
import org.drools.spi.Consequence;
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-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ProcessBuildData.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -6,10 +6,9 @@
import java.util.HashMap;
import java.util.Map;
+import org.drools.definition.process.Process;
import org.drools.workflow.core.Node;
-import org.drools.definition.process.Process;
-
public class ProcessBuildData {
private Process process;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ExceptionHandlerHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ExceptionHandlerHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ExceptionHandlerHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -2,8 +2,8 @@
import java.util.HashSet;
+import org.drools.definition.process.Process;
import org.drools.process.core.ContextContainer;
-import org.drools.definition.process.Process;
import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.drools.process.core.context.exception.ExceptionHandler;
import org.drools.process.core.context.exception.ExceptionScope;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -3,14 +3,14 @@
import java.io.StringReader;
import java.util.Collection;
+import junit.framework.TestCase;
+
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.definition.KnowledgePackage;
import org.drools.definition.process.Process;
import org.drools.definition.rule.Rule;
-import junit.framework.TestCase;
-
public class KnowledgeBuilderTest extends TestCase {
public void testKnowledgeProvider() {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -3,13 +3,12 @@
import java.io.StringReader;
import java.util.Collection;
+import junit.framework.TestCase;
+
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.definition.KnowledgePackage;
-import org.drools.definition.rule.Rule;
-import junit.framework.TestCase;
-
public class KnowledgeSessionTest extends TestCase {
public void testKnowledgeProviderWithRules() {
KnowledgeBuilder builder = KnowledgeBuilderFactory.newKnowledgeBuilder();
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-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -27,6 +27,7 @@
import org.drools.Cheese;
import org.drools.DroolsTestCase;
+import org.drools.FactHandle;
import org.drools.Primitives;
import org.drools.QueryResults;
import org.drools.RuleBase;
@@ -86,7 +87,6 @@
import org.drools.rule.SlidingTimeWindow;
import org.drools.rule.TypeDeclaration;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
-import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.CompiledInvoker;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -11,20 +11,20 @@
import org.drools.Cheese;
import org.drools.Cheesery;
+import org.drools.FactHandle;
import org.drools.OuterClass;
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.RuntimeDroolsException;
+import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
-import org.drools.FactHandle;
-import org.drools.WorkingMemory;
public class AccumulateTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -13,11 +13,11 @@
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.lang.Expander;
import org.drools.lang.dsl.DefaultExpanderResolver;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
public class DslTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -22,12 +22,11 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
+import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.rule.Package;
-import org.drools.FactHandle;
-import org.drools.WorkingMemory;
public class DynamicRulesTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
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-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -13,6 +13,7 @@
import org.drools.Alarm;
import org.drools.Cell;
import org.drools.Cheese;
+import org.drools.FactHandle;
import org.drools.Message;
import org.drools.Neighbor;
import org.drools.Person;
@@ -21,6 +22,7 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
+import org.drools.WorkingMemory;
import org.drools.common.DefaultAgenda;
import org.drools.common.InternalWorkingMemoryActions;
import org.drools.common.RuleFlowGroupImpl;
@@ -33,11 +35,8 @@
import org.drools.event.AgendaEventListener;
import org.drools.event.DefaultAgendaEventListener;
import org.drools.lang.descr.PackageDescr;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
-import org.drools.FactHandle;
-import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ActivationGroup;
import org.drools.spi.AgendaGroup;
@@ -830,7 +829,7 @@
list.size() );
final ProcessInstance processInstance = workingMemory.startProcess( "0" );
- assertEquals( InternalProcessInstance.STATE_ACTIVE,
+ assertEquals( ProcessInstance.STATE_ACTIVE,
processInstance.getState() );
workingMemory.fireAllRules();
assertEquals( 4,
@@ -843,7 +842,7 @@
list.get( 2 ) );
assertEquals( "Rule4",
list.get( 3 ) );
- assertEquals( InternalProcessInstance.STATE_COMPLETED,
+ assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
}
@@ -920,7 +919,7 @@
list.size() );
final ProcessInstance processInstance = workingMemory.startProcess( "0" );
- assertEquals( InternalProcessInstance.STATE_ACTIVE,
+ assertEquals( ProcessInstance.STATE_ACTIVE,
processInstance.getState() );
workingMemory.fireAllRules();
assertEquals( 4,
@@ -933,7 +932,7 @@
list.get( 2 ) );
assertEquals( "Rule4",
list.get( 3 ) );
- assertEquals( InternalProcessInstance.STATE_COMPLETED,
+ assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -12,6 +12,7 @@
import org.drools.Cheese;
import org.drools.Cheesery;
+import org.drools.FactHandle;
import org.drools.Order;
import org.drools.OrderItem;
import org.drools.Person;
@@ -29,7 +30,6 @@
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
import org.drools.rule.Rule;
-import org.drools.FactHandle;
public class FirstOrderLogicTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -16,12 +16,12 @@
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
import org.drools.util.DateUtils;
import org.mvel2.MVEL;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -29,6 +29,7 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
+import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.common.BaseNode;
import org.drools.common.InternalFactHandle;
@@ -43,7 +44,6 @@
import org.drools.rule.MapBackedClassLoader;
import org.drools.rule.Package;
import org.drools.rule.Rule;
-import org.drools.WorkingMemory;
import org.drools.spi.GlobalResolver;
import org.drools.util.DroolsStreamUtils;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -47,6 +47,7 @@
import org.drools.FactA;
import org.drools.FactB;
import org.drools.FactC;
+import org.drools.FactHandle;
import org.drools.FirstClass;
import org.drools.FromTestClass;
import org.drools.Guess;
@@ -77,6 +78,7 @@
import org.drools.StatefulSession;
import org.drools.StatelessSession;
import org.drools.TestParam;
+import org.drools.WorkingMemory;
import org.drools.Cheesery.Maturity;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.audit.WorkingMemoryInMemoryLogger;
@@ -113,8 +115,6 @@
import org.drools.rule.InvalidRulePackage;
import org.drools.rule.Package;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
-import org.drools.FactHandle;
-import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ConsequenceExceptionHandler;
import org.drools.spi.GlobalResolver;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -26,9 +26,9 @@
import org.drools.RuleBaseFactory;
import org.drools.SessionConfiguration;
import org.drools.StatefulSession;
+import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
/** Run all the tests with the ReteOO engine implementation */
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,18 +9,18 @@
import junit.framework.TestCase;
import org.drools.Message;
-import org.drools.runtime.ObjectFilter;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.compiler.DroolsError;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderErrors;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
+import org.drools.runtime.ObjectFilter;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
public class ProcessActionTest extends TestCase {
@@ -84,15 +84,15 @@
workingMemory.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.actions");
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
WorkItem workItem = handler.getWorkItem();
assertNotNull(workItem);
assertEquals(1, list.size());
workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), null);
assertEquals(3, list.size());
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testActionContextJava() {
@@ -154,7 +154,7 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.actions");
assertEquals(2, list.size());
assertEquals("SomeText", list.get(0));
@@ -165,7 +165,7 @@
}
});
assertTrue(iterator.hasNext());
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testActionContextMVEL() {
@@ -231,7 +231,7 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.actions");
assertEquals(2, list.size());
assertEquals("SomeText", list.get(0));
@@ -242,7 +242,7 @@
}
});
assertTrue(iterator.hasNext());
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
private static class TestWorkItemHandler implements WorkItemHandler {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessEventTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessEventTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessEventTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -11,7 +11,6 @@
import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.rule.Package;
@@ -67,7 +66,7 @@
session.startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals("MyValue", ((VariableScopeInstance)
- ((InternalProcessInstance) processInstance).getContextInstance(
+ ((ProcessInstance) processInstance).getContextInstance(
VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
@@ -120,7 +119,7 @@
processInstance.signalEvent("MyEvent", "MyValue");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals("MyValue", ((VariableScopeInstance)
- ((InternalProcessInstance) processInstance).getContextInstance(
+ ((ProcessInstance) processInstance).getContextInstance(
VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
@@ -168,7 +167,7 @@
ProcessInstance processInstance = session.startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals("SomeText", ((VariableScopeInstance)
- ((InternalProcessInstance) processInstance).getContextInstance(
+ ((ProcessInstance) processInstance).getContextInstance(
VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
session = SerializationHelper.getSerialisedStatefulSession(session);
@@ -176,7 +175,7 @@
session.getSignalManager().signalEvent("MyEvent", "MyValue");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals("MyValue", ((VariableScopeInstance)
- ((InternalProcessInstance) processInstance).getContextInstance(
+ ((ProcessInstance) processInstance).getContextInstance(
VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
@@ -224,7 +223,7 @@
ProcessInstance processInstance = session.startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals("SomeText", ((VariableScopeInstance)
- ((InternalProcessInstance) processInstance).getContextInstance(
+ ((ProcessInstance) processInstance).getContextInstance(
VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
session = SerializationHelper.getSerialisedStatefulSession(session);
@@ -294,7 +293,7 @@
workingMemory.startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals("MyValue", ((VariableScopeInstance)
- ((InternalProcessInstance) processInstance).getContextInstance(
+ ((ProcessInstance) processInstance).getContextInstance(
VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
@@ -359,7 +358,7 @@
processInstance.signalEvent("MyEvent", "MyValue");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals("MyValue", ((VariableScopeInstance)
- ((InternalProcessInstance) processInstance).getContextInstance(
+ ((ProcessInstance) processInstance).getContextInstance(
VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
@@ -424,7 +423,7 @@
session.getSignalManager().signalEvent("MyEvent", "MyValue");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals("MyValue", ((VariableScopeInstance)
- ((InternalProcessInstance) processInstance).getContextInstance(
+ ((ProcessInstance) processInstance).getContextInstance(
VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,12 +9,12 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.compiler.DroolsError;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderErrors;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
public class ProcessExceptionHandlerTest extends TestCase {
@@ -52,9 +52,9 @@
RuleBase ruleBase = RuleBaseFactory.newRuleBase();
ruleBase.addPackage( pkg );
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.exception");
- assertEquals(InternalProcessInstance.STATE_ABORTED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ABORTED, processInstance.getState());
}
public void testProcessExceptionHandlerAction() {
@@ -103,9 +103,9 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.exception");
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, list.size());
assertEquals("SomeValue", list.get(0));
}
@@ -125,7 +125,7 @@
" </globals>\n" +
" <exceptionHandlers>\n" +
" <exceptionHandler faultName=\"myFault\" type=\"action\" >\n" +
- " <action type=\"expression\" name=\"Complete\" dialect=\"java\" >((org.drools.process.instance.InternalProcessInstance) context.getProcessInstance()).setState(org.drools.process.instance.ProcessInstance.STATE_COMPLETED);</action>\n" +
+ " <action type=\"expression\" name=\"Complete\" dialect=\"java\" >context.getProcessInstance().setState(org.drools.process.instance.ProcessInstance.STATE_COMPLETED);</action>\n" +
" </exceptionHandler>\n" +
" </exceptionHandlers>\n" +
" </header>\n" +
@@ -145,9 +145,9 @@
RuleBase ruleBase = RuleBaseFactory.newRuleBase();
ruleBase.addPackage( pkg );
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.exception");
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testCompositeNodeExceptionHandlerTriggerNode() {
@@ -220,11 +220,11 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.exception");
assertEquals(1, list.size());
assertEquals("SomeValue", list.get(0));
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testNestedExceptionHandler() {
@@ -297,10 +297,10 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
List<String> list = new ArrayList<String>();
workingMemory.setGlobal("list", list);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.exception");
assertEquals(1, list.size());
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
}
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,13 +9,13 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
public class ProcessHumanTaskTest extends TestCase {
@@ -67,13 +67,13 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
TestWorkItemHandler handler = new TestWorkItemHandler();
workingMemory.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.humantask");
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
WorkItem workItem = handler.getWorkItem();
assertNotNull(workItem);
workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testSwimlane() {
@@ -145,9 +145,9 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
TestWorkItemHandler handler = new TestWorkItemHandler();
workingMemory.getWorkItemManager().registerWorkItemHandler("Human Task", handler);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("org.drools.humantask");
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
WorkItem workItem = handler.getWorkItem();
assertNotNull(workItem);
assertEquals("Do something", workItem.getParameter("TaskName"));
@@ -160,7 +160,7 @@
assertEquals("Do something else", workItem.getParameter("TaskName"));
assertEquals("Jane Doe", workItem.getParameter("ActorId"));
workingMemory.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
private static class TestWorkItemHandler implements WorkItemHandler {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMarchallingTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -20,12 +20,12 @@
import org.drools.marshalling.DefaultMarshaller;
import org.drools.marshalling.Marshaller;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.rule.Package;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
public class ProcessMarchallingTest extends TestCase {
@@ -154,7 +154,7 @@
session = getSerialisedStatefulSession( session );
assertEquals(1, session.getProcessInstances().size());
VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
- (( InternalProcessInstance )session.getProcessInstances().iterator().next()).getContextInstance(VariableScope.VARIABLE_SCOPE);
+ (( ProcessInstance )session.getProcessInstances().iterator().next()).getContextInstance(VariableScope.VARIABLE_SCOPE);
assertEquals("ThisIsMyValue", variableScopeInstance.getVariable("myVariable"));
session.getWorkItemManager().completeWorkItem(handler.getWorkItem().getId(), null);
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMultiThreadTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMultiThreadTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessMultiThreadTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -11,7 +11,7 @@
import org.drools.StatefulSession;
import org.drools.compiler.DroolsError;
import org.drools.compiler.PackageBuilder;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.ProcessInstance;
public class ProcessMultiThreadTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessTimerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessTimerTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessTimerTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -15,7 +15,7 @@
import org.drools.StatefulSession;
import org.drools.compiler.DroolsError;
import org.drools.compiler.PackageBuilder;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
public class ProcessTimerTest extends TestCase {
@@ -76,15 +76,15 @@
StatefulSession session = ruleBase.newStatefulSession();
List<Message> myList = new ArrayList<Message>();
session.setGlobal("myList", myList);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
myList = (List<Message>) session.getGlobal( "myList" );
- processInstance = ( InternalProcessInstance ) session.getProcessInstance( processInstance.getId() );
+ processInstance = ( ProcessInstance ) session.getProcessInstance( processInstance.getId() );
assertEquals(1, session.getTimerManager().getTimers().size());
@@ -104,7 +104,7 @@
}
session.fireAllRules();
assertEquals(5, myList.size());
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
@SuppressWarnings("unchecked")
@@ -150,15 +150,15 @@
StatefulSession session = ruleBase.newStatefulSession();
List<String> myList = new ArrayList<String>();
session.setGlobal("myList", myList);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
myList = (List<String>) session.getGlobal( "myList" );
- processInstance = ( InternalProcessInstance ) session.getProcessInstance( processInstance.getId() );
+ processInstance = ( ProcessInstance ) session.getProcessInstance( processInstance.getId() );
assertEquals(1, session.getTimerManager().getTimers().size());
@@ -213,15 +213,15 @@
StatefulSession session = ruleBase.newStatefulSession();
List<String> myList = new ArrayList<String>();
session.setGlobal("myList", myList);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
myList = (List<String>) session.getGlobal( "myList" );
- processInstance = ( InternalProcessInstance ) session.getProcessInstance( processInstance.getId() );
+ processInstance = ( ProcessInstance ) session.getProcessInstance( processInstance.getId() );
assertEquals(1, session.getTimerManager().getTimers().size());
@@ -279,10 +279,10 @@
StatefulSession session = ruleBase.newStatefulSession();
List<String> myList = new ArrayList<String>();
session.setGlobal("myList", myList);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
@@ -351,10 +351,10 @@
StatefulSession session = ruleBase.newStatefulSession();
List<String> myList = new ArrayList<String>();
session.setGlobal("myList", myList);
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
session.startProcess("org.drools.timer");
assertEquals(0, myList.size());
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(1, session.getTimerManager().getTimers().size());
session = getSerialisedStatefulSession( session );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessUpgradeTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -13,7 +13,7 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.compiler.PackageBuilder;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
import org.drools.workflow.instance.WorkflowProcessInstanceUpgrader;
@@ -67,7 +67,7 @@
Person p = new Person( "bobba fet", 32);
session.insert( p );
- InternalProcessInstance processInstance = ( InternalProcessInstance ) session.startProcess("org.test.ruleflow");
+ ProcessInstance processInstance = ( ProcessInstance ) session.startProcess("org.test.ruleflow");
assertEquals(1, session.getProcessInstances().size());
@@ -109,7 +109,7 @@
session.fireAllRules();
assertEquals(2, list.size());
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -14,13 +14,12 @@
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.definition.KnowledgePackage;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.process.ProcessInstance;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
public class ProcessWorkItemTest extends TestCase {
@@ -110,7 +109,8 @@
ksession.getWorkItemManager().completeWorkItem(workItem.getId(), results);
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
VariableScopeInstance variableScope = (VariableScopeInstance)
- ((InternalProcessInstance) processInstance).getContextInstance(VariableScope.VARIABLE_SCOPE);
+ ((org.drools.process.instance.ProcessInstance) processInstance)
+ .getContextInstance(VariableScope.VARIABLE_SCOPE);
assertEquals("SomeOtherString", variableScope.getVariable("MyObject"));
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -10,6 +10,7 @@
import junit.framework.TestCase;
import org.drools.Cheese;
+import org.drools.FactHandle;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
import org.drools.RuleBaseConfiguration;
@@ -17,7 +18,6 @@
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.definition.KnowledgePackage;
import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.FactHandle;
public class StatefulSessionTest extends TestCase {
final List list = new ArrayList();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -10,13 +10,12 @@
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
public class SubProcessTest extends TestCase {
@@ -24,12 +23,12 @@
try {
RuleBase ruleBase = readRule(true);
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("com.sample.ruleflow");
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, workingMemory.getProcessInstances().size());
workingMemory.insert(new Person());
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
assertEquals(0, workingMemory.getProcessInstances().size());
} catch (Throwable t) {
t.printStackTrace();
@@ -40,11 +39,11 @@
try {
RuleBase ruleBase = readRule(true);
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("com.sample.ruleflow");
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, workingMemory.getProcessInstances().size());
- processInstance.setState(InternalProcessInstance.STATE_ABORTED);
+ processInstance.setState(ProcessInstance.STATE_ABORTED);
assertEquals(1, workingMemory.getProcessInstances().size());
} catch (Throwable t) {
t.printStackTrace();
@@ -55,11 +54,11 @@
try {
RuleBase ruleBase = readRule(false);
WorkingMemory workingMemory = ruleBase.newStatefulSession();
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("com.sample.ruleflow");
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, workingMemory.getProcessInstances().size());
- processInstance.setState(InternalProcessInstance.STATE_ABORTED);
+ processInstance.setState(ProcessInstance.STATE_ABORTED);
assertEquals(0, workingMemory.getProcessInstances().size());
} catch (Throwable t) {
t.printStackTrace();
@@ -72,13 +71,13 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
Map<String, Object> map = new HashMap<String, Object>();
map.put("x", "x-value");
- InternalProcessInstance processInstance = ( InternalProcessInstance )
+ ProcessInstance processInstance = ( ProcessInstance )
workingMemory.startProcess("com.sample.ruleflow", map);
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
assertEquals(2, workingMemory.getProcessInstances().size());
for (ProcessInstance p: workingMemory.getProcessInstances()) {
VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
- (( InternalProcessInstance )p).getContextInstance(VariableScope.VARIABLE_SCOPE);
+ (( ProcessInstance )p).getContextInstance(VariableScope.VARIABLE_SCOPE);
if ("com.sample.ruleflow".equals(p.getProcessId())) {
assertEquals("x-value", variableScopeInstance.getVariable("x"));
} else if ("com.sample.subflow".equals(p.getProcessId())) {
@@ -87,7 +86,7 @@
}
}
workingMemory.insert(new Person());
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE);
assertEquals("z-value", variableScopeInstance.getVariable("x"));
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,6 +9,7 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
@@ -16,7 +17,6 @@
import org.drools.integrationtests.eventgenerator.Event.EventType;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
public class SimpleEventGeneratorTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/example/ExampleScenario.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/example/ExampleScenario.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/example/ExampleScenario.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -16,13 +16,13 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.integrationtests.eventgenerator.PseudoSessionClock;
import org.drools.integrationtests.eventgenerator.SimpleEventGenerator;
import org.drools.integrationtests.eventgenerator.SimpleEventListener;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
public class ExampleScenario {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -29,13 +29,13 @@
import org.drools.RuleBase;
import org.drools.RuleIntegrationException;
import org.drools.StatefulSession;
+import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.InvalidPatternException;
import org.drools.rule.Package;
-import org.drools.WorkingMemory;
/**
* This is a sample file to launch a rule package from a rule source file.
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,21 +1,7 @@
package org.drools.lang;
-import java.io.IOException;
-import java.io.PipedInputStream;
-import java.io.PipedOutputStream;
-import java.io.PrintStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
import junit.framework.TestCase;
-import org.antlr.runtime.ANTLRFileStream;
-import org.antlr.runtime.ANTLRStringStream;
-import org.antlr.runtime.CharStream;
-import org.antlr.runtime.CommonTokenStream;
-import org.antlr.runtime.tree.CommonTree;
-import org.antlr.runtime.tree.CommonTreeNodeStream;
-
public class TestTree2TestDRL extends TestCase {
String stdout;
String stderr;
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-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,6 +8,7 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.compiler.DialectCompiletimeRegistry;
import org.drools.compiler.PackageBuilder;
@@ -16,7 +17,6 @@
import org.drools.lang.descr.ProcessDescr;
import org.drools.rule.Package;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.workflow.core.DroolsAction;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,6 +5,7 @@
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.base.mvel.MVELCompileable;
import org.drools.common.InternalFactHandle;
import org.drools.compiler.DialectCompiletimeRegistry;
@@ -20,7 +21,6 @@
import org.drools.rule.Accumulate;
import org.drools.rule.Package;
import org.drools.rule.builder.RuleBuildContext;
-import org.drools.WorkingMemory;
public class MVELAccumulateBuilderTest extends TestCase {
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-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,6 +8,7 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.mvel.MVELAction;
import org.drools.compiler.DialectCompiletimeRegistry;
@@ -16,7 +17,6 @@
import org.drools.lang.descr.ActionDescr;
import org.drools.rule.Package;
import org.drools.rule.builder.PackageBuildContext;
-import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.workflow.core.DroolsAction;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -12,6 +12,7 @@
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.mvel.MVELConsequence;
@@ -37,7 +38,6 @@
import org.drools.rule.Rule;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.RuleBuilder;
-import org.drools.WorkingMemory;
import org.drools.spi.ObjectType;
import org.drools.spi.PatternExtractor;
import org.mvel2.ParserContext;
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-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,6 +8,7 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.mvel.MVELAction;
import org.drools.compiler.PackageBuilder;
@@ -16,7 +17,6 @@
import org.drools.lang.descr.ActionDescr;
import org.drools.rule.Package;
import org.drools.rule.builder.PackageBuildContext;
-import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.workflow.core.DroolsAction;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,6 +8,7 @@
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassObjectType;
@@ -24,7 +25,6 @@
import org.drools.rule.EvalCondition;
import org.drools.rule.Package;
import org.drools.rule.Pattern;
-import org.drools.WorkingMemory;
import org.drools.spi.InternalReadAccessor;
public class MVELEvalBuilderTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,6 +8,7 @@
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.base.mvel.MVELSalienceExpression;
import org.drools.common.InternalFactHandle;
@@ -20,7 +21,6 @@
import org.drools.rule.Package;
import org.drools.rule.Pattern;
import org.drools.rule.builder.SalienceBuilder;
-import org.drools.WorkingMemory;
import org.drools.spi.ObjectType;
import org.drools.spi.PatternExtractor;
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-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -13,7 +13,7 @@
import org.drools.Agenda;
import org.drools.FactException;
-import org.drools.ObjectFilter;
+import org.drools.FactHandle;
import org.drools.QueryResults;
import org.drools.RuleBase;
import org.drools.WorkingMemoryEntryPoint;
@@ -34,32 +34,23 @@
import org.drools.event.RuleFlowEventSupport;
import org.drools.event.WorkingMemoryEventListener;
import org.drools.event.WorkingMemoryEventSupport;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.ProcessInstanceFactory;
import org.drools.process.instance.ProcessInstanceManager;
-import org.drools.process.instance.InternalWorkItemManager;
import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.event.SignalManager;
-import org.drools.process.instance.event.SignalManager;
import org.drools.process.instance.timer.TimerManager;
import org.drools.reteoo.LIANodePropagation;
-import org.drools.reteoo.ObjectTypeConf;
import org.drools.reteoo.PartitionTaskManager;
-import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
import org.drools.rule.TimeMachine;
-import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
-import org.drools.spi.AgendaGroup;
import org.drools.spi.AsyncExceptionHandler;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.GlobalResolver;
import org.drools.spi.PropagationContext;
import org.drools.time.SessionClock;
import org.drools.time.TimerService;
-import org.drools.util.ObjectHashMap;
public class MockWorkingMemory implements InternalWorkingMemory {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,13 +5,13 @@
import junit.framework.TestCase;
+import org.drools.FactHandle;
import org.drools.common.ActivationGroupNode;
import org.drools.common.LogicalDependency;
import org.drools.common.RuleFlowGroupNode;
import org.drools.event.AfterActivationFiredEvent;
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
-import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -41,11 +41,11 @@
import org.drools.process.instance.ProcessInstanceFactory;
import org.drools.process.instance.ProcessInstanceFactoryRegistry;
import org.drools.process.instance.ProcessInstanceManagerFactory;
-import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManagerFactory;
import org.drools.process.instance.event.SignalManagerFactory;
import org.drools.process.instance.impl.ContextInstanceFactory;
import org.drools.process.instance.impl.ContextInstanceFactoryRegistry;
+import org.drools.runtime.process.WorkItemHandler;
import org.drools.spi.ConflictResolver;
import org.drools.spi.ConsequenceExceptionHandler;
import org.drools.util.ChainedProperties;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -21,10 +21,9 @@
import java.util.Map;
import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.event.SignalManager;
import org.drools.process.instance.timer.TimerManager;
-import org.drools.FactHandle;
+import org.drools.runtime.process.WorkItemManager;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AsyncExceptionHandler;
import org.drools.spi.GlobalResolver;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -40,7 +40,7 @@
import org.drools.Agenda;
import org.drools.FactException;
-import org.drools.runtime.ObjectFilter;
+import org.drools.FactHandle;
import org.drools.QueryResults;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
@@ -64,14 +64,10 @@
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.event.EventFilter;
import org.drools.process.core.event.EventTypeFilter;
-import org.drools.process.instance.EventListener;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
import org.drools.process.instance.ProcessInstanceFactoryRegistry;
import org.drools.process.instance.ProcessInstanceManager;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.process.instance.event.SignalManager;
import org.drools.process.instance.timer.TimerManager;
@@ -87,7 +83,9 @@
import org.drools.rule.Rule;
import org.drools.rule.TimeMachine;
import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.FactHandle;
+import org.drools.runtime.process.EventListener;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AsyncExceptionHandler;
@@ -1514,7 +1512,7 @@
if ( process == null ) {
throw new IllegalArgumentException( "Unknown process ID: " + processId );
}
- InternalProcessInstance processInstance = ( InternalProcessInstance ) getProcessInstance( process );
+ ProcessInstance processInstance = ( ProcessInstance ) getProcessInstance( process );
processInstance.setWorkingMemory( this );
processInstance.setProcess( process );
processInstanceManager.addProcessInstance( processInstance );
@@ -1549,7 +1547,7 @@
if ( conf == null ) {
throw new IllegalArgumentException( "Illegal process type: " + process.getClass() );
}
- InternalProcessInstance processInstance = conf.createProcessInstance();
+ ProcessInstance processInstance = conf.createProcessInstance();
if ( processInstance == null ) {
throw new IllegalArgumentException( "Illegal process type: " + process.getClass() );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -3,19 +3,18 @@
import java.util.concurrent.locks.Lock;
import org.drools.FactException;
+import org.drools.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.concurrent.ExecutorService;
import org.drools.event.AgendaEventSupport;
import org.drools.event.RuleFlowEventSupport;
import org.drools.event.WorkingMemoryEventSupport;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceManager;
import org.drools.reteoo.LIANodePropagation;
import org.drools.reteoo.PartitionTaskManager;
import org.drools.rule.Rule;
import org.drools.rule.TimeMachine;
-import org.drools.FactHandle;
-import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedWorkingMemoryContext.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedWorkingMemoryContext.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedWorkingMemoryContext.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -10,7 +10,7 @@
import org.drools.event.RuleFlowEventSupport;
import org.drools.event.WorkingMemoryEventSupport;
import org.drools.process.instance.ProcessInstanceFactory;
-import org.drools.process.instance.InternalWorkItemManager;
+import org.drools.process.instance.WorkItemManager;
import org.drools.rule.TimeMachine;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.GlobalResolver;
@@ -38,7 +38,7 @@
private int processCounter;
- private InternalWorkItemManager workItemManager;
+ private WorkItemManager workItemManager;
private Map<String, ProcessInstanceFactory> processInstanceFactories;
@@ -67,11 +67,11 @@
this.processInstances = processInstances;
}
- public InternalWorkItemManager getWorkItemManager() {
+ public WorkItemManager getWorkItemManager() {
return workItemManager;
}
- public void setWorkItemManager(InternalWorkItemManager workItemManager) {
+ public void setWorkItemManager(WorkItemManager workItemManager) {
this.workItemManager = workItemManager;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ProcessEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ProcessEvent.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ProcessEvent.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -18,7 +18,7 @@
import java.util.EventObject;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.ProcessInstance;
/**
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.ProcessInstance;
/**
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -25,9 +25,9 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.drools.common.InternalWorkingMemory;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.spi.RuleFlowGroup;
/**
@@ -74,7 +74,7 @@
}
public void fireBeforeRuleFlowProcessStarted(
- final InternalProcessInstance instance,
+ final ProcessInstance instance,
final InternalWorkingMemory workingMemory) {
if (this.listeners.isEmpty()) {
return;
@@ -88,7 +88,7 @@
}
public void fireAfterRuleFlowProcessStarted(
- final InternalProcessInstance instance,
+ final ProcessInstance instance,
final InternalWorkingMemory workingMemory) {
if (this.listeners.isEmpty()) {
return;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowNodeTriggeredEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowNodeTriggeredEvent.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowNodeTriggeredEvent.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,6 +1,6 @@
package org.drools.event;
-import org.drools.process.instance.NodeInstance;
+import org.drools.runtime.process.NodeInstance;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
/**
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
@@ -25,7 +25,7 @@
private static final long serialVersionUID = 400L;
- public RuleFlowStartedEvent(final InternalProcessInstance instance) {
+ public RuleFlowStartedEvent(final ProcessInstance instance) {
super( instance );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/process/impl/ProcessEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/process/impl/ProcessEventImpl.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/process/impl/ProcessEventImpl.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,8 +8,8 @@
import org.drools.event.knowlegebase.impl.KnowledgeRuntimeEventImpl;
import org.drools.event.process.ProcessEvent;
import org.drools.impl.StatefulKnowledgeSessionImpl;
-import org.drools.process.instance.ProcessInstance;
import org.drools.reteoo.ReteooStatefulSession;
+import org.drools.runtime.process.ProcessInstance;
public class ProcessEventImpl extends KnowledgeRuntimeEventImpl implements ProcessEvent {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeEventImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeEventImpl.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/process/impl/ProcessNodeEventImpl.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -7,7 +7,7 @@
import org.drools.WorkingMemory;
import org.drools.event.RuleFlowNodeTriggeredEvent;
import org.drools.event.process.ProcessNodeEvent;
-import org.drools.process.instance.NodeInstance;
+import org.drools.runtime.process.NodeInstance;
public class ProcessNodeEventImpl extends ProcessEventImpl implements ProcessNodeEvent {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,14 +1,15 @@
package org.drools.impl;
+import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Iterator;
+import java.util.List;
import java.util.Map;
import java.util.concurrent.Future;
import org.drools.KnowledgeBase;
-import org.drools.runtime.ObjectFilter;
import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.common.ObjectStore;
@@ -43,10 +44,10 @@
import org.drools.event.rule.impl.ObjectInsertedEventImpl;
import org.drools.event.rule.impl.ObjectRetractedEventImpl;
import org.drools.event.rule.impl.ObjectUpdatedEventImpl;
-import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.WorkItemManager;
import org.drools.reteoo.ReteooStatefulSession;
import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.process.ProcessInstance;
+import org.drools.runtime.process.WorkItemManager;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.WorkingMemoryEntryPoint;
import org.drools.time.SessionClock;
@@ -179,7 +180,9 @@
}
public Collection<ProcessInstance> getProcessInstances() {
- return this.session.getProcessInstances();
+ List<ProcessInstance> result = new ArrayList<ProcessInstance>();
+ result.addAll(this.session.getProcessInstances());
+ return result;
}
public WorkItemManager getWorkItemManager() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -30,11 +30,9 @@
import org.drools.concurrent.ExecutorService;
import org.drools.process.core.context.swimlane.SwimlaneContext;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.InternalWorkItemManager;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.NodeInstanceContainer;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.WorkItem;
+import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.context.swimlane.SwimlaneContextInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.process.instance.impl.WorkItemImpl;
@@ -66,6 +64,8 @@
import org.drools.rule.Package;
import org.drools.rule.Rule;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.NodeInstanceContainer;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.FactHandleFactory;
@@ -758,7 +758,7 @@
}
}
- public static InternalProcessInstance readProcessInstance(MarshallerReaderContext context) throws IOException {
+ public static ProcessInstance readProcessInstance(MarshallerReaderContext context) throws IOException {
ObjectInputStream stream = context.stream;
InternalRuleBase ruleBase = context.ruleBase;
InternalWorkingMemory wm = context.wm;
@@ -919,7 +919,7 @@
ObjectInputStream stream = context.stream;
while ( stream.readShort() == PersisterEnums.WORK_ITEM ) {
WorkItem workItem = readWorkItem( context );
- ((InternalWorkItemManager) wm.getWorkItemManager()).internalAddWorkItem( workItem );
+ ((WorkItemManager) wm.getWorkItemManager()).internalAddWorkItem( workItem );
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -28,11 +28,8 @@
import org.drools.common.WorkingMemoryAction;
import org.drools.process.core.context.swimlane.SwimlaneContext;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.InternalWorkItemManager;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.WorkItem;
+import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.context.swimlane.SwimlaneContextInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.process.instance.timer.TimerInstance;
@@ -52,6 +49,8 @@
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.WorkItem;
import org.drools.spi.ActivationGroup;
import org.drools.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
@@ -712,15 +711,15 @@
public static void writeProcessInstances(MarshallerWriteContext context) throws IOException {
ObjectOutputStream stream = context.stream;
- List<ProcessInstance> processInstances = new ArrayList<ProcessInstance>( context.wm.getProcessInstances() );
+ List<org.drools.runtime.process.ProcessInstance> processInstances = new ArrayList<org.drools.runtime.process.ProcessInstance>( context.wm.getProcessInstances() );
Collections.sort( processInstances,
- new Comparator<ProcessInstance>() {
- public int compare(ProcessInstance o1,
- ProcessInstance o2) {
- return (int) ((( InternalProcessInstance )o1).getId() - (( InternalProcessInstance )o2).getId());
+ new Comparator<org.drools.runtime.process.ProcessInstance>() {
+ public int compare(org.drools.runtime.process.ProcessInstance o1,
+ org.drools.runtime.process.ProcessInstance o2) {
+ return (int) (o1.getId() - o2.getId());
}
} );
- for ( ProcessInstance processInstance : processInstances ) {
+ for ( org.drools.runtime.process.ProcessInstance processInstance : processInstances ) {
stream.writeShort( PersisterEnums.PROCESS_INSTANCE );
writeProcessInstance( context,
(RuleFlowProcessInstance) processInstance );
@@ -885,7 +884,7 @@
ObjectOutputStream stream = context.stream;
List<WorkItem> workItems = new ArrayList<WorkItem>(
- ((InternalWorkItemManager) context.wm.getWorkItemManager()).getWorkItems() );
+ ((WorkItemManager) context.wm.getWorkItemManager()).getWorkItems() );
Collections.sort( workItems,
new Comparator<WorkItem>() {
public int compare(WorkItem o1,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,6 +1,6 @@
package org.drools.process.command;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.WorkingMemory;
public class SignalEventCommand implements Command {
@@ -34,7 +34,7 @@
}
public Object execute(WorkingMemory workingMemory) {
- InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.getProcessInstance(processInstanceId);
+ ProcessInstance processInstance = ( ProcessInstance ) workingMemory.getProcessInstance(processInstanceId);
if (processInstance != null) {
processInstance.signalEvent(eventType, processInstance);
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -4,7 +4,7 @@
import java.util.List;
import java.util.Map;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.WorkingMemory;
public class StartProcessCommand implements Command {
@@ -43,7 +43,7 @@
workingMemory.insert(o);
}
}
- InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.startProcess(processId, parameters);
+ ProcessInstance processInstance = ( ProcessInstance ) workingMemory.startProcess(processId, parameters);
workingMemory.fireAllRules();
return processInstance;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,6 +1,7 @@
package org.drools.process.instance;
import org.drools.process.core.Context;
+import org.drools.runtime.process.ProcessInstance;
/**
*
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,55 +0,0 @@
-package org.drools.process.instance;
-
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import org.drools.Agenda;
-import org.drools.common.InternalWorkingMemory;
-import org.drools.definition.process.Process;
-import org.drools.WorkingMemory;
-
-/**
- * A process instance is the representation of a process during its execution.
- * It contains all the runtime status information about the running process.
- * A process can have multiple instances.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public interface InternalProcessInstance extends ProcessInstance, ContextInstanceContainer, ContextableInstance {
-
- void setId(long id);
-
- void setProcess(Process process);
-
- Process getProcess();
-
- void setState(int state);
-
- void setWorkingMemory(InternalWorkingMemory workingMemory);
-
- WorkingMemory getWorkingMemory();
-
- Agenda getAgenda();
-
- void start();
-
- void addEventListener(String type, EventListener eventListener, boolean external);
-
- void removeEventListener(String type, EventListener eventListener, boolean external);
-
- void signalEvent(String type, Object event);
-
-}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItem.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItem.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,24 +0,0 @@
-package org.drools.process.instance;
-
-import java.util.Map;
-
-
-/**
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public interface InternalWorkItem extends WorkItem {
-
- void setName(String name);
-
- void setParameter(String name, Object value);
-
- void setParameters(Map<String, Object> parameters);
-
- void setResults(Map<String, Object> results);
-
- void setState(int state);
-
- void setProcessInstanceId(long processInstanceId);
-
-}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItemManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItemManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItemManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,21 +0,0 @@
-package org.drools.process.instance;
-
-import java.util.Set;
-
-/**
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public interface InternalWorkItemManager extends WorkItemManager {
-
- void internalExecuteWorkItem(WorkItem workItem);
-
- void internalAddWorkItem(WorkItem workItem);
-
- void internalAbortWorkItem(long id);
-
- Set<WorkItem> getWorkItems();
-
- WorkItem getWorkItem(long id);
-
-}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstance.java (from rev 23757, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstance.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,56 @@
+package org.drools.process.instance;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.drools.Agenda;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.definition.process.Process;
+import org.drools.runtime.process.EventListener;
+import org.drools.WorkingMemory;
+
+/**
+ * A process instance is the representation of a process during its execution.
+ * It contains all the runtime status information about the running process.
+ * A process can have multiple instances.
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface ProcessInstance extends org.drools.runtime.process.ProcessInstance, ContextInstanceContainer, ContextableInstance {
+
+ void setId(long id);
+
+ void setProcess(Process process);
+
+ Process getProcess();
+
+ void setState(int state);
+
+ void setWorkingMemory(InternalWorkingMemory workingMemory);
+
+ WorkingMemory getWorkingMemory();
+
+ Agenda getAgenda();
+
+ void start();
+
+ void addEventListener(String type, EventListener eventListener, boolean external);
+
+ void removeEventListener(String type, EventListener eventListener, boolean external);
+
+ void signalEvent(String type, Object event);
+
+}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -6,6 +6,6 @@
*/
public interface ProcessInstanceFactory {
- InternalProcessInstance createProcessInstance();
+ ProcessInstance createProcessInstance();
}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItem.java (from rev 23757, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItem.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItem.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItem.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,23 @@
+package org.drools.process.instance;
+
+import java.util.Map;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface WorkItem extends org.drools.runtime.process.WorkItem {
+
+ void setName(String name);
+
+ void setParameter(String name, Object value);
+
+ void setParameters(Map<String, Object> parameters);
+
+ void setResults(Map<String, Object> results);
+
+ void setState(int state);
+
+ void setProcessInstanceId(long processInstanceId);
+
+}
Added: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemHandler.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,9 @@
+package org.drools.process.instance;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface WorkItemHandler extends org.drools.runtime.process.WorkItemHandler {
+
+}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemListener.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemListener.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemListener.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,5 +1,7 @@
package org.drools.process.instance;
+import org.drools.runtime.process.WorkItem;
+
public interface WorkItemListener {
void workItemCompleted(WorkItem workItem);
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemManager.java (from rev 23757, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalWorkItemManager.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemManager.java (rev 0)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -0,0 +1,21 @@
+package org.drools.process.instance;
+
+import java.util.Set;
+
+/**
+ *
+ * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
+ */
+public interface WorkItemManager extends org.drools.runtime.process.WorkItemManager {
+
+ void internalExecuteWorkItem(WorkItem workItem);
+
+ void internalAddWorkItem(WorkItem workItem);
+
+ void internalAbortWorkItem(long id);
+
+ Set<WorkItem> getWorkItems();
+
+ WorkItem getWorkItem(long id);
+
+}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemManagerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemManagerFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/WorkItemManagerFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,6 +1,7 @@
package org.drools.process.instance;
import org.drools.WorkingMemory;
+import org.drools.runtime.process.WorkItemManager;
public interface WorkItemManagerFactory {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -7,7 +7,6 @@
import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.drools.process.core.context.exception.ExceptionHandler;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
@@ -36,7 +35,7 @@
if (faultVariable != null) {
context.setVariable(faultVariable, params);
}
- action.execute(knowledgeHelper, ((InternalProcessInstance) processInstance).getWorkingMemory(), context);
+ action.execute(knowledgeHelper, ((ProcessInstance) processInstance).getWorkingMemory(), context);
} catch (Exception e) {
throw new RuntimeException("unable to execute Action", e);
}
@@ -46,7 +45,7 @@
}
private KnowledgeHelper createKnowledgeHelper() {
- WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
+ WorkingMemory workingMemory = ((ProcessInstance) getProcessInstance()).getWorkingMemory();
if ( ((InternalRuleBase) workingMemory.getRuleBase()).getConfiguration().isSequential() ) {
return new SequentialKnowledgeHelper( workingMemory );
} else {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/event/DefaultSignalManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/event/DefaultSignalManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/event/DefaultSignalManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,8 +5,8 @@
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.drools.process.instance.EventListener;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.EventListener;
+import org.drools.runtime.process.ProcessInstance;
public class DefaultSignalManager implements SignalManager {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/event/SignalManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/event/SignalManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/event/SignalManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,7 +1,7 @@
package org.drools.process.instance.event;
-import org.drools.process.instance.EventListener;
-import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.EventListener;
+import org.drools.runtime.process.ProcessInstance;
public interface SignalManager {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,7 +5,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceManager;
@@ -15,12 +14,12 @@
private int processCounter = 0;
public void addProcessInstance(ProcessInstance processInstance) {
- ((InternalProcessInstance)processInstance).setId(++processCounter);
+ ((ProcessInstance)processInstance).setId(++processCounter);
internalAddProcessInstance(processInstance);
}
public void internalAddProcessInstance(ProcessInstance processInstance) {
- processInstances.put(((InternalProcessInstance)processInstance).getId(), processInstance);
+ processInstances.put(((ProcessInstance)processInstance).getId(), processInstance);
}
public Collection<ProcessInstance> getProcessInstances() {
@@ -36,6 +35,6 @@
}
public void internalRemoveProcessInstance(ProcessInstance processInstance) {
- processInstances.remove(((InternalProcessInstance)processInstance).getId());
+ processInstances.remove(((ProcessInstance)processInstance).getId());
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,18 +9,17 @@
import java.util.Map;
import java.util.Set;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.InternalWorkItem;
-import org.drools.process.instance.InternalWorkItemManager;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
import org.drools.WorkingMemory;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.WorkItem;
+import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItemHandler;
/**
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class DefaultWorkItemManager implements InternalWorkItemManager, Externalizable {
+public class DefaultWorkItemManager implements WorkItemManager, Externalizable {
private static final long serialVersionUID = 400L;
@@ -86,12 +85,12 @@
}
public void completeWorkItem(long id, Map<String, Object> results) {
- InternalWorkItem workItem = (InternalWorkItem) workItems.get(new Long(id));
+ WorkItem workItem = (WorkItem) workItems.get(new Long(id));
// work item may have been aborted
if (workItem != null) {
- workItem.setResults(results);
- InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.getProcessInstance(workItem.getProcessInstanceId());
- workItem.setState(WorkItem.COMPLETED);
+ ((org.drools.process.instance.WorkItem) workItem).setResults(results);
+ ProcessInstance processInstance = ( ProcessInstance ) workingMemory.getProcessInstance(workItem.getProcessInstanceId());
+ ((org.drools.process.instance.WorkItem) workItem).setState(WorkItem.COMPLETED);
// process instance may have finished already
if (processInstance != null) {
processInstance.signalEvent("workItemCompleted", workItem);
@@ -105,7 +104,7 @@
WorkItemImpl workItem = (WorkItemImpl) workItems.get(new Long(id));
// work item may have been aborted
if (workItem != null) {
- InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.getProcessInstance(workItem.getProcessInstanceId());
+ ProcessInstance processInstance = ( ProcessInstance ) workingMemory.getProcessInstance(workItem.getProcessInstanceId());
workItem.setState(WorkItem.ABORTED);
// process instance may have finished already
if (processInstance != null) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,13 +5,13 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.process.instance.InternalWorkItemManager;
+import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.WorkItemManagerFactory;
import org.drools.WorkingMemory;
public class DefaultWorkItemManagerFactory implements WorkItemManagerFactory, Externalizable {
- public InternalWorkItemManager createWorkItemManager(WorkingMemory workingMemory) {
+ public WorkItemManager createWorkItemManager(WorkingMemory workingMemory) {
return new DefaultWorkItemManager(workingMemory);
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -29,14 +29,14 @@
import org.drools.process.core.Context;
import org.drools.process.core.ContextContainer;
import org.drools.process.instance.ContextInstance;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
/**
* Default implementation of a process instance.
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public abstract class ProcessInstanceImpl implements InternalProcessInstance, Serializable {
+public abstract class ProcessInstanceImpl implements ProcessInstance, Serializable {
private static final long serialVersionUID = 4L;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/WorkItemImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/WorkItemImpl.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/WorkItemImpl.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,13 +5,13 @@
import java.util.Iterator;
import java.util.Map;
-import org.drools.process.instance.InternalWorkItem;
+import org.drools.process.instance.WorkItem;
/**
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class WorkItemImpl implements InternalWorkItem, Serializable {
+public class WorkItemImpl implements WorkItem, Serializable {
private static final long serialVersionUID = 400L;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/DoNothingWorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/DoNothingWorkItemHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/DoNothingWorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,8 +1,8 @@
package org.drools.process.instance.impl.demo;
-import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemManager;
/**
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/SystemOutWorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/SystemOutWorkItemHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/SystemOutWorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,8 +1,8 @@
package org.drools.process.instance.impl.demo;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
/**
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/UIWorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/UIWorkItemHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/UIWorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -24,9 +24,9 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
/**
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/UIWorkItemHandlerDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/UIWorkItemHandlerDialog.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/demo/UIWorkItemHandlerDialog.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -18,7 +18,7 @@
import javax.swing.JTextArea;
import javax.swing.JTextField;
-import org.drools.process.instance.WorkItem;
+import org.drools.runtime.process.WorkItem;
/**
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/humantask/HumanTaskDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/humantask/HumanTaskDialog.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/humantask/HumanTaskDialog.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -26,7 +26,7 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import org.drools.process.instance.WorkItem;
+import org.drools.runtime.process.WorkItem;
/**
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/humantask/HumanTaskHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/humantask/HumanTaskHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/humantask/HumanTaskHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -26,9 +26,9 @@
import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
/**
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,7 +9,6 @@
import java.util.Map;
import org.drools.WorkingMemory;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.time.Job;
import org.drools.time.JobContext;
@@ -127,7 +126,7 @@
ctx.getTimer().setLastTriggered(new Date());
- InternalProcessInstance processInstance = ( InternalProcessInstance ) workingMemory.getProcessInstance( processInstanceId );
+ ProcessInstance processInstance = ( ProcessInstance ) workingMemory.getProcessInstance( processInstanceId );
// process instance may have finished already
if ( processInstance != null ) {
workingMemory.getSignalManager().signalEvent(processInstance, "timerTriggered", ctx.getTimer());
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,14 +5,14 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
public class RuleFlowProcessInstanceFactory implements ProcessInstanceFactory, Externalizable {
private static final long serialVersionUID = 400L;
- public InternalProcessInstance createProcessInstance() {
+ public ProcessInstance createProcessInstance() {
return new RuleFlowProcessInstance();
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ProcessContext.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ProcessContext.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ProcessContext.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,10 +1,9 @@
package org.drools.spi;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.runtime.process.NodeInstance;
public class ProcessContext {
@@ -16,7 +15,7 @@
return processInstance;
}
if (nodeInstance != null) {
- return nodeInstance.getProcessInstance();
+ return (ProcessInstance) nodeInstance.getProcessInstance();
}
return null;
}
@@ -40,7 +39,7 @@
nodeInstance).resolveContextInstance(VariableScope.VARIABLE_SCOPE, variableName);
}
if (variableScope == null) {
- variableScope = (VariableScopeInstance) ((InternalProcessInstance)
+ variableScope = (VariableScopeInstance) ((ProcessInstance)
getProcessInstance()).getContextInstance(VariableScope.VARIABLE_SCOPE);
}
return variableScope.getVariable(variableName);
@@ -53,16 +52,16 @@
nodeInstance).resolveContextInstance(VariableScope.VARIABLE_SCOPE, variableName);
}
if (variableScope == null) {
- variableScope = (VariableScopeInstance) ((InternalProcessInstance)
- getProcessInstance()).getContextInstance(VariableScope.VARIABLE_SCOPE);
+ variableScope = (VariableScopeInstance) getProcessInstance().getContextInstance(VariableScope.VARIABLE_SCOPE);
if (variableScope.getVariableScope().findVariable(variableName) == null) {
variableScope = null;
}
}
if (variableScope == null) {
System.err.println("Could not find variable " + variableName);
- System.err.println("Continuing without setting value");
- return;
+ System.err.println("Using process-level scope");
+ variableScope = (VariableScopeInstance) ((ProcessInstance)
+ getProcessInstance()).getContextInstance(VariableScope.VARIABLE_SCOPE);
}
variableScope.setVariable(variableName, value);
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -28,9 +28,9 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface NodeInstance extends org.drools.process.instance.NodeInstance {
+public interface NodeInstance extends org.drools.runtime.process.NodeInstance {
- void trigger(org.drools.process.instance.NodeInstance from, String type);
+ void trigger(org.drools.runtime.process.NodeInstance from, String type);
void cancel();
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -4,13 +4,12 @@
import org.drools.definition.process.Node;
import org.drools.definition.process.NodeContainer;
-import org.drools.process.instance.NodeInstance;
/**
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface NodeInstanceContainer extends org.drools.process.instance.NodeInstanceContainer {
+public interface NodeInstanceContainer extends org.drools.runtime.process.NodeInstanceContainer {
Collection<NodeInstance> getNodeInstances(boolean recursive);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -6,9 +6,9 @@
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
import org.drools.definition.process.WorkflowProcess;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
@@ -32,7 +32,7 @@
return;
}
((WorkflowProcessInstanceImpl) processInstance).disconnect();
- ((InternalProcessInstance) processInstance).setProcess(process);
+ ((ProcessInstance) processInstance).setProcess(process);
for (NodeInstance nodeInstance: processInstance.getNodeInstances()) {
Long oldNodeId = nodeInstance.getNodeId();
Long newNodeId = nodeMapping.get(oldNodeId);
@@ -46,7 +46,7 @@
((NodeInstanceImpl) nodeInstance).setNodeId(newNodeId);
}
}
- ((InternalProcessInstance) processInstance).setWorkingMemory((InternalWorkingMemory) workingMemory);
+ ((ProcessInstance) processInstance).setWorkingMemory((InternalWorkingMemory) workingMemory);
((WorkflowProcessInstanceImpl) processInstance).reconnect();
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -7,9 +7,9 @@
import org.drools.base.SequentialKnowledgeHelper;
import org.drools.common.InternalRuleBase;
import org.drools.process.core.context.exception.ExceptionScope;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.exception.ExceptionScopeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
@@ -49,7 +49,7 @@
protected KnowledgeHelper createKnowledgeHelper() {
KnowledgeHelper knowledgeHelper = null;
- WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
+ WorkingMemory workingMemory = ((ProcessInstance) getProcessInstance()).getWorkingMemory();
if (((InternalRuleBase) workingMemory.getRuleBase()).getConfiguration().isSequential()) {
knowledgeHelper = new SequentialKnowledgeHelper(workingMemory);
} else {
@@ -63,7 +63,7 @@
ProcessContext context = new ProcessContext();
context.setNodeInstance(this);
try {
- action.execute(knowledgeHelper, ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), context);
+ action.execute(knowledgeHelper, ((ProcessInstance) getProcessInstance()).getWorkingMemory(), context);
} catch (Exception exception) {
String exceptionName = exception.getClass().getName();
ExceptionScopeInstance exceptionScopeInstance = (ExceptionScopeInstance)
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,9 +1,9 @@
package org.drools.workflow.instance.impl;
import org.drools.definition.process.Node;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.NodeInstanceContainer;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.NodeInstanceContainer;
+import org.drools.runtime.process.WorkflowProcessInstance;
public interface NodeInstanceFactory {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -27,10 +27,10 @@
import org.drools.process.core.ContextContainer;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.NodeInstanceContainer;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.NodeInstanceContainer;
+import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.workflow.core.impl.NodeImpl;
/**
@@ -102,7 +102,7 @@
if (getNode().getMetaData("hidden") != null) {
hidden = true;
}
- WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
+ WorkingMemory workingMemory = ((ProcessInstance) getProcessInstance()).getWorkingMemory();
if (!hidden) {
((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeTriggered(this, (InternalWorkingMemory) workingMemory);
}
@@ -128,7 +128,7 @@
if (getNode().getMetaData("hidden") != null) {
hidden = true;
}
- WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
+ WorkingMemory workingMemory = ((ProcessInstance) getProcessInstance()).getWorkingMemory();
if (!hidden) {
((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeLeft(this, (InternalWorkingMemory) workingMemory);
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -22,7 +22,7 @@
import java.io.ObjectOutput;
import org.drools.definition.process.Connection;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.spi.CompiledInvoker;
import org.drools.spi.ProcessContext;
import org.drools.spi.ReturnValueEvaluator;
@@ -118,7 +118,7 @@
try {
ProcessContext context = new ProcessContext();
context.setNodeInstance( instance );
- value = this.evaluator.evaluate( ((InternalProcessInstance) instance.getProcessInstance()).getWorkingMemory(),
+ value = this.evaluator.evaluate( ((ProcessInstance) instance.getProcessInstance()).getWorkingMemory(),
context );
} catch ( Exception e ) {
throw new RuntimeException( "unable to execute ReturnValueEvaluator",
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -20,8 +20,8 @@
import org.drools.common.InternalAgenda;
import org.drools.definition.process.Connection;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.instance.node.SplitInstance;
@@ -89,7 +89,7 @@
Connection connection,
Constraint constraint) {
WorkflowProcessInstance processInstance = instance.getProcessInstance();
- InternalAgenda agenda = (InternalAgenda) ((InternalProcessInstance) processInstance).getAgenda();
+ InternalAgenda agenda = (InternalAgenda) ((ProcessInstance) processInstance).getAgenda();
String rule = "RuleFlow-Split-" + processInstance.getProcessId() + "-" + instance.getNode().getId() + "-" + connection.getTo().getId();
return agenda.isRuleActiveInRuleFlowGroup( "DROOLS_SYSTEM", rule );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -32,14 +32,14 @@
import org.drools.definition.process.Node;
import org.drools.definition.process.NodeContainer;
import org.drools.definition.process.WorkflowProcess;
-import org.drools.process.instance.EventListener;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.NodeInstanceContainer;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.impl.ProcessInstanceImpl;
+import org.drools.runtime.process.EventListener;
+import org.drools.runtime.process.NodeInstanceContainer;
+import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.workflow.core.node.EventNode;
import org.drools.workflow.core.node.EventNodeInterface;
+import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.node.EventBasedNodeInstance;
import org.drools.workflow.instance.node.EventBasedNodeInstanceInterface;
import org.drools.workflow.instance.node.EventNodeInstance;
@@ -78,8 +78,8 @@
this.nodeInstances.remove(nodeInstance);
}
- public Collection<NodeInstance> getNodeInstances() {
- return getNodeInstances(false);
+ public Collection<org.drools.runtime.process.NodeInstance> getNodeInstances() {
+ return new ArrayList(getNodeInstances(false));
}
public Collection<NodeInstance> getNodeInstances(boolean recursive) {
@@ -167,8 +167,8 @@
public void setState(final int state) {
super.setState(state);
// TODO move most of this to ProcessInstanceImpl
- if (state == InternalProcessInstance.STATE_COMPLETED
- || state == InternalProcessInstance.STATE_ABORTED) {
+ if (state == ProcessInstance.STATE_COMPLETED
+ || state == ProcessInstance.STATE_ABORTED) {
InternalWorkingMemory workingMemory = (InternalWorkingMemory) getWorkingMemory();
((EventSupport) getWorkingMemory()).getRuleFlowEventSupport()
.fireBeforeRuleFlowProcessCompleted(this, workingMemory);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,9 +1,9 @@
package org.drools.workflow.instance.impl.factory;
import org.drools.definition.process.Node;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.NodeInstanceContainer;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.NodeInstanceContainer;
+import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.workflow.instance.impl.NodeInstanceFactory;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,9 +1,9 @@
package org.drools.workflow.instance.impl.factory;
import org.drools.definition.process.Node;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.NodeInstanceContainer;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.NodeInstanceContainer;
+import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.workflow.instance.impl.NodeInstanceFactory;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -20,8 +20,8 @@
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.SequentialKnowledgeHelper;
import org.drools.common.InternalRuleBase;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
@@ -51,7 +51,7 @@
KnowledgeHelper knowledgeHelper = createKnowledgeHelper();
ProcessContext context = new ProcessContext();
context.setNodeInstance(this);
- action.execute(knowledgeHelper, ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), context);
+ action.execute(knowledgeHelper, ((ProcessInstance) getProcessInstance()).getWorkingMemory(), context);
} catch (Exception e) {
throw new RuntimeException("unable to execute Action", e);
}
@@ -63,7 +63,7 @@
}
private KnowledgeHelper createKnowledgeHelper() {
- WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
+ WorkingMemory workingMemory = ((ProcessInstance) getProcessInstance()).getWorkingMemory();
if ( ((InternalRuleBase) workingMemory.getRuleBase()).getConfiguration().isSequential() ) {
return new SequentialKnowledgeHelper( workingMemory );
} else {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeContextNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeContextNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeContextNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -10,7 +10,7 @@
import org.drools.process.core.ContextContainer;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.impl.ContextInstanceFactory;
import org.drools.process.instance.impl.ContextInstanceFactoryRegistry;
import org.drools.workflow.core.node.CompositeContextNode;
@@ -74,14 +74,14 @@
public ContextInstance getContextInstance(final Context context) {
ContextInstanceFactoryRegistry contextRegistry =
- ((InternalRuleBase) ((InternalProcessInstance) getProcessInstance())
+ ((InternalRuleBase) ((ProcessInstance) getProcessInstance())
.getWorkingMemory().getRuleBase())
.getConfiguration().getProcessContextInstanceFactoryRegistry();
ContextInstanceFactory conf = contextRegistry.getContextInstanceFactory(context);
if (conf == null) {
throw new IllegalArgumentException("Illegal context type (registry not found): " + context.getClass());
}
- ContextInstance contextInstance = (ContextInstance) conf.getContextInstance(context, this, getProcessInstance());
+ ContextInstance contextInstance = (ContextInstance) conf.getContextInstance(context, this, (ProcessInstance) getProcessInstance());
if (contextInstance == null) {
throw new IllegalArgumentException("Illegal context type (instance not found): " + context.getClass());
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -26,13 +26,13 @@
import org.drools.definition.process.Connection;
import org.drools.definition.process.Node;
import org.drools.definition.process.NodeContainer;
-import org.drools.process.instance.EventListener;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.EventListener;
+import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.workflow.core.node.CompositeNode;
import org.drools.workflow.core.node.EventNode;
import org.drools.workflow.core.node.EventNodeInterface;
+import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceFactory;
import org.drools.workflow.instance.impl.NodeInstanceFactoryRegistry;
@@ -59,7 +59,7 @@
for (Node node: getCompositeNode().getNodes()) {
if (node instanceof EventNode) {
if ("external".equals(((EventNode) node).getScope())) {
- ((InternalProcessInstance) getProcessInstance()).addEventListener(
+ ((ProcessInstance) getProcessInstance()).addEventListener(
((EventNode) node).getType(), new EventListener() {
public String[] getEventTypes() {
return null;
@@ -80,7 +80,7 @@
return getCompositeNode();
}
- public void internalTrigger(final NodeInstance from, String type) {
+ public void internalTrigger(final org.drools.runtime.process.NodeInstance from, String type) {
CompositeNode.NodeAndType nodeAndType = getCompositeNode().internalGetLinkedIncomingNode(type);
List<Connection> connections = nodeAndType.getNode().getIncomingConnections(nodeAndType.getType());
for (Iterator<Connection> iterator = connections.iterator(); iterator.hasNext(); ) {
@@ -122,8 +122,8 @@
this.nodeInstances.remove(nodeInstance);
}
- public Collection<NodeInstance> getNodeInstances() {
- return getNodeInstances(false);
+ public Collection<org.drools.runtime.process.NodeInstance> getNodeInstances() {
+ return new ArrayList(getNodeInstances(false));
}
public Collection<NodeInstance> getNodeInstances(boolean recursive) {
@@ -168,7 +168,7 @@
}
NodeInstanceFactoryRegistry nodeRegistry =
- ((InternalRuleBase) ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getRuleBase())
+ ((InternalRuleBase) ((ProcessInstance) getProcessInstance()).getWorkingMemory().getRuleBase())
.getConfiguration().getProcessNodeInstanceFactoryRegistry();
NodeInstanceFactory conf = nodeRegistry.getProcessNodeInstanceFactory(node);
if (conf == null) {
@@ -200,7 +200,7 @@
return (CompositeNode.CompositeNodeStart) getNode();
}
- public void internalTrigger(NodeInstance from, String type) {
+ public void internalTrigger(org.drools.runtime.process.NodeInstance from, String type) {
triggerCompleted();
}
@@ -218,7 +218,7 @@
return (CompositeNode.CompositeNodeEnd) getNode();
}
- public void internalTrigger(NodeInstance from, String type) {
+ public void internalTrigger(org.drools.runtime.process.NodeInstance from, String type) {
triggerCompleted();
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -19,9 +19,8 @@
import org.drools.WorkingMemory;
import org.drools.common.EventSupport;
import org.drools.common.InternalWorkingMemory;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.EndNode;
import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -50,11 +49,11 @@
if (getNode().getMetaData("hidden") != null) {
hidden = true;
}
- WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
+ WorkingMemory workingMemory = ((ProcessInstance) getProcessInstance()).getWorkingMemory();
if (!hidden) {
((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeLeft(this, (InternalWorkingMemory) workingMemory);
}
- ((InternalProcessInstance) getProcessInstance()).setState( ProcessInstance.STATE_COMPLETED );
+ ((ProcessInstance) getProcessInstance()).setState( ProcessInstance.STATE_COMPLETED );
if (!hidden) {
((EventSupport) workingMemory).getRuleFlowEventSupport().fireAfterRuleFlowNodeLeft(this, (InternalWorkingMemory) workingMemory);
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EventBasedNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EventBasedNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EventBasedNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,14 +5,13 @@
import java.util.Map;
import org.drools.process.core.timer.Timer;
-import org.drools.process.instance.EventListener;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.timer.TimerInstance;
import org.drools.process.instance.timer.TimerManager;
+import org.drools.runtime.process.EventListener;
+import org.drools.runtime.process.NodeInstance;
import org.drools.spi.KnowledgeHelper;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.EventBasedNode;
import org.drools.workflow.instance.impl.ExtendedNodeInstanceImpl;
@@ -33,10 +32,10 @@
if (timers != null) {
addTimerListener();
timerInstances = new ArrayList<Long>(timers.size());
- TimerManager timerManager = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager();
+ TimerManager timerManager = ((ProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager();
for (Timer timer: timers.keySet()) {
TimerInstance timerInstance = createTimerInstance(timer);
- timerManager.registerTimer(timerInstance, getProcessInstance());
+ timerManager.registerTimer(timerInstance, (ProcessInstance) getProcessInstance());
timerInstances.add(timerInstance.getId());
}
}
@@ -84,11 +83,11 @@
}
protected void addTimerListener() {
- ((InternalProcessInstance) getProcessInstance()).addEventListener("timerTriggered", this, false);
+ ((ProcessInstance) getProcessInstance()).addEventListener("timerTriggered", this, false);
}
public void removeEventListeners() {
- ((InternalProcessInstance) getProcessInstance()).removeEventListener("timerTriggered", this, false);
+ ((ProcessInstance) getProcessInstance()).removeEventListener("timerTriggered", this, false);
}
protected void triggerCompleted(String type, boolean remove) {
@@ -113,7 +112,7 @@
private void cancelTimers() {
// deactivate still active timers
if (timerInstances != null) {
- TimerManager timerManager = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager();
+ TimerManager timerManager = ((ProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager();
for (Long id: timerInstances) {
timerManager.cancelTimer(id);
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EventNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EventNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/EventNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -18,8 +18,8 @@
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.event.EventTransformer;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.EventNode;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -18,11 +18,10 @@
import org.drools.process.core.context.exception.ExceptionScope;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.exception.ExceptionScopeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.FaultNode;
import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -51,7 +50,7 @@
if (exceptionScopeInstance != null) {
handleException(faultName, exceptionScopeInstance);
} else {
- ((InternalProcessInstance) getProcessInstance()).setState(ProcessInstance.STATE_ABORTED);
+ ((ProcessInstance) getProcessInstance()).setState(ProcessInstance.STATE_ABORTED);
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -7,11 +7,11 @@
import org.drools.definition.process.Node;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.workflow.core.node.ForEachNode;
import org.drools.workflow.core.node.ForEachNode.ForEachJoinNode;
import org.drools.workflow.core.node.ForEachNode.ForEachSplitNode;
+import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -74,7 +74,7 @@
return (ForEachSplitNode) getNode();
}
- public void internalTrigger(NodeInstance from, String type) {
+ public void internalTrigger(org.drools.runtime.process.NodeInstance from, String type) {
String collectionExpression = getForEachNode().getCollectionExpression();
Collection<?> collection = evaluateCollectionExpression(collectionExpression);
((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
@@ -132,7 +132,7 @@
return (ForEachJoinNode) getNode();
}
- public void internalTrigger(NodeInstance from, String type) {
+ public void internalTrigger(org.drools.runtime.process.NodeInstance from, String type) {
if (getNodeInstanceContainer().getNodeInstances().size() == 1) {
((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
if (getForEachNode().isWaitForCompletion()) {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/HumanTaskNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/HumanTaskNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/HumanTaskNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,7 +1,6 @@
package org.drools.workflow.instance.node;
import org.drools.process.core.context.swimlane.SwimlaneContext;
-import org.drools.process.instance.InternalWorkItem;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.context.swimlane.SwimlaneContextInstance;
import org.drools.workflow.core.node.HumanTaskNode;
@@ -21,7 +20,7 @@
WorkItem workItem = super.createWorkItem(workItemNode);
String actorId = assignWorkItem(workItem);
if (actorId != null) {
- ((InternalWorkItem) workItem).setParameter("ActorId", actorId);
+ ((WorkItem) workItem).setParameter("ActorId", actorId);
}
return workItem;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -20,7 +20,7 @@
import java.util.Map;
import org.drools.definition.process.Connection;
-import org.drools.process.instance.NodeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.Join;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -25,8 +25,8 @@
import org.drools.event.AgendaGroupPoppedEvent;
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.MilestoneNode;
/**
@@ -51,7 +51,7 @@
String rule = "RuleFlow-Milestone-" + getProcessInstance().getProcessId()
+ "-" + getNode().getId();
- if( ((InternalAgenda) ((InternalProcessInstance) getProcessInstance())
+ if( ((InternalAgenda) ((ProcessInstance) getProcessInstance())
.getAgenda()).isRuleActiveInRuleFlowGroup( "DROOLS_SYSTEM", rule ) ) {
triggerCompleted();
} else {
@@ -65,12 +65,12 @@
}
private void addActivationListener() {
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().addEventListener(this);
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory().addEventListener(this);
}
public void removeEventListeners() {
super.removeEventListeners();
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().removeEventListener(this);
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory().removeEventListener(this);
}
public void activationCancelled(ActivationCancelledEvent event,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/RuleSetNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/RuleSetNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/RuleSetNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -18,8 +18,8 @@
import org.drools.common.InternalAgenda;
import org.drools.common.RuleFlowGroupListener;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.RuleSetNode;
/**
@@ -43,7 +43,7 @@
throw new IllegalArgumentException( "A RuleSetNode only accepts default incoming connections!" );
}
addRuleSetListener();
- ((InternalProcessInstance) getProcessInstance()).getAgenda().activateRuleFlowGroup( getRuleSetNode().getRuleFlowGroup() );
+ ((ProcessInstance) getProcessInstance()).getAgenda().activateRuleFlowGroup( getRuleSetNode().getRuleFlowGroup() );
}
public void addEventListeners() {
@@ -52,19 +52,19 @@
}
private void addRuleSetListener() {
- ((InternalAgenda) ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getAgenda()).addRuleFlowGroupListener( getRuleSetNode().getRuleFlowGroup(),
+ ((InternalAgenda) ((ProcessInstance) getProcessInstance()).getWorkingMemory().getAgenda()).addRuleFlowGroupListener( getRuleSetNode().getRuleFlowGroup(),
this );
}
public void removeEventListeners() {
super.removeEventListeners();
- ((InternalAgenda) ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getAgenda()).removeRuleFlowGroupListener( getRuleSetNode().getRuleFlowGroup(),
+ ((InternalAgenda) ((ProcessInstance) getProcessInstance()).getWorkingMemory().getAgenda()).removeRuleFlowGroupListener( getRuleSetNode().getRuleFlowGroup(),
this );
}
public void cancel() {
super.cancel();
- ((InternalProcessInstance) getProcessInstance()).getAgenda().deactivateRuleFlowGroup( getRuleSetNode().getRuleFlowGroup() );
+ ((ProcessInstance) getProcessInstance()).getAgenda().deactivateRuleFlowGroup( getRuleSetNode().getRuleFlowGroup() );
}
public void ruleFlowGroupDeactivated() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -21,7 +21,7 @@
import java.util.List;
import org.drools.definition.process.Connection;
-import org.drools.process.instance.NodeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.Split;
import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.ConstraintEvaluator;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/StartNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/StartNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/StartNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.process.instance.NodeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.StartNode;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -22,11 +22,10 @@
import org.drools.common.InternalRuleBase;
import org.drools.definition.process.Process;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.EventListener;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.runtime.process.EventListener;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.SubProcessNode;
/**
@@ -63,18 +62,18 @@
}
}
String processId = getSubProcessNode().getProcessId();
- Process process = ((InternalRuleBase) ((InternalProcessInstance) getProcessInstance())
+ Process process = ((InternalRuleBase) ((ProcessInstance) getProcessInstance())
.getWorkingMemory().getRuleBase()).getProcess(processId);
if (process == null) {
System.err.println("Could not find process " + processId);
System.err.println("Aborting process");
- ((InternalProcessInstance) getProcessInstance()).setState(InternalProcessInstance.STATE_ABORTED);
+ ((ProcessInstance) getProcessInstance()).setState(ProcessInstance.STATE_ABORTED);
} else {
- InternalProcessInstance processInstance = ( InternalProcessInstance )
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory()
+ ProcessInstance processInstance = ( ProcessInstance )
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory()
.startProcess(processId, parameters);
if (!getSubProcessNode().isWaitForCompletion()
- || processInstance.getState() == InternalProcessInstance.STATE_COMPLETED) {
+ || processInstance.getState() == ProcessInstance.STATE_COMPLETED) {
triggerCompleted();
} else {
this.processInstanceId = processInstance.getId();
@@ -86,8 +85,8 @@
public void cancel() {
super.cancel();
if (!getSubProcessNode().isIndependent()) {
- InternalProcessInstance processInstance = (InternalProcessInstance)
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory()
+ ProcessInstance processInstance = (ProcessInstance)
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory()
.getProcessInstance(processInstanceId);
processInstance.setState(ProcessInstance.STATE_ABORTED);
}
@@ -107,17 +106,17 @@
}
private void addProcessListener() {
- ((InternalProcessInstance) getProcessInstance()).addEventListener("processInstanceCompleted:" + processInstanceId, this, true);
+ ((ProcessInstance) getProcessInstance()).addEventListener("processInstanceCompleted:" + processInstanceId, this, true);
}
public void removeEventListeners() {
super.removeEventListeners();
- ((InternalProcessInstance) getProcessInstance()).removeEventListener("processInstanceCompleted:" + processInstanceId, this, true);
+ ((ProcessInstance) getProcessInstance()).removeEventListener("processInstanceCompleted:" + processInstanceId, this, true);
}
public void signalEvent(String type, Object event) {
if (("processInstanceCompleted:" + processInstanceId).equals(type)) {
- processInstanceCompleted((InternalProcessInstance) event);
+ processInstanceCompleted((ProcessInstance) event);
} else {
super.signalEvent(type, event);
}
@@ -127,7 +126,7 @@
return new String[] { "processInstanceCompleted:" + processInstanceId };
}
- public void processInstanceCompleted(InternalProcessInstance processInstance) {
+ public void processInstanceCompleted(ProcessInstance processInstance) {
removeEventListeners();
VariableScopeInstance subProcessVariableScopeInstance = (VariableScopeInstance)
processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/TimerNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/TimerNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/TimerNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,10 +1,10 @@
package org.drools.workflow.instance.node;
import org.drools.process.core.timer.Timer;
-import org.drools.process.instance.EventListener;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.timer.TimerInstance;
+import org.drools.runtime.process.EventListener;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.TimerNode;
public class TimerNodeInstance extends EventBasedNodeInstance implements EventListener {
@@ -34,8 +34,8 @@
if (getTimerInstances() == null) {
addTimerListener();
}
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager()
- .registerTimer(timer, getProcessInstance());
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager()
+ .registerTimer(timer, (ProcessInstance) getProcessInstance());
timerId = timer.getId();
}
@@ -66,20 +66,20 @@
}
public void cancel() {
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager().cancelTimer(timerId);
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager().cancelTimer(timerId);
super.cancel();
}
public void addEventListeners() {
super.addEventListeners();
if (getTimerInstances() == null) {
- ((InternalProcessInstance) getProcessInstance()).addEventListener("timerTriggered", this, false);
+ ((ProcessInstance) getProcessInstance()).addEventListener("timerTriggered", this, false);
}
}
public void removeEventListeners() {
super.removeEventListeners();
- ((InternalProcessInstance) getProcessInstance()).removeEventListener("timerTriggered", this, false);
+ ((ProcessInstance) getProcessInstance()).removeEventListener("timerTriggered", this, false);
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -26,14 +26,13 @@
import org.drools.common.InternalRuleBase;
import org.drools.process.core.Work;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.EventListener;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.InternalWorkItem;
-import org.drools.process.instance.InternalWorkItemManager;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.WorkItem;
+import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.process.instance.impl.WorkItemImpl;
+import org.drools.runtime.process.EventListener;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.node.WorkItemNode;
/**
@@ -55,7 +54,7 @@
public WorkItem getWorkItem() {
if (workItem == null && workItemId >= 0) {
- workItem = ((InternalWorkItemManager) ((InternalProcessInstance) getProcessInstance())
+ workItem = ((WorkItemManager) ((ProcessInstance) getProcessInstance())
.getWorkingMemory().getWorkItemManager()).getWorkItem(workItemId);
}
return workItem;
@@ -70,7 +69,7 @@
}
public boolean isInversionOfControl() {
- return ((InternalRuleBase) ((InternalProcessInstance) getProcessInstance())
+ return ((InternalRuleBase) ((ProcessInstance) getProcessInstance())
.getWorkingMemory().getRuleBase()).getConfiguration().isAdvancedProcessRuleIntegration();
}
@@ -87,10 +86,10 @@
addWorkItemListener();
}
if (isInversionOfControl()) {
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory()
- .update(((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getFactHandle(this), this);
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory()
+ .update(((ProcessInstance) getProcessInstance()).getWorkingMemory().getFactHandle(this), this);
} else {
- ((InternalWorkItemManager) ((InternalProcessInstance) getProcessInstance())
+ ((WorkItemManager) ((ProcessInstance) getProcessInstance())
.getWorkingMemory().getWorkItemManager()).internalExecuteWorkItem(workItem);
}
if (!workItemNode.isWaitForCompletion()) {
@@ -103,15 +102,15 @@
protected WorkItem createWorkItem(WorkItemNode workItemNode) {
Work work = workItemNode.getWork();
workItem = new WorkItemImpl();
- ((InternalWorkItem) workItem).setName(work.getName());
- ((InternalWorkItem) workItem).setProcessInstanceId(getProcessInstance().getId());
- ((InternalWorkItem) workItem).setParameters(new HashMap<String, Object>(work.getParameters()));
+ ((WorkItem) workItem).setName(work.getName());
+ ((WorkItem) workItem).setProcessInstanceId(getProcessInstance().getId());
+ ((WorkItem) workItem).setParameters(new HashMap<String, Object>(work.getParameters()));
for (Iterator<Map.Entry<String, String>> iterator = workItemNode.getInMappings().entrySet().iterator(); iterator.hasNext(); ) {
Map.Entry<String, String> mapping = iterator.next();
VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
resolveContextInstance(VariableScope.VARIABLE_SCOPE, mapping.getValue());
if (variableScopeInstance != null) {
- ((InternalWorkItem) workItem).setParameter(mapping.getKey(), variableScopeInstance.getVariable(mapping.getValue()));
+ ((WorkItem) workItem).setParameter(mapping.getKey(), variableScopeInstance.getVariable(mapping.getValue()));
} else {
System.err.println("Could not find variable scope for variable " + mapping.getValue());
System.err.println("when trying to execute Work Item " + work.getName());
@@ -142,7 +141,7 @@
for (Map.Entry<String, String> replacement: replacements.entrySet()) {
s = s.replace("#{" + replacement.getKey() + "}", replacement.getValue());
}
- ((InternalWorkItem) workItem).setParameter(entry.getKey(), s);
+ ((WorkItem) workItem).setParameter(entry.getKey(), s);
}
}
return workItem;
@@ -162,7 +161,7 @@
}
}
if (isInversionOfControl()) {
- WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
+ WorkingMemory workingMemory = ((ProcessInstance) getProcessInstance()).getWorkingMemory();
workingMemory.update(workingMemory.getFactHandle(this), this);
} else {
triggerCompleted();
@@ -171,7 +170,7 @@
public void cancel() {
if (workItemId != -1) {
- ((InternalWorkItemManager) ((InternalProcessInstance) getProcessInstance())
+ ((WorkItemManager) ((ProcessInstance) getProcessInstance())
.getWorkingMemory().getWorkItemManager()).internalAbortWorkItem(workItemId);
}
super.cancel();
@@ -183,14 +182,14 @@
}
private void addWorkItemListener() {
- ((InternalProcessInstance) getProcessInstance()).addEventListener("workItemCompleted", this, false);
- ((InternalProcessInstance) getProcessInstance()).addEventListener("workItemAborted", this, false);
+ ((ProcessInstance) getProcessInstance()).addEventListener("workItemCompleted", this, false);
+ ((ProcessInstance) getProcessInstance()).addEventListener("workItemAborted", this, false);
}
public void removeEventListeners() {
super.removeEventListeners();
- ((InternalProcessInstance) getProcessInstance()).removeEventListener("workItemCompleted", this, false);
- ((InternalProcessInstance) getProcessInstance()).removeEventListener("workItemAborted", this, false);
+ ((ProcessInstance) getProcessInstance()).removeEventListener("workItemCompleted", this, false);
+ ((ProcessInstance) getProcessInstance()).removeEventListener("workItemAborted", this, false);
}
public void signalEvent(String type, Object event) {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -12,12 +12,12 @@
import org.drools.persistence.session.MemoryPersisterManager;
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
@@ -51,24 +51,24 @@
public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
}
});
- InternalProcessInstance processInstance = ( InternalProcessInstance ) session.startProcess("org.drools.test.TestProcess");
+ ProcessInstance processInstance = ( ProcessInstance ) session.startProcess("org.drools.test.TestProcess");
long processInstanceId = processInstance.getId();
persister.setUniqueId(processInstanceId + "");
persister.save();
persister = manager.getSessionPersister(processInstanceId + "", ruleBase);
session = persister.getObject();
- processInstance = ( InternalProcessInstance ) session.getProcessInstance(processInstanceId);
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ processInstance = ( ProcessInstance ) session.getProcessInstance(processInstanceId);
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
session.getWorkItemManager().completeWorkItem(
workItems.get(processInstanceId).getId(), null);
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
persister.save();
persister = manager.getSessionPersister(processInstanceId + "", ruleBase);
session = persister.getObject();
- processInstance = ( InternalProcessInstance ) session.getProcessInstance(processInstanceId);
+ processInstance = ( ProcessInstance ) session.getProcessInstance(processInstanceId);
assertNull(processInstance);
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,12 +9,12 @@
import org.drools.persistence.session.StatefulSessionSnapshotter;
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
@@ -45,22 +45,22 @@
public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
}
});
- InternalProcessInstance processInstance = ( InternalProcessInstance ) session.startProcess("org.drools.test.TestProcess");
+ ProcessInstance processInstance = ( ProcessInstance ) session.startProcess("org.drools.test.TestProcess");
assertNotNull(workItem);
MemoryPersister pm = new MemoryPersister( new StatefulSessionSnapshotter( session ) );
pm.save();
session.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
pm.load();
- processInstance = ( InternalProcessInstance ) session.getProcessInstance(processInstance.getId());
+ processInstance = ( ProcessInstance ) session.getProcessInstance(processInstance.getId());
assertNotNull(processInstance);
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
session.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testTransactionWithRollback() throws Exception {
@@ -77,23 +77,23 @@
public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
}
});
- InternalProcessInstance processInstance = ( InternalProcessInstance ) session.startProcess("org.drools.test.TestProcess");
+ ProcessInstance processInstance = ( ProcessInstance ) session.startProcess("org.drools.test.TestProcess");
MemoryPersister pm = new MemoryPersister( new StatefulSessionSnapshotter( session ) );
Transaction t = pm.getTransaction();
t.start();
session.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
t.rollback();
- processInstance = ( InternalProcessInstance ) session.getProcessInstance(processInstance.getId());
+ processInstance = ( ProcessInstance ) session.getProcessInstance(processInstance.getId());
assertNotNull(processInstance);
- assertEquals(InternalProcessInstance.STATE_ACTIVE, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
session.getWorkItemManager().completeWorkItem(workItem.getId(), null);
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
private RuleFlowProcess getProcess() {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/EventTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/EventTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/EventTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -12,7 +12,6 @@
import org.drools.process.core.context.variable.Variable;
import org.drools.process.core.datatype.impl.type.ObjectDataType;
import org.drools.process.core.event.EventTypeFilter;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.ruleflow.core.RuleFlowProcess;
@@ -121,7 +120,7 @@
jack.setName("Jack");
processInstance.signalEvent("myEvent", jack);
assertEquals(1, myList.size());
- assertEquals(InternalProcessInstance.STATE_COMPLETED, processInstance.getState());
+ assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
}
public void testEvent2() {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/SubProcessTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/SubProcessTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/SubProcessTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -7,11 +7,11 @@
import org.drools.common.InternalWorkingMemory;
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -29,7 +29,7 @@
import org.drools.common.DefaultFactHandle;
import org.drools.common.PropagationContextImpl;
import org.drools.common.RuleFlowGroupImpl;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Rule;
import org.drools.ruleflow.core.RuleFlowProcess;
@@ -211,7 +211,7 @@
final RuleFlowProcessInstance processInstance = new RuleFlowProcessInstance();
processInstance.setWorkingMemory( workingMemory );
processInstance.setProcess( process );
- assertEquals( InternalProcessInstance.STATE_PENDING,
+ assertEquals( ProcessInstance.STATE_PENDING,
processInstance.getState() );
final RuleFlowGroupImpl ruleFlowGroup0 = (RuleFlowGroupImpl) agenda.getRuleFlowGroup( "rule-flow-group-0" );
@@ -274,7 +274,7 @@
// Activate process instance, the activations stay in the group,
// but should now also be in the Agenda
processInstance.start();
- assertEquals( InternalProcessInstance.STATE_ACTIVE,
+ assertEquals( ProcessInstance.STATE_ACTIVE,
processInstance.getState() );
assertEquals( 2,
ruleFlowGroup0.size() );
@@ -337,7 +337,7 @@
ruleFlowGroup3.size() );
assertEquals( 0,
agenda.agendaSize() );
- assertEquals( InternalProcessInstance.STATE_COMPLETED,
+ assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
}
@@ -521,7 +521,7 @@
final RuleFlowProcessInstance processInstance = new RuleFlowProcessInstance();
processInstance.setWorkingMemory( workingMemory );
processInstance.setProcess( process );
- assertEquals( InternalProcessInstance.STATE_PENDING,
+ assertEquals( ProcessInstance.STATE_PENDING,
processInstance.getState() );
final RuleFlowGroupImpl ruleFlowGroup0 = (RuleFlowGroupImpl) agenda.getRuleFlowGroup( "rule-flow-group-0" );
@@ -604,7 +604,7 @@
// Activate process instance, the activations stay in the group,
// but should now also be in the Agenda
processInstance.start();
- assertEquals( InternalProcessInstance.STATE_ACTIVE,
+ assertEquals( ProcessInstance.STATE_ACTIVE,
processInstance.getState() );
assertEquals( 2,
ruleFlowGroup0.size() );
@@ -655,7 +655,7 @@
ruleFlowGroup3.size() );
assertEquals( 0,
agenda.agendaSize() );
- assertEquals( InternalProcessInstance.STATE_COMPLETED,
+ assertEquals( ProcessInstance.STATE_COMPLETED,
processInstance.getState() );
}
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/EndNodeInstanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/EndNodeInstanceTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/EndNodeInstanceTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,7 +8,7 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.common.InternalWorkingMemory;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.ConnectionImpl;
@@ -39,13 +39,13 @@
process.addNode( endNode );
RuleFlowProcessInstance processInstance = new RuleFlowProcessInstance();
- processInstance.setState( InternalProcessInstance.STATE_ACTIVE );
+ processInstance.setState( ProcessInstance.STATE_ACTIVE );
processInstance.setProcess( process );
processInstance.setWorkingMemory( (InternalWorkingMemory) session );
MockNodeInstance mockNodeInstance = ( MockNodeInstance ) processInstance.getNodeInstance( mockNode );
mockNodeInstance.triggerCompleted();
- assertEquals( InternalProcessInstance.STATE_COMPLETED, processInstance.getState() );
+ assertEquals( ProcessInstance.STATE_COMPLETED, processInstance.getState() );
}
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,7 +9,7 @@
import java.util.Map;
import org.drools.definition.process.Node;
-import org.drools.process.instance.NodeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
public class MockNodeInstance extends NodeInstanceImpl {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -4,9 +4,9 @@
package org.drools.workflow.instance.node;
import org.drools.definition.process.Node;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.NodeInstanceContainer;
-import org.drools.process.instance.WorkflowProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.NodeInstanceContainer;
+import org.drools.runtime.process.WorkflowProcessInstance;
import org.drools.workflow.instance.impl.NodeInstanceFactory;
public class MockNodeInstanceFactory implements NodeInstanceFactory {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -11,10 +11,10 @@
import org.drools.StatefulSession;
import org.drools.common.InternalWorkingMemory;
import org.drools.definition.process.Node;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.impl.ConnectionImpl;
import org.drools.workflow.core.node.StartNode;
@@ -48,9 +48,9 @@
processInstance.setProcess( process );
processInstance.setWorkingMemory( (InternalWorkingMemory) session );
- assertEquals( InternalProcessInstance.STATE_PENDING, processInstance.getState() );
+ assertEquals( ProcessInstance.STATE_PENDING, processInstance.getState() );
processInstance.start();
- assertEquals( InternalProcessInstance.STATE_ACTIVE, processInstance.getState() );
+ assertEquals( ProcessInstance.STATE_ACTIVE, processInstance.getState() );
MockNodeInstance mockNodeInstance = mockNodeFactory.getMockNodeInstance();
List<NodeInstance> triggeredBy =
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELAssignInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELAssignInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELAssignInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -17,9 +17,9 @@
import org.drools.bpel.xpath.XPathReturnValueEvaluator;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.datatype.DataType;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.spi.ProcessContext;
import org.drools.workflow.core.Node;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -117,7 +117,7 @@
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(this);
return (String) evaluator.evaluate(
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.STRING);
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.STRING);
} catch (Throwable t) {
throw new IllegalArgumentException("Could not evaluate expression " + expression, t);
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFlowInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFlowInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELFlowInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -6,7 +6,7 @@
import java.util.Map;
import org.drools.bpel.core.BPELFlow;
-import org.drools.process.instance.NodeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.Node;
import org.drools.workflow.instance.node.CompositeNodeInstance;
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELLinkManager.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELLinkManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELLinkManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -4,9 +4,9 @@
import org.drools.bpel.core.BPELActivity.SourceLink;
import org.drools.bpel.core.BPELActivity.TargetLink;
import org.drools.bpel.xpath.XPathReturnValueEvaluator;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.NodeInstanceContainer;
+import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.NodeInstanceContainer;
import org.drools.spi.ProcessContext;
import org.drools.util.ArrayUtils;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -75,7 +75,7 @@
evaluator.setExpression(transitionCondition);
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(activityInstance);
- return (Boolean) evaluator.evaluate(((InternalProcessInstance) activityInstance.getProcessInstance()).getWorkingMemory(), processContext);
+ return (Boolean) evaluator.evaluate(((ProcessInstance) activityInstance.getProcessInstance()).getWorkingMemory(), processContext);
} catch (Throwable t) {
throw new IllegalArgumentException("Could not evaluate transition condition " + transitionCondition, t);
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,7 +1,7 @@
package org.drools.bpel.instance;
import org.drools.bpel.core.BPELProcess;
-import org.drools.process.instance.NodeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.Node;
import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELProcessInstanceFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,14 +5,14 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
public class BPELProcessInstanceFactory implements ProcessInstanceFactory, Externalizable {
private static final long serialVersionUID = 400L;
- public InternalProcessInstance createProcessInstance() {
+ public ProcessInstance createProcessInstance() {
return new BPELProcessInstance();
}
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELReceiveInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELReceiveInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELReceiveInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -2,8 +2,8 @@
import org.drools.bpel.core.BPELReceive;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.core.Node;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import org.drools.workflow.instance.node.EventNodeInstanceInterface;
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELRethrowInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -3,12 +3,11 @@
import org.drools.bpel.core.BPELFaultHandlerScope;
import org.drools.process.core.context.exception.ExceptionScope;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.NodeInstanceContainer;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.exception.ExceptionScopeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.NodeInstanceContainer;
import org.drools.workflow.instance.node.CompositeContextNodeInstance;
import org.drools.workflow.instance.node.FaultNodeInstance;
@@ -35,7 +34,7 @@
NodeInstanceContainer nodeInstanceContainer = scopeInstance.getNodeInstanceContainer();
if (nodeInstanceContainer instanceof ProcessInstance) {
return (ExceptionScopeInstance)
- ((InternalProcessInstance) nodeInstanceContainer)
+ ((ProcessInstance) nodeInstanceContainer)
.getContextInstance(ExceptionScope.EXCEPTION_SCOPE);
}
if (nodeInstanceContainer instanceof NodeInstance) {
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELWaitInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELWaitInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/BPELWaitInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -10,7 +10,7 @@
import org.drools.bpel.core.BPELWait;
import org.drools.bpel.xpath.XPathReturnValueEvaluator;
import org.drools.process.core.timer.Timer;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.spi.ProcessContext;
import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.node.TimerNodeInstance;
@@ -53,7 +53,7 @@
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(this);
String literal = (String) evaluator.evaluate(
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.STRING);
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.STRING);
Calendar cal = Calendar.getInstance();
Duration duration = new Duration(literal);
@@ -76,7 +76,7 @@
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(this);
List literal = (List) evaluator.evaluate(
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.NODESET);
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.NODESET);
Calendar calendar = null;
if (literal.size() == 0) {
throw new IllegalArgumentException("No results for timer until");
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/CopyOfBPELAssignInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/CopyOfBPELAssignInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/instance/CopyOfBPELAssignInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -18,9 +18,9 @@
import org.drools.bpel.xpath.XPathReturnValueEvaluator;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.datatype.DataType;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.spi.ProcessContext;
import org.drools.workflow.core.Node;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -427,7 +427,7 @@
ProcessContext processContext = new ProcessContext();
processContext.setNodeInstance(this);
return (String) evaluator.evaluate(
- ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.STRING);
+ ((ProcessInstance) getProcessInstance()).getWorkingMemory(), processContext, XPathConstants.STRING);
} catch (Throwable t) {
throw new IllegalArgumentException(
"Could not evaluate expression " + expression, t);
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/xpath/XPathReturnValueEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/xpath/XPathReturnValueEvaluator.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/main/java/org/drools/bpel/xpath/XPathReturnValueEvaluator.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -21,7 +21,7 @@
import org.apache.ode.utils.Namespaces;
import org.drools.WorkingMemory;
import org.drools.bpel.core.BPELProcess;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.spi.ProcessContext;
import org.drools.spi.ReturnValueEvaluator;
import org.w3c.dom.Document;
@@ -85,7 +85,7 @@
}
});
XPathEvaluator xpe = (XPathEvaluator) xpf.newXPath();
- xpe.setNamespaceContext(((BPELProcess) ((InternalProcessInstance)
+ xpe.setNamespaceContext(((BPELProcess) ((ProcessInstance)
processContext.getNodeInstance().getProcessInstance())
.getProcess()).getNamespaceContext());
XPathExpression xpathExpression = xpe.compile(expression);
Modified: labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELTestUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELTestUtil.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-bpel/src/test/java/org/drools/bpel/test/BPELTestUtil.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -7,7 +7,6 @@
import org.drools.WorkingMemory;
import org.drools.bpel.instance.BPELProcessInstance;
-import org.drools.process.instance.InternalWorkItemManager;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
@@ -19,7 +18,7 @@
public static WorkItem findWebServiceInvocation(WorkingMemory workingMemory, String partnerLink, String portType, String operation) {
Set<WorkItem> workItems =
- ((InternalWorkItemManager) workingMemory.getWorkItemManager()).getWorkItems();
+ ((WorkItemManager) workingMemory.getWorkItemManager()).getWorkItems();
for (Iterator<WorkItem> iterator = workItems.iterator(); iterator.hasNext(); ) {
WorkItem workItem = iterator.next();
if ("WebServiceInvocation".equals(workItem.getName())
@@ -69,7 +68,7 @@
public static class WebServiceInvocationHandler implements WorkItemHandler {
- public void executeWorkItem(WorkItem workItem, WorkItemManager manager) {
+ public void executeWorkItem(org.drools.runtime.process.WorkItem workItem, org.drools.runtime.process.WorkItemManager manager) {
System.out.println("Web service invoked "
+ workItem.getParameter("PartnerLink") + " "
+ workItem.getParameter("PortType") + " "
@@ -79,7 +78,7 @@
+ workItem.getParameter("Message"));
}
- public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
+ public void abortWorkItem(org.drools.runtime.process.WorkItem workItem, org.drools.runtime.process.WorkItemManager manager) {
System.out.println("Web service invocation aborted "
+ workItem.getParameter("PartnerLink") + " "
+ workItem.getParameter("PortType") + " "
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/DroolsWorkflow.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/DroolsWorkflow.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/DroolsWorkflow.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -11,7 +11,6 @@
import org.drools.osworkflow.core.OSWorkflowProcess;
import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
import org.drools.osworkflow.instance.node.StepNodeInstance;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
@@ -86,7 +85,7 @@
public int[] getAvailableActions(long id, Map inputs) {
List<Integer> ids = new ArrayList<Integer>();
OSWorkflowProcessInstance processInstance = findProcessInstance(id);
- for (NodeInstance nodeInstance: processInstance.getNodeInstances()) {
+ for (org.drools.runtime.process.NodeInstance nodeInstance: processInstance.getNodeInstances()) {
if (nodeInstance instanceof StepNodeInstance) {
StepNodeInstance stepNodeInstance = (StepNodeInstance) nodeInstance;
ids.addAll(stepNodeInstance.getAvailableActions());
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -10,9 +10,9 @@
import org.drools.osworkflow.core.OSWorkflowProcess;
import org.drools.osworkflow.instance.node.StepNodeInstance;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
import com.opensymphony.module.propertyset.PropertySet;
@@ -67,7 +67,7 @@
}
public void doAction(int actionId, Map inputs) {
- for (NodeInstance nodeInstance: getNodeInstances()) {
+ for (org.drools.runtime.process.NodeInstance nodeInstance: getNodeInstances()) {
StepNodeInstance stepNodeInstance = (StepNodeInstance) nodeInstance;
if (stepNodeInstance.isAvailableAction(actionId)) {
stepNodeInstance.doAction(actionId, inputs);
@@ -135,7 +135,7 @@
if (result.getOwner() != null && nodeInstance instanceof StepNodeInstance) {
((StepNodeInstance) nodeInstance).setOwner(result.getOwner());
}
- ((org.drools.workflow.instance.NodeInstance) nodeInstance).trigger(null, type);
+ nodeInstance.trigger(null, type);
List<FunctionDescriptor> postFunctions = result.getPostFunctions();
if (postFunctions != null) {
for (FunctionDescriptor postFunction: postFunctions) {
@@ -240,7 +240,7 @@
public List<Step> getCurrentSteps() {
List<Step> result = new ArrayList<Step>();
- for (NodeInstance nodeInstance: getNodeInstances()) {
+ for (org.drools.runtime.process.NodeInstance nodeInstance: getNodeInstances()) {
if (nodeInstance instanceof StepNodeInstance) {
result.add((StepNodeInstance) nodeInstance);
}
@@ -257,7 +257,7 @@
private void checkImplicitFinish() {
boolean finished = true;
- for (NodeInstance nodeInstance: getNodeInstances()) {
+ for (org.drools.runtime.process.NodeInstance nodeInstance: getNodeInstances()) {
if (nodeInstance instanceof StepNodeInstance) {
if (!((StepNodeInstance) nodeInstance).getAvailableActions().isEmpty()) {
finished = false;
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstanceFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/OSWorkflowProcessInstanceFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,11 +1,11 @@
package org.drools.osworkflow.instance;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
public class OSWorkflowProcessInstanceFactory implements ProcessInstanceFactory {
- public InternalProcessInstance createProcessInstance() {
+ public ProcessInstance createProcessInstance() {
return new OSWorkflowProcessInstance();
}
Modified: labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/node/StepNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/node/StepNodeInstance.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-osworkflow/src/main/java/org/drools/osworkflow/instance/node/StepNodeInstance.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -11,9 +11,8 @@
import org.drools.osworkflow.core.OSWorkflowConnection;
import org.drools.osworkflow.core.node.StepNode;
import org.drools.osworkflow.instance.OSWorkflowProcessInstance;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.ProcessInstance;
+import org.drools.runtime.process.NodeInstance;
import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -99,7 +98,7 @@
}
}
if (action.isFinish()) {
- ((InternalProcessInstance) getProcessInstance())
+ ((ProcessInstance) getProcessInstance())
.setState(ProcessInstance.STATE_COMPLETED);
}
}
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAProcessInstanceManager.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAProcessInstanceManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAProcessInstanceManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,7 +9,6 @@
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
import org.drools.process.core.Process;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.ProcessInstanceManager;
import org.drools.process.instance.impl.ProcessInstanceImpl;
@@ -30,7 +29,7 @@
public void addProcessInstance(ProcessInstance processInstance) {
ProcessInstanceInfo processInstanceInfo = new ProcessInstanceInfo(processInstance);
manager.persist(processInstanceInfo);
- ((InternalProcessInstance) processInstance).setId(processInstanceInfo.getId());
+ ((ProcessInstance) processInstance).setId(processInstanceInfo.getId());
processInstanceInfo.updateLastReadDate();
}
@@ -43,7 +42,7 @@
return null;
}
processInstanceInfo.updateLastReadDate();
- InternalProcessInstance processInstance = (InternalProcessInstance) processInstanceInfo.getProcessInstance();
+ ProcessInstance processInstance = (ProcessInstance) processInstanceInfo.getProcessInstance();
Process process = ((InternalRuleBase) workingMemory.getRuleBase()).getProcess(processInstance.getProcessId());
if (process == null) {
throw new IllegalArgumentException(
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPASignalManager.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPASignalManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPASignalManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -10,8 +10,8 @@
import org.drools.WorkingMemory;
import org.drools.persistence.Persister;
import org.drools.persistence.Transaction;
-import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.event.DefaultSignalManager;
+import org.drools.runtime.process.ProcessInstance;
public class JPASignalManager extends DefaultSignalManager {
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManager.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManager.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManager.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,13 +8,13 @@
import javax.persistence.EntityManager;
import org.drools.WorkingMemory;
-import org.drools.process.instance.InternalWorkItemManager;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
+import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.impl.WorkItemImpl;
+import org.drools.runtime.process.WorkItemHandler;
-public class JPAWorkItemManager implements InternalWorkItemManager {
+public class JPAWorkItemManager implements WorkItemManager {
private EntityManager manager;
private WorkingMemory workingMemory;
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManagerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManagerFactory.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/JPAWorkItemManagerFactory.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,8 +1,8 @@
package org.drools.persistence.processinstance;
import org.drools.WorkingMemory;
-import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.WorkItemManagerFactory;
+import org.drools.runtime.process.WorkItemManager;
public class JPAWorkItemManagerFactory implements WorkItemManagerFactory {
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/main/java/org/drools/persistence/processinstance/ProcessInstanceInfo.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -20,8 +20,8 @@
import org.drools.marshalling.MarshallerReaderContext;
import org.drools.marshalling.MarshallerWriteContext;
import org.drools.marshalling.OutputMarshaller;
-import org.drools.process.instance.ProcessInstance;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
+import org.drools.runtime.process.ProcessInstance;
import org.hibernate.annotations.CollectionOfElements;
@Entity
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/jpa/JPAPersisterTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/jpa/JPAPersisterTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/jpa/JPAPersisterTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -12,12 +12,12 @@
import org.drools.persistence.session.StatefulSessionSnapshotter;
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
-import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
import org.drools.rule.Package;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.runtime.process.ProcessInstance;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/SingleSessionCommandServiceTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -19,12 +19,12 @@
import org.drools.process.core.Work;
import org.drools.process.core.impl.WorkImpl;
import org.drools.process.core.timer.Timer;
-import org.drools.process.instance.NodeInstance;
-import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.WorkItem;
import org.drools.rule.Package;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
+import org.drools.runtime.process.NodeInstance;
+import org.drools.runtime.process.ProcessInstance;
+import org.drools.runtime.process.WorkItem;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.ConnectionImpl;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
Modified: labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/TestWorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/TestWorkItemHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-process-enterprise/src/test/java/org/drools/persistence/session/TestWorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,8 +1,8 @@
package org.drools.persistence.session;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
public class TestWorkItemHandler implements WorkItemHandler {
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/archive/ArchiveWorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/archive/ArchiveWorkItemHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/archive/ArchiveWorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -5,9 +5,9 @@
import org.apache.commons.compress.Archive;
import org.apache.commons.compress.ArchiverFactory;
-import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemManager;
public class ArchiveWorkItemHandler implements WorkItemHandler {
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/email/EmailWorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/email/EmailWorkItemHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/email/EmailWorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -1,8 +1,8 @@
package org.drools.process.workitem.email;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
/**
* WorkItemHandler for sending email.
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/exec/ExecWorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/exec/ExecWorkItemHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/exec/ExecWorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -2,9 +2,9 @@
import org.apache.commons.exec.CommandLine;
import org.apache.commons.exec.DefaultExecutor;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
public class ExecWorkItemHandler implements WorkItemHandler {
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/finder/FinderWorkItemHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/finder/FinderWorkItemHandler.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/main/java/org/drools/process/workitem/finder/FinderWorkItemHandler.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,9 +8,9 @@
import org.apache.commons.finder.FileFinder;
import org.apache.commons.finder.Finder;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
public class FinderWorkItemHandler implements WorkItemHandler {
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/com/sample/RuleFlowTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/com/sample/RuleFlowTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/com/sample/RuleFlowTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -8,14 +8,14 @@
import org.drools.StatefulSession;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.compiler.PackageBuilder;
-import org.drools.process.instance.WorkItem;
-import org.drools.process.instance.WorkItemHandler;
-import org.drools.process.instance.WorkItemManager;
import org.drools.process.workitem.archive.ArchiveWorkItemHandler;
import org.drools.process.workitem.email.EmailWorkItemHandler;
import org.drools.process.workitem.exec.ExecWorkItemHandler;
import org.drools.process.workitem.finder.FinderWorkItemHandler;
import org.drools.rule.Package;
+import org.drools.runtime.process.WorkItem;
+import org.drools.runtime.process.WorkItemHandler;
+import org.drools.runtime.process.WorkItemManager;
/**
* This is a sample file to launch a ruleflow.
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/src/test/java/org/drools/process/workitem/email/EmailWorkItemHandlerTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -9,9 +9,9 @@
import junit.framework.TestCase;
-import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.impl.DefaultWorkItemManager;
import org.drools.process.instance.impl.WorkItemImpl;
+import org.drools.runtime.process.WorkItemManager;
import org.drools.util.ChainedProperties;
import org.subethamail.wiser.Wiser;
import org.subethamail.wiser.WiserMessage;
Modified: labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java 2008-11-06 16:10:03 UTC (rev 23761)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java 2008-11-06 16:43:58 UTC (rev 23762)
@@ -11,6 +11,7 @@
import org.drools.Agenda;
import org.drools.FactException;
+import org.drools.FactHandle;
import org.drools.QueryResults;
import org.drools.RuleBase;
import org.drools.StatefulSession;
@@ -21,11 +22,10 @@
import org.drools.event.RuleFlowEventListener;
import org.drools.event.WorkingMemoryEventListener;
import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.event.SignalManager;
import org.drools.process.instance.timer.TimerManager;
import org.drools.runtime.ObjectFilter;
-import org.drools.FactHandle;
+import org.drools.runtime.process.WorkItemManager;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AgendaGroup;
import org.drools.spi.AsyncExceptionHandler;
More information about the jboss-svn-commits
mailing list