[jboss-svn-commits] JBL Code SVN: r23352 - in labs/jbossrules/branches/drools-api-refactor-20080929: drools-api/src/main/java/org/drools/process/instance and 74 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Oct 7 12:01:56 EDT 2008
Author: KrisVerlaenen
Date: 2008-10-07 12:01:55 -0400 (Tue, 07 Oct 2008)
New Revision: 23352
Added:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/Process.java
Removed:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/knowledge/definitions/process/impl/
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/InternalProcess.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/WorkflowProcess.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstance.java
Modified:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Connection.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Node.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Process.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/NodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-clips/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-clips/src/main/java/org/drools/clips/ClipsShell.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/EventBasedNodeBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ExtendedNodeBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/XmlWorkflowProcessDumper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/CompositeNodeHandler.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/ForEachNodeHandler.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessEventTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/xml/processes/XMLPersistenceTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ProcessEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowNodeTriggeredEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/knowledge/definitions/impl/KnowledgePackageImp.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/AbstractContextInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ContextInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/factory/ReuseContextInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/core/RuleFlowProcess.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ProcessContext.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/Connection.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/Node.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/NodeContainer.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/NodeContainerImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/NodeImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/WorkflowProcessImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/Join.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/SequenceNode.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/Split.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/context/WorkflowReuseContextInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ConstraintEvaluator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactoryRegistry.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeContextNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EventBasedNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EventNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/RuleSetNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/StartNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/TimerNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-jaxb/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbStatefulSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-smooks/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatefulSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-decisiontables/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/build.properties
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/ProcessInfo.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapperBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EventBasedNodeWrapper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ExtendedNodeWrapper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowWrapperBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/src/main/java/org/drools/jsr94/rules/ObjectFilterAdapter.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/src/main/java/org/drools/jsr94/rules/admin/RuleExecutionSetImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-repository/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-repository/.project
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-core/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/business/SolutionBusiness.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/ExaminationMoveHelper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/lessonschedule/solver/move/TimeslotChangeMove.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/nqueens/solver/move/YChangeMove.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/simple/move/DayChangeMove.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MatchSwapMove.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-templates/.classpath
labs/jbossrules/branches/drools-api-refactor-20080929/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-verifier/.classpath
Log:
JBRULES-1734: Drools API
- updated implementation to use drools-api process API
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Connection.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Connection.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Connection.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -10,4 +10,6 @@
String getToType();
+ Object getMetaData(String name);
+
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Node.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Node.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Node.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -13,6 +13,12 @@
Map<String, List<Connection>> getOutgoingConnections();
+ List<Connection> getIncomingConnections(String type);
+
+ List<Connection> getOutgoingConnections(String type);
+
NodeContainer getNodeContainer();
+ Object getMetaData(String name);
+
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Process.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Process.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/knowledge/definitions/process/Process.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -10,4 +10,8 @@
String getPackageName();
+ String getType();
+
+ Object getMetaData(String name);
+
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/NodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/NodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/NodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -5,6 +5,8 @@
long getId();
long getNodeId();
+
+ String getNodeName();
WorkflowProcessInstance getProcessInstance();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/process/instance/ProcessInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -8,7 +8,11 @@
int STATE_ABORTED = 3;
int STATE_SUSPENDED = 4;
+ long getId();
+
String getProcessId();
+ String getProcessName();
+
int getState();
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-clips/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-clips/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-clips/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,18 +1,20 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-clips/src/main/java/org/drools/clips/ClipsShell.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-clips/src/main/java/org/drools/clips/ClipsShell.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-clips/src/main/java/org/drools/clips/ClipsShell.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -24,7 +24,6 @@
import org.antlr.runtime.ANTLRReaderStream;
import org.antlr.runtime.CommonTokenStream;
-import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
@@ -64,6 +63,7 @@
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Namespaceable;
import org.drools.rule.Package;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.GlobalResolver;
import org.mvel.MVEL;
import org.mvel.ParserContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,24 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/1.0.1/gunit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0.1/antlr-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/gunit/1.0.1/gunit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr/3.0.1/antlr-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.7/antlr-2.7.7.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -24,14 +24,17 @@
import java.util.List;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.NodeContainer;
+import org.drools.knowledge.definitions.process.Process;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
import org.drools.process.builder.ProcessNodeBuilder;
import org.drools.process.builder.ProcessNodeBuilderRegistry;
import org.drools.process.core.Context;
import org.drools.process.core.ContextContainer;
-import org.drools.process.core.InternalProcess;
-import org.drools.knowledge.definitions.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;
@@ -40,11 +43,7 @@
import org.drools.rule.builder.ProcessBuildContext;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.ruleflow.core.validation.RuleFlowProcessValidator;
-import org.drools.workflow.core.Connection;
import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.NodeContainer;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.drools.workflow.core.impl.WorkflowProcessImpl;
import org.drools.workflow.core.node.ConstraintTrigger;
@@ -76,11 +75,11 @@
}
public void buildProcess(final Process process, String url) {
- ((InternalProcess)process).setURL( url );
+ ((org.drools.process.core.Process) process).setURL( url );
boolean hasErrors = false;
- ProcessValidator validator = processValidators.get(((InternalProcess)process).getType());
+ ProcessValidator validator = processValidators.get(((Process)process).getType());
if (validator == null) {
- System.out.println("Could not find validator for process " + ((InternalProcess)process).getType() + ".");
+ System.out.println("Could not find validator for process " + ((Process)process).getType() + ".");
System.out.println("Continuing without validation of the process " + process.getName() + "[" + process.getId() + "]");
} else {
ProcessValidationError[] errors = validator.validateProcess( (WorkflowProcess) process );
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,11 +1,11 @@
package org.drools.process.builder;
import org.drools.compiler.Dialect;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.drools.workflow.core.node.ActionNode;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/EventBasedNodeBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/EventBasedNodeBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/EventBasedNodeBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -2,12 +2,12 @@
import java.util.Map;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.lang.descr.ProcessDescr;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.process.core.timer.Timer;
import org.drools.rule.builder.ProcessBuildContext;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.EventBasedNode;
public class EventBasedNodeBuilder extends ExtendedNodeBuilder {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ExtendedNodeBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ExtendedNodeBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ExtendedNodeBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,12 +3,12 @@
import java.util.List;
import org.drools.compiler.Dialect;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.rule.builder.ProcessBuildContext;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,9 +1,9 @@
package org.drools.process.builder;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.lang.descr.ProcessDescr;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.workflow.core.Node;
public interface ProcessNodeBuilder {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.workflow.core.Node;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.workflow.core.node.ActionNode;
import org.drools.workflow.core.node.EndNode;
import org.drools.workflow.core.node.FaultNode;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -6,12 +6,12 @@
import org.drools.compiler.Dialect;
import org.drools.compiler.ReturnValueDescr;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.lang.descr.ProcessDescr;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.workflow.core.Connection;
import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.ConstraintImpl;
import org.drools.workflow.core.node.Split;
import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -6,11 +6,10 @@
import javax.xml.parsers.SAXParser;
+import org.drools.knowledge.definitions.process.Process;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.drools.knowledge.definitions.process.Process;
-
public class XmlProcessReader {
private ExtensibleXmlParser parser;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/XmlWorkflowProcessDumper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/XmlWorkflowProcessDumper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/XmlWorkflowProcessDumper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -5,6 +5,9 @@
import java.util.List;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.drools.process.core.context.exception.ExceptionHandler;
import org.drools.process.core.context.exception.ExceptionScope;
@@ -14,10 +17,7 @@
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.datatype.DataType;
import org.drools.process.core.datatype.impl.type.ObjectDataType;
-import org.drools.workflow.core.Connection;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.NodeImpl;
import org.drools.xml.processes.AbstractNodeHandler;
@@ -80,17 +80,20 @@
private void visitHeader(WorkflowProcess process, StringBuffer xmlDump, boolean includeMeta) {
xmlDump.append(" <header>" + EOL);
- visitImports(process.getImports(), xmlDump);
- visitGlobals(process.getGlobals(), xmlDump);
- VariableScope variableScope = (VariableScope) process.getDefaultContext(VariableScope.VARIABLE_SCOPE);
+ visitImports(((org.drools.process.core.Process) process).getImports(), xmlDump);
+ visitGlobals(((org.drools.process.core.Process) process).getGlobals(), xmlDump);
+ VariableScope variableScope = (VariableScope)
+ ((org.drools.process.core.Process) process).getDefaultContext(VariableScope.VARIABLE_SCOPE);
if (variableScope != null) {
visitVariables(variableScope.getVariables(), xmlDump);
}
- SwimlaneContext swimlaneContext = (SwimlaneContext) process.getDefaultContext(SwimlaneContext.SWIMLANE_SCOPE);
+ SwimlaneContext swimlaneContext = (SwimlaneContext)
+ ((org.drools.process.core.Process) process).getDefaultContext(SwimlaneContext.SWIMLANE_SCOPE);
if (swimlaneContext != null) {
visitSwimlanes(swimlaneContext.getSwimlanes(), xmlDump);
}
- ExceptionScope exceptionScope = (ExceptionScope) process.getDefaultContext(ExceptionScope.EXCEPTION_SCOPE);
+ ExceptionScope exceptionScope = (ExceptionScope)
+ ((org.drools.process.core.Process) process).getDefaultContext(ExceptionScope.EXCEPTION_SCOPE);
if (exceptionScope != null) {
visitExceptionHandlers(exceptionScope.getExceptionHandlers(), xmlDump);
}
@@ -194,7 +197,7 @@
public void visitNode(Node node, StringBuffer xmlDump, boolean includeMeta) {
Handler handler = semanticModule.getHandlerByClass(node.getClass());
if (handler != null) {
- ((AbstractNodeHandler) handler).writeNode(node, xmlDump, includeMeta);
+ ((AbstractNodeHandler) handler).writeNode((org.drools.workflow.core.Node) node, xmlDump, includeMeta);
} else {
throw new IllegalArgumentException(
"Unknown node type: " + node);
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/CompositeNodeHandler.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/CompositeNodeHandler.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/CompositeNodeHandler.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -4,10 +4,10 @@
import java.util.List;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Connection;
import org.drools.process.core.context.exception.ExceptionScope;
import org.drools.process.core.context.variable.Variable;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.workflow.core.Connection;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.CompositeContextNode;
import org.drools.workflow.core.node.CompositeNode;
@@ -82,12 +82,13 @@
}
protected List<Node> getSubNodes(CompositeNode compositeNode) {
- List<Node> subNodes = new ArrayList<Node>();
- for (Node subNode: compositeNode.getNodes()) {
+ List<Node> subNodes =
+ new ArrayList<Node>();
+ for (org.drools.knowledge.definitions.process.Node subNode: compositeNode.getNodes()) {
// filter out composite start and end nodes as they can be regenerated
if ((!(subNode instanceof CompositeNode.CompositeNodeStart)) &&
(!(subNode instanceof CompositeNode.CompositeNodeEnd))) {
- subNodes.add(subNode);
+ subNodes.add((Node) subNode);
}
}
return subNodes;
@@ -95,7 +96,7 @@
protected List<Connection> getSubConnections(CompositeNode compositeNode) {
List<Connection> connections = new ArrayList<Connection>();
- for (Node subNode: compositeNode.getNodes()) {
+ for (org.drools.knowledge.definitions.process.Node subNode: compositeNode.getNodes()) {
// filter out composite start and end nodes as they can be regenerated
if (!(subNode instanceof CompositeNode.CompositeNodeEnd)) {
for (Connection connection: subNode.getIncomingConnections(Node.CONNECTION_DEFAULT_TYPE)) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -2,14 +2,13 @@
import java.util.HashSet;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.NodeContainer;
import org.drools.workflow.core.impl.ConnectionImpl;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.drools.xml.ProcessBuildData;
import org.w3c.dom.Element;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
@@ -59,7 +58,9 @@
parser.getLocator() );
}
- ConnectionImpl connection = new ConnectionImpl(fromNode, Node.CONNECTION_DEFAULT_TYPE, toNode, Node.CONNECTION_DEFAULT_TYPE);
+ ConnectionImpl connection = new ConnectionImpl(
+ fromNode, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE,
+ toNode, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
connection.setMetaData("bendpoints", bendpoints);
return connection;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/ForEachNodeHandler.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/ForEachNodeHandler.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/xml/processes/ForEachNodeHandler.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,8 +3,8 @@
import java.util.List;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Connection;
import org.drools.process.core.datatype.impl.type.ObjectDataType;
-import org.drools.workflow.core.Connection;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.CompositeNode;
import org.drools.workflow.core.node.ForEachNode;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -33,6 +33,7 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.StockTick;
+import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.common.ActivationGroupNode;
@@ -68,8 +69,7 @@
import org.drools.lang.descr.TypeFieldDescr;
import org.drools.lang.descr.VariableRestrictionDescr;
import org.drools.process.core.Context;
-import org.drools.process.core.InternalProcess;
-import org.drools.process.core.context.variable.Variable;
+import org.drools.process.core.Process;
import org.drools.reteoo.ReteooRuleBase;
import org.drools.rule.Behavior;
import org.drools.rule.CompositeClassLoader;
@@ -85,10 +85,8 @@
import org.drools.rule.Rule;
import org.drools.rule.SlidingTimeWindow;
import org.drools.rule.TypeDeclaration;
-import org.drools.rule.builder.dialect.java.JavaDialect;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
import org.drools.runtime.rule.FactHandle;
-import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.CompiledInvoker;
@@ -97,7 +95,6 @@
import org.drools.util.DroolsStreamUtils;
import org.drools.util.LinkedList;
import org.drools.workflow.core.impl.WorkflowProcessImpl;
-import org.drools.knowledge.definitions.process.Process;
public class PackageBuilderTest extends DroolsTestCase {
@@ -1384,7 +1381,7 @@
class MockRuleFlow
implements
- InternalProcess {
+ Process {
private String id;
@@ -1427,21 +1424,6 @@
public void setPackageName(String packageName) {
}
- public String[] getVariableNames() {
- return null;
- }
-
- public List<Variable> getVariables() {
- return null;
- }
-
- public void setVariables(List<Variable> variables) {
- }
-
- public Variable findVariable(String variableName) {
- return null;
- }
-
public void addContext(Context context) {
}
@@ -1462,26 +1444,38 @@
}
public Object getMetaData(String name) {
- // TODO Auto-generated method stub
return null;
}
public void setMetaData(String name,
Object value) {
- // TODO Auto-generated method stub
-
}
public String getURL() {
- // TODO Auto-generated method stub
return null;
}
public void setURL(String url) {
- // TODO Auto-generated method stub
-
}
+ public String[] getGlobalNames() {
+ return null;
+ }
+
+ public Map<String, String> getGlobals() {
+ return null;
+ }
+
+ public List<String> getImports() {
+ return null;
+ }
+
+ public void setGlobals(Map<String, String> globals) {
+ }
+
+ public void setImports(List<String> imports) {
+ }
+
}
class MockActivation
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -126,11 +126,11 @@
"String variable = (String) context.getVariable(\"variable\");\n" +
"System.out.println(drools.getWorkingMemory());\n" +
"list.add(variable);\n" +
- "String nodeName = context.getNodeInstance().getNode().getName();\n" +
+ "String nodeName = context.getNodeInstance().getNodeName();\n" +
"list.add(nodeName);\n" +
"insert( new Message() );\n" +
"</action>\n" +
- " </actionNode>/n" +
+ " </actionNode>\n" +
" <end id=\"3\" name=\"End\" />\n" +
" </nodes>\n" +
"\n" +
@@ -203,11 +203,11 @@
"list.add(myVariable);\n" +
// TODO: Cannot put "String nodeName = ..." here because this generates a runtime exception
// stating that nodeName could not be resolved
- "nodeName = context.getNodeInstance().getNode().getName();\n" +
+ "nodeName = context.getNodeInstance().getNodeName();\n" +
"list.add(nodeName);\n" +
"insert( new Message() );\n" +
"</action>\n" +
- " </actionNode>/n" +
+ " </actionNode>\n" +
" <end id=\"3\" name=\"End\" />\n" +
" </nodes>\n" +
"\n" +
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessEventTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessEventTest.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessEventTest.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -11,6 +11,7 @@
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;
@@ -65,7 +66,9 @@
ProcessInstance processInstance =
session.startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
- assertEquals("MyValue", ((VariableScopeInstance) processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
+ assertEquals("MyValue", ((VariableScopeInstance)
+ ((InternalProcessInstance) processInstance).getContextInstance(
+ VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
public void testProcessInstanceSignalEvent() throws Exception {
@@ -116,7 +119,9 @@
processInstance = session.getProcessInstance(processInstance.getId());
processInstance.signalEvent("MyEvent", "MyValue");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
- assertEquals("MyValue", ((VariableScopeInstance) processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
+ assertEquals("MyValue", ((VariableScopeInstance)
+ ((InternalProcessInstance) processInstance).getContextInstance(
+ VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
public void testExternalEventCorrelation() throws Exception {
@@ -162,13 +167,17 @@
StatefulSession session = ruleBase.newStatefulSession();
ProcessInstance processInstance = session.startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
- assertEquals("SomeText", ((VariableScopeInstance) processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
+ assertEquals("SomeText", ((VariableScopeInstance)
+ ((InternalProcessInstance) processInstance).getContextInstance(
+ VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
session = SerializationHelper.getSerialisedStatefulSession(session);
processInstance = session.getProcessInstance(processInstance.getId());
session.getSignalManager().signalEvent("MyEvent", "MyValue");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
- assertEquals("MyValue", ((VariableScopeInstance) processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
+ assertEquals("MyValue", ((VariableScopeInstance)
+ ((InternalProcessInstance) processInstance).getContextInstance(
+ VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
public void testInternalEventCorrelation() throws Exception {
@@ -214,7 +223,9 @@
StatefulSession session = ruleBase.newStatefulSession();
ProcessInstance processInstance = session.startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_ACTIVE, processInstance.getState());
- assertEquals("SomeText", ((VariableScopeInstance) processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
+ assertEquals("SomeText", ((VariableScopeInstance)
+ ((InternalProcessInstance) processInstance).getContextInstance(
+ VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
session = SerializationHelper.getSerialisedStatefulSession(session);
processInstance = session.getProcessInstance(processInstance.getId());
@@ -282,7 +293,9 @@
ProcessInstance processInstance =
workingMemory.startProcess("org.drools.event");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
- assertEquals("MyValue", ((VariableScopeInstance) processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
+ assertEquals("MyValue", ((VariableScopeInstance)
+ ((InternalProcessInstance) processInstance).getContextInstance(
+ VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
public void testProcessInstanceSignalCompositeEvent() throws Exception {
@@ -345,7 +358,9 @@
processInstance = session.getProcessInstance(processInstance.getId());
processInstance.signalEvent("MyEvent", "MyValue");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
- assertEquals("MyValue", ((VariableScopeInstance) processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
+ assertEquals("MyValue", ((VariableScopeInstance)
+ ((InternalProcessInstance) processInstance).getContextInstance(
+ VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
public void testExternalCompositeEventCorrelation() throws Exception {
@@ -408,7 +423,9 @@
processInstance = session.getProcessInstance(processInstance.getId());
session.getSignalManager().signalEvent("MyEvent", "MyValue");
assertEquals(ProcessInstance.STATE_COMPLETED, processInstance.getState());
- assertEquals("MyValue", ((VariableScopeInstance) processInstance.getContextInstance(VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
+ assertEquals("MyValue", ((VariableScopeInstance)
+ ((InternalProcessInstance) processInstance).getContextInstance(
+ VariableScope.VARIABLE_SCOPE)).getVariable("MyVar"));
}
public void testInternalCompositeEventCorrelation() throws Exception {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -125,7 +125,7 @@
" </globals>\n" +
" <exceptionHandlers>\n" +
" <exceptionHandler faultName=\"myFault\" type=\"action\" >\n" +
- " <action type=\"expression\" name=\"Complete\" dialect=\"java\" >context.getProcessInstance().setState(org.drools.process.instance.ProcessInstance.STATE_COMPLETED);</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" +
" </exceptionHandler>\n" +
" </exceptionHandlers>\n" +
" </header>\n" +
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,11 +1,11 @@
package org.drools.process.builder;
import org.drools.compiler.Dialect;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.drools.workflow.core.node.ActionNode;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/xml/processes/XMLPersistenceTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/xml/processes/XMLPersistenceTest.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/xml/processes/XMLPersistenceTest.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -58,8 +58,8 @@
RuleFlowProcess process = new RuleFlowProcess() {
private static final long serialVersionUID = 400L;
int id = 0;
- public void addNode(Node node) {
- node.setId(++id);
+ public void addNode(org.drools.knowledge.definitions.process.Node node) {
+ ((Node) node).setId(++id);
super.addNode(node);
}
};
@@ -112,8 +112,8 @@
RuleFlowProcess process = new RuleFlowProcess() {
private static final long serialVersionUID = 400L;
int id = 0;
- public void addNode(Node node) {
- node.setId(++id);
+ public void addNode(org.drools.knowledge.definitions.process.Node node) {
+ ((Node) node).setId(++id);
super.addNode(node);
}
};
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -24,6 +24,7 @@
import java.util.List;
import java.util.Map;
+import org.drools.WorkingMemory;
import org.drools.WorkingMemoryEventManager;
import org.drools.audit.event.ActivationLogEvent;
import org.drools.audit.event.ILogEventFilter;
@@ -69,7 +70,6 @@
import org.drools.event.WorkingMemoryEventListener;
import org.drools.rule.Declaration;
import org.drools.runtime.rule.FactHandle;
-import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.Tuple;
@@ -336,32 +336,32 @@
public void beforeRuleFlowStarted(RuleFlowStartedEvent event,
WorkingMemory workingMemory) {
filterLogEvent( new RuleFlowLogEvent( LogEvent.BEFORE_RULEFLOW_CREATED,
- event.getProcessInstance().getProcess().getId(),
- event.getProcessInstance().getProcess().getName(),
+ event.getProcessInstance().getProcessId(),
+ event.getProcessInstance().getProcessName(),
event.getProcessInstance().getId()) );
}
public void afterRuleFlowStarted(RuleFlowStartedEvent event,
WorkingMemory workingMemory) {
filterLogEvent(new RuleFlowLogEvent(LogEvent.AFTER_RULEFLOW_CREATED,
- event.getProcessInstance().getProcess().getId(),
- event.getProcessInstance().getProcess().getName(),
+ event.getProcessInstance().getProcessId(),
+ event.getProcessInstance().getProcessName(),
event.getProcessInstance().getId()) );
}
public void beforeRuleFlowCompleted(RuleFlowCompletedEvent event,
WorkingMemory workingMemory) {
filterLogEvent( new RuleFlowLogEvent( LogEvent.BEFORE_RULEFLOW_COMPLETED,
- event.getProcessInstance().getProcess().getId(),
- event.getProcessInstance().getProcess().getName(),
+ event.getProcessInstance().getProcessId(),
+ event.getProcessInstance().getProcessName(),
event.getProcessInstance().getId()) );
}
public void afterRuleFlowCompleted(RuleFlowCompletedEvent event,
WorkingMemory workingMemory) {
filterLogEvent(new RuleFlowLogEvent(LogEvent.AFTER_RULEFLOW_COMPLETED,
- event.getProcessInstance().getProcess().getId(),
- event.getProcessInstance().getProcess().getName(),
+ event.getProcessInstance().getProcessId(),
+ event.getProcessInstance().getProcessName(),
event.getProcessInstance().getId()) );
}
@@ -405,9 +405,9 @@
WorkingMemory workingMemory) {
filterLogEvent(new RuleFlowNodeLogEvent(LogEvent.BEFORE_RULEFLOW_NODE_TRIGGERED,
event.getRuleFlowNodeInstance().getId() + "",
- event.getRuleFlowNodeInstance().getNode().getName(),
- event.getProcessInstance().getProcess().getId(),
- event.getProcessInstance().getProcess().getName(),
+ event.getRuleFlowNodeInstance().getNodeName(),
+ event.getProcessInstance().getProcessId(),
+ event.getProcessInstance().getProcessName(),
event.getProcessInstance().getId()) );
}
@@ -415,9 +415,9 @@
WorkingMemory workingMemory) {
filterLogEvent(new RuleFlowNodeLogEvent(LogEvent.AFTER_RULEFLOW_NODE_TRIGGERED,
event.getRuleFlowNodeInstance().getId() + "",
- event.getRuleFlowNodeInstance().getNode().getName(),
- event.getProcessInstance().getProcess().getId(),
- event.getProcessInstance().getProcess().getName(),
+ event.getRuleFlowNodeInstance().getNodeName(),
+ event.getProcessInstance().getProcessId(),
+ event.getProcessInstance().getProcessName(),
event.getProcessInstance().getId()) );
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ProcessEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ProcessEvent.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ProcessEvent.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -18,7 +18,7 @@
import java.util.EventObject;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
/**
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
@@ -27,12 +27,12 @@
private static final long serialVersionUID = 400L;
- public ProcessEvent(final InternalProcessInstance instance) {
+ public ProcessEvent(final ProcessInstance instance) {
super( instance );
}
- public InternalProcessInstance getProcessInstance() {
- return (InternalProcessInstance) getSource();
+ public ProcessInstance getProcessInstance() {
+ return (ProcessInstance) getSource();
}
}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowCompletedEvent.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -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,11 +25,11 @@
private static final long serialVersionUID = 400L;
- public RuleFlowCompletedEvent(final InternalProcessInstance instance) {
+ public RuleFlowCompletedEvent(final ProcessInstance instance) {
super( instance );
}
public String toString() {
- return "==>[ProcessCompleted(name=" + getProcessInstance().getProcess().getName() + "; id=" + getProcessInstance().getProcess().getId() + ")]";
+ return "==>[ProcessCompleted(name=" + getProcessInstance().getProcessName() + "; id=" + getProcessInstance().getProcessId() + ")]";
}
}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowEventSupport.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,18 +17,18 @@
*/
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.List;
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.spi.RuleFlowGroup;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.WorkflowProcessInstance;
/**
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowNodeTriggeredEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowNodeTriggeredEvent.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowNodeTriggeredEvent.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,5 +1,7 @@
package org.drools.event;
+import org.drools.process.instance.NodeInstance;
+
/*
* Copyright 2005 JBoss Inc
*
@@ -16,7 +18,6 @@
* limitations under the License.
*/
-import org.drools.workflow.instance.NodeInstance;
/**
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
@@ -38,6 +39,6 @@
public String toString() {
return "==>[WorkflowNodeTriggered(nodeId=" + nodeInstance.getNodeId() + "; id=" + nodeInstance.getId()
- + "; processName=" + getProcessInstance().getProcess().getName() + "; processId=" + getProcessInstance().getProcess().getId() + ")]";
+ + "; processName=" + getProcessInstance().getProcessName() + "; processId=" + getProcessInstance().getProcessId() + ")]";
}
}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/RuleFlowStartedEvent.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -30,6 +30,6 @@
}
public String toString() {
- return "==>[ProcessStarted(name=" + getProcessInstance().getProcess().getName() + "; id=" + getProcessInstance().getProcess().getId() + ")]";
+ return "==>[ProcessStarted(name=" + getProcessInstance().getProcessName() + "; id=" + getProcessInstance().getProcessId() + ")]";
}
}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/knowledge/definitions/impl/KnowledgePackageImp.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/knowledge/definitions/impl/KnowledgePackageImp.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/knowledge/definitions/impl/KnowledgePackageImp.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -6,10 +6,8 @@
import org.drools.knowledge.definitions.KnowledgePackage;
import org.drools.knowledge.definitions.process.Process;
-import org.drools.knowledge.definitions.process.impl.ProcessImpl;
import org.drools.knowledge.definitions.rule.Rule;
import org.drools.knowledge.definitions.rule.impl.RuleImpl;
-
import org.drools.rule.Package;
public class KnowledgePackageImp implements KnowledgePackage {
@@ -33,10 +31,10 @@
}
public Collection<Process> getProcesses() {
- Collection<org.drools.process.core.InternalProcess> processes = ( Collection<org.drools.process.core.InternalProcess> ) pkg.getRuleFlows().values();
+ Collection<org.drools.process.core.Process> processes = ( Collection<org.drools.process.core.Process> ) pkg.getRuleFlows().values();
List<Process> list = new ArrayList<Process>( processes.size() );
- for( org.drools.process.core.InternalProcess process : processes ) {
- list.add( new ProcessImpl( process ) );
+ for( org.drools.process.core.Process process : processes ) {
+ list.add( process );
}
return list;
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -32,6 +32,8 @@
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.WorkItem;
import org.drools.process.instance.context.swimlane.SwimlaneContextInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
@@ -71,8 +73,6 @@
import org.drools.spi.PropagationContext;
import org.drools.spi.RuleFlowGroup;
import org.drools.util.ObjectHashSet;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import org.drools.workflow.instance.node.CompositeContextNodeInstance;
import org.drools.workflow.instance.node.ForEachNodeInstance;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -30,6 +30,7 @@
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.context.swimlane.SwimlaneContextInstance;
@@ -57,7 +58,6 @@
import org.drools.spi.RuleFlowGroup;
import org.drools.util.ObjectHashMap;
import org.drools.util.ObjectHashSet;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.node.CompositeContextNodeInstance;
import org.drools.workflow.instance.node.ForEachNodeInstance;
import org.drools.workflow.instance.node.HumanTaskNodeInstance;
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/InternalProcess.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/InternalProcess.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/InternalProcess.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,59 +0,0 @@
-package org.drools.process.core;
-
-import org.drools.knowledge.definitions.process.Process;
-
-public interface InternalProcess extends Process, ContextContainer {
-
- /**
- * Sets the id of this process.
- * The id should uniquely identify this process.
- * @param id the id of the process
- */
- void setId(String id);
-
- /**
- * Sets the name of this process.
- * @param name the name of this process
- */
- void setName(String name);
-
- /**
- * Sets the version of this process.
- * @param version the version of this process
- */
- void setVersion(String version);
-
- /**
- * Returns the version of this process.
- * If no version is specified, null is returned.
- * @return the version of this process
- */
- String getVersion();
-
- /**
- * Sets the type of this process.
- * @param type the type of this process
- */
- void setType(String type);
-
- /**
- * Returns the type of this process.
- * @return the type of this process
- */
- String getType();
-
- void setURL(String url);
-
- String getURL();
-
- /**
- * Sets the package name of this RuleFlow process
- *
- * @param packageName the package name of this RuleFlow process
- */
- void setPackageName(String packageName);
-
- void setMetaData(String name, Object value);
-
- Object getMetaData(String name);
-}
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/Process.java (from rev 23343, labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/InternalProcess.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/Process.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/Process.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -0,0 +1,83 @@
+package org.drools.process.core;
+
+import java.util.List;
+import java.util.Map;
+
+public interface Process extends org.drools.knowledge.definitions.process.Process, ContextContainer {
+
+ /**
+ * Sets the id of this process.
+ * The id should uniquely identify this process.
+ * @param id the id of the process
+ */
+ void setId(String id);
+
+ /**
+ * Sets the name of this process.
+ * @param name the name of this process
+ */
+ void setName(String name);
+
+ /**
+ * Sets the version of this process.
+ * @param version the version of this process
+ */
+ void setVersion(String version);
+
+ /**
+ * Sets the type of this process.
+ * @param type the type of this process
+ */
+ void setType(String type);
+
+ void setURL(String url);
+
+ String getURL();
+
+ /**
+ * Sets the package name of this RuleFlow process
+ *
+ * @param packageName the package name of this RuleFlow process
+ */
+ void setPackageName(String packageName);
+
+ void setMetaData(String name, Object value);
+
+ /**
+ * Returns the imports of this RuleFlow process.
+ * They are defined as a List of fully qualified class names.
+ *
+ * @return the imports of this RuleFlow process
+ */
+ List<String> getImports();
+
+ /**
+ * Sets the imports of this RuleFlow process
+ *
+ * @param imports the imports as a List of fully qualified class names
+ */
+ void setImports(List<String> imports);
+
+ /**
+ * Returns the globals of this RuleFlow process.
+ * They are defined as a Map with the name as key and the type as value.
+ *
+ * @return the imports of this RuleFlow process
+ */
+ Map<String, String> getGlobals();
+
+ /**
+ * Sets the imports of this RuleFlow process
+ *
+ * @param imports the globals as a Map with the name as key and the type as value
+ */
+ void setGlobals(Map<String, String> globals);
+
+ /**
+ * Returns the names of the globals used in this RuleFlow process
+ *
+ * @return the names of the globals of this RuleFlow process
+ */
+ String[] getGlobalNames();
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/Process.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/core/impl/ProcessImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,14 +17,15 @@
*/
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.drools.process.core.Context;
import org.drools.process.core.ContextContainer;
-import org.drools.process.core.InternalProcess;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.process.core.Process;
import org.drools.process.core.context.AbstractContext;
/**
@@ -32,7 +33,7 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class ProcessImpl implements InternalProcess, Serializable {
+public class ProcessImpl implements Process, Serializable {
private static final long serialVersionUID = 400L;
@@ -44,6 +45,8 @@
private String url;
private ContextContainer contextContainer = new ContextContainerImpl();
private Map<String, Object> metaData = new HashMap<String, Object>();
+ private List<String> imports;
+ private Map<String, String> globals;
public void setId(final String id) {
this.id = id;
@@ -84,8 +87,6 @@
public void setPackageName(String packageName) {
this.packageName = packageName;
}
-
-
public List<Context> getContexts(String contextType) {
return this.contextContainer.getContexts(contextType);
@@ -146,4 +147,30 @@
this.url = url;
}
+ public List<String> getImports() {
+ return imports;
+ }
+
+ public void setImports(List<String> imports) {
+ this.imports = imports;
+ }
+
+ public Map<String, String> getGlobals() {
+ return globals;
+ }
+
+ public void setGlobals(Map<String, String> globals) {
+ this.globals = globals;
+ }
+
+ public String[] getGlobalNames() {
+ final List<String> result = new ArrayList<String>();
+ if (this.globals != null) {
+ for ( Iterator<String> iterator = this.globals.keySet().iterator(); iterator.hasNext(); ) {
+ result.add(iterator.next());
+ }
+ }
+ return result.toArray(new String[result.size()]);
+ }
+
}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/ContextInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -16,6 +16,6 @@
Context getContext();
- InternalProcessInstance getProcessInstance();
+ ProcessInstance getProcessInstance();
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -48,4 +48,8 @@
void start();
+ void addEventListener(String type, EventListener eventListener, boolean external);
+
+ void removeEventListener(String type, EventListener eventListener, boolean external);
+
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/AbstractContextInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/AbstractContextInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/AbstractContextInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -5,13 +5,13 @@
import org.drools.process.core.Context;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
public abstract class AbstractContextInstance implements ContextInstance, Serializable {
private long contextId;
private ContextInstanceContainer contextInstanceContainer;
- private InternalProcessInstance processInstance;
+ private ProcessInstance processInstance;
public long getContextId() {
return contextId;
@@ -33,11 +33,11 @@
return getContextInstanceContainer().getContextContainer().getContext(getContextType(), getContextId());
}
- public InternalProcessInstance getProcessInstance() {
+ public ProcessInstance getProcessInstance() {
return processInstance;
}
- public void setProcessInstance(InternalProcessInstance processInstance) {
+ public void setProcessInstance(ProcessInstance processInstance) {
this.processInstance = processInstance;
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,5 +1,6 @@
package org.drools.process.instance.context.exception;
+import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.SequentialKnowledgeHelper;
import org.drools.common.InternalRuleBase;
@@ -7,7 +8,7 @@
import org.drools.process.core.context.exception.ExceptionHandler;
import org.drools.process.instance.ContextInstanceContainer;
import org.drools.process.instance.InternalProcessInstance;
-import org.drools.WorkingMemory;
+import org.drools.process.instance.ProcessInstance;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
@@ -24,7 +25,7 @@
try {
KnowledgeHelper knowledgeHelper = createKnowledgeHelper();
ProcessContext context = new ProcessContext();
- InternalProcessInstance processInstance = getProcessInstance();
+ ProcessInstance processInstance = getProcessInstance();
ContextInstanceContainer contextInstanceContainer = getContextInstanceContainer();
if (contextInstanceContainer instanceof NodeInstance) {
context.setNodeInstance((NodeInstance) contextInstanceContainer);
@@ -35,7 +36,7 @@
if (faultVariable != null) {
context.setVariable(faultVariable, params);
}
- action.execute(knowledgeHelper, processInstance.getWorkingMemory(), context);
+ action.execute(knowledgeHelper, ((InternalProcessInstance) processInstance).getWorkingMemory(), context);
} catch (Exception e) {
throw new RuntimeException("unable to execute Action", e);
}
@@ -45,7 +46,7 @@
}
private KnowledgeHelper createKnowledgeHelper() {
- WorkingMemory workingMemory = getProcessInstance().getWorkingMemory();
+ WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
if ( ((InternalRuleBase) workingMemory.getRuleBase()).getConfiguration().isSequential() ) {
return new SequentialKnowledgeHelper( workingMemory );
} else {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ContextInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ContextInstanceFactory.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ContextInstanceFactory.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,10 +3,10 @@
import org.drools.process.core.Context;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.ProcessInstance;
public interface ContextInstanceFactory {
- ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, InternalProcessInstance processInstance);
+ ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, ProcessInstance processInstance);
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -22,15 +22,14 @@
import java.util.List;
import java.util.Map;
+import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.process.core.Context;
import org.drools.process.core.ContextContainer;
-import org.drools.process.core.InternalProcess;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.InternalProcessInstance;
-import org.drools.WorkingMemory;
-import org.drools.knowledge.definitions.process.Process;
/**
* Default implementation of a process instance.
@@ -41,7 +40,7 @@
private long id;
private String processId;
- private transient InternalProcess process;
+ private transient Process process;
private int state = STATE_PENDING;
private Map<String, ContextInstance> contextInstances = new HashMap<String, ContextInstance>();
private Map<String, List<ContextInstance>> subContextInstances = new HashMap<String, List<ContextInstance>>();
@@ -57,12 +56,12 @@
public void setProcess(final Process process) {
this.processId = process.getId();
- this.process = ( InternalProcess ) process;
+ this.process = ( Process ) process;
}
public Process getProcess() {
if (this.process == null) {
- this.process = ( InternalProcess ) ((InternalRuleBase) workingMemory.getRuleBase())
+ this.process = ( Process ) ((InternalRuleBase) workingMemory.getRuleBase())
.getProcess(processId);
}
return this.process;
@@ -75,6 +74,10 @@
public String getProcessId() {
return processId;
}
+
+ public String getProcessName() {
+ return getProcess().getName();
+ }
public void setState(final int state) {
this.state = state;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/factory/ReuseContextInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/factory/ReuseContextInstanceFactory.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/factory/ReuseContextInstanceFactory.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,7 +3,7 @@
import org.drools.process.core.Context;
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.context.AbstractContextInstance;
import org.drools.process.instance.impl.ContextInstanceFactory;
@@ -15,7 +15,7 @@
this.cls = cls;
}
- public ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, InternalProcessInstance processInstance) {
+ public ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, ProcessInstance processInstance) {
ContextInstance result = contextInstanceContainer.getContextInstance( context.getType(), context.getId() );
if (result != null) {
return result;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -8,8 +8,9 @@
import java.util.HashMap;
import java.util.Map;
+import org.drools.WorkingMemory;
import org.drools.process.instance.InternalProcessInstance;
-import org.drools.WorkingMemory;
+import org.drools.process.instance.ProcessInstance;
import org.drools.time.Job;
import org.drools.time.JobContext;
import org.drools.time.JobHandle;
@@ -34,7 +35,7 @@
}
public void registerTimer(final TimerInstance timer,
- InternalProcessInstance processInstance) {
+ ProcessInstance processInstance) {
timer.setId( ++timerId );
timer.setProcessInstanceId(processInstance.getId());
timer.setActivated(new Date());
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/core/RuleFlowProcess.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/core/RuleFlowProcess.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/core/RuleFlowProcess.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,10 +1,10 @@
package org.drools.ruleflow.core;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.NodeContainer;
import org.drools.process.core.context.exception.ExceptionScope;
import org.drools.process.core.context.swimlane.SwimlaneContext;
import org.drools.process.core.context.variable.VariableScope;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.NodeContainer;
import org.drools.workflow.core.impl.NodeContainerImpl;
import org.drools.workflow.core.impl.WorkflowProcessImpl;
import org.drools.workflow.core.node.StartNode;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -22,6 +22,8 @@
import java.util.List;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.knowledge.definitions.process.Process;
import org.drools.process.core.Work;
import org.drools.process.core.context.variable.Variable;
@@ -29,8 +31,6 @@
import org.drools.process.core.validation.ProcessValidator;
import org.drools.process.core.validation.impl.ProcessValidationErrorImpl;
import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.drools.workflow.core.node.ActionNode;
import org.drools.workflow.core.node.CompositeNode;
@@ -296,19 +296,19 @@
errors.add(new ProcessValidationErrorImpl(process,
"ForEach node '" + node.getName() + "' [" + node.getId() + "] has no collection expression"));
}
- if (forEachNode.getIncomingConnections(Node.CONNECTION_DEFAULT_TYPE).size() == 0) {
+ if (forEachNode.getIncomingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE).size() == 0) {
errors.add(new ProcessValidationErrorImpl(process,
"ForEach node '" + node.getName() + "' [" + node.getId() + "] has no incoming connection"));
}
- if (forEachNode.getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE).size() == 0) {
+ if (forEachNode.getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE).size() == 0) {
errors.add(new ProcessValidationErrorImpl(process,
"ForEach node '" + node.getName() + "' [" + node.getId() + "] has no outgoing connection"));
}
- if (forEachNode.getLinkedIncomingNode(Node.CONNECTION_DEFAULT_TYPE) == null) {
+ if (forEachNode.getLinkedIncomingNode(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE) == null) {
errors.add(new ProcessValidationErrorImpl(process,
"ForEach node '" + node.getName() + "' [" + node.getId() + "] has no linked start node"));
}
- if (forEachNode.getLinkedOutgoingNode(Node.CONNECTION_DEFAULT_TYPE) == null) {
+ if (forEachNode.getLinkedOutgoingNode(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE) == null) {
errors.add(new ProcessValidationErrorImpl(process,
"ForEach node '" + node.getName() + "' [" + node.getId() + "] has no linked end node"));
}
@@ -342,7 +342,7 @@
errors.add(new ProcessValidationErrorImpl(process,
"Event node '" + node.getName() + "' [" + node.getId() + "] should specify an event type"));
}
- if (eventNode.getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE).size() == 0) {
+ if (eventNode.getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE).size() == 0) {
errors.add(new ProcessValidationErrorImpl(process,
"Event node '" + node.getName() + "' [" + node.getId() + "] has no outgoing connection"));
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,6 +1,7 @@
package org.drools.ruleflow.instance;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
public class RuleFlowProcessInstance extends WorkflowProcessInstanceImpl {
@@ -12,7 +13,7 @@
}
public void internalStart() {
- getNodeInstance( getRuleFlowProcess().getStart() ).trigger( null, null );
+ ((NodeInstance) getNodeInstance(getRuleFlowProcess().getStart())).trigger(null, null);
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ProcessContext.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ProcessContext.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ProcessContext.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -2,15 +2,16 @@
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.workflow.instance.NodeInstance;
public class ProcessContext {
- private InternalProcessInstance processInstance;
+ private ProcessInstance processInstance;
private NodeInstance nodeInstance;
- public InternalProcessInstance getProcessInstance() {
+ public ProcessInstance getProcessInstance() {
if (processInstance != null) {
return processInstance;
}
@@ -20,7 +21,7 @@
return null;
}
- public void setProcessInstance(InternalProcessInstance processInstance) {
+ public void setProcessInstance(ProcessInstance processInstance) {
this.processInstance = processInstance;
}
@@ -35,11 +36,12 @@
public Object getVariable(String variableName) {
VariableScopeInstance variableScope = null;
if (nodeInstance != null) {
- variableScope = (VariableScopeInstance) nodeInstance.resolveContextInstance(VariableScope.VARIABLE_SCOPE, variableName);
+ variableScope = (VariableScopeInstance) ((org.drools.workflow.instance.NodeInstance)
+ nodeInstance).resolveContextInstance(VariableScope.VARIABLE_SCOPE, variableName);
}
if (variableScope == null) {
- variableScope = (VariableScopeInstance)
- getProcessInstance().getContextInstance(VariableScope.VARIABLE_SCOPE);
+ variableScope = (VariableScopeInstance) ((InternalProcessInstance)
+ getProcessInstance()).getContextInstance(VariableScope.VARIABLE_SCOPE);
}
return variableScope.getVariable(variableName);
}
@@ -47,12 +49,12 @@
public void setVariable(String variableName, Object value) {
VariableScopeInstance variableScope = null;
if (nodeInstance != null) {
- variableScope = (VariableScopeInstance)
- nodeInstance.resolveContextInstance(VariableScope.VARIABLE_SCOPE, variableName);
+ variableScope = (VariableScopeInstance) ((org.drools.workflow.instance.NodeInstance)
+ nodeInstance).resolveContextInstance(VariableScope.VARIABLE_SCOPE, variableName);
}
if (variableScope == null) {
- variableScope = (VariableScopeInstance)
- getProcessInstance().getContextInstance(VariableScope.VARIABLE_SCOPE);
+ variableScope = (VariableScopeInstance) ((InternalProcessInstance)
+ getProcessInstance()).getContextInstance(VariableScope.VARIABLE_SCOPE);
if (variableScope.getVariableScope().findVariable(variableName) == null) {
variableScope = null;
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/Connection.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/Connection.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/Connection.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -21,36 +21,8 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface Connection {
+public interface Connection extends org.drools.knowledge.definitions.process.Connection {
- /**
- * Returns the from node of the connection.
- * @return the from node of the connection.
- */
- Node getFrom();
-
- /**
- * Returns the to node of the connection
- * @return the to node of the connection
- */
- Node getTo();
-
- /**
- * Returns the type of the connection at the from node
- *
- * @return the type of the connection at the from node
- */
- String getFromType();
-
- /**
- * Returns the type of the connection at the to node
- *
- * @return the type of the connection at the to node
- */
- String getToType();
-
void setMetaData(String name, Object value);
- Object getMetaData(String name);
-
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/Node.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/Node.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/Node.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,9 +17,9 @@
*/
import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.NodeContainer;
import org.drools.process.core.Contextable;
/**
@@ -27,18 +27,11 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface Node extends Contextable, Serializable {
+public interface Node extends org.drools.knowledge.definitions.process.Node, Contextable, Serializable {
static final String CONNECTION_DEFAULT_TYPE = "DROOLS_DEFAULT";
/**
- * Returns the id of the node
- *
- * @return the id of the node
- */
- long getId();
-
- /**
* Method for setting the id of the node
*
* @param id the id of the node
@@ -46,33 +39,12 @@
void setId(long id);
/**
- * Returns the name of the node
- *
- * @return the name of the node
- */
- String getName();
-
- /**
* Method for setting the name of the node
*
* @param name the name of the node
*/
void setName(String name);
- /**
- * Returns the incoming connections
- *
- * @return the incoming connections
- */
- Map<String, List<Connection>> getIncomingConnections();
-
- /**
- * Returns the outgoing connections
- *
- * @return the outgoing connections
- */
- Map<String, List<Connection>> getOutgoingConnections();
-
void addIncomingConnection(String type, Connection connection);
void addOutgoingConnection(String type, Connection connection);
@@ -81,16 +53,8 @@
void removeOutgoingConnection(String type, Connection connection);
- List<Connection> getIncomingConnections(String type);
-
- List<Connection> getOutgoingConnections(String type);
-
- NodeContainer getNodeContainer();
-
void setNodeContainer(NodeContainer nodeContainer);
void setMetaData(String name, Object value);
- Object getMetaData(String name);
-
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/NodeContainer.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/NodeContainer.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/NodeContainer.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,33 +1,15 @@
package org.drools.workflow.core;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.process.core.Context;
-
/**
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface NodeContainer {
+public interface NodeContainer extends org.drools.knowledge.definitions.process.NodeContainer {
/**
- * Returns the nodes of this node container.
- *
- * @return the nodes of this node container
- */
- Node[] getNodes();
-
- /**
- * Returns the node with the given id
- *
- * @param id
- * the node id
- * @return the node with the given id
- * @throws IllegalArgumentException
- * if an unknown id is passed
- */
- Node getNode(long id);
-
- /**
* Method for adding a node to this node container.
* Note that the node will get an id unique for this node container.
*
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/WorkflowProcess.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/WorkflowProcess.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/WorkflowProcess.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,68 +0,0 @@
-package org.drools.workflow.core;
-
-/*
- * 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 java.util.List;
-import java.util.Map;
-
-import org.drools.process.core.InternalProcess;
-
-/**
- * Represents a RuleFlow process.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public interface WorkflowProcess extends InternalProcess, NodeContainer {
-
- /**
- * Returns the imports of this RuleFlow process.
- * They are defined as a List of fully qualified class names.
- *
- * @return the imports of this RuleFlow process
- */
- List<String> getImports();
-
- /**
- * Sets the imports of this RuleFlow process
- *
- * @param imports the imports as a List of fully qualified class names
- */
- void setImports(List<String> imports);
-
- /**
- * Returns the globals of this RuleFlow process.
- * They are defined as a Map with the name as key and the type as value.
- *
- * @return the imports of this RuleFlow process
- */
- Map<String, String> getGlobals();
-
- /**
- * Sets the imports of this RuleFlow process
- *
- * @param imports the globals as a Map with the name as key and the type as value
- */
- void setGlobals(Map<String, String> globals);
-
- /**
- * Returns the names of the globals used in this RuleFlow process
- *
- * @return the names of the globals of this RuleFlow process
- */
- String[] getGlobalNames();
-
-}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -20,8 +20,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
/**
* Default implementation of a connection.
@@ -71,13 +71,13 @@
}
public void connect() {
- this.from.addOutgoingConnection(fromType, this);
- this.to.addIncomingConnection(toType, this);
+ ((org.drools.workflow.core.Node) this.from).addOutgoingConnection(fromType, this);
+ ((org.drools.workflow.core.Node) this.to).addIncomingConnection(toType, this);
}
public synchronized void terminate() {
- this.from.removeOutgoingConnection(fromType, this);
- this.to.removeIncomingConnection(toType, this);
+ ((org.drools.workflow.core.Node) this.from).removeOutgoingConnection(fromType, this);
+ ((org.drools.workflow.core.Node) this.to).removeIncomingConnection(toType, this);
this.from = null;
this.fromType = null;
this.to = null;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/NodeContainerImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/NodeContainerImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/NodeContainerImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -4,8 +4,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.process.core.Context;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.NodeContainer;
/**
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/NodeImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/NodeImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/NodeImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -23,10 +23,10 @@
import java.util.List;
import java.util.Map;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.NodeContainer;
import org.drools.process.core.Context;
-import org.drools.workflow.core.Connection;
import org.drools.workflow.core.Node;
-import org.drools.workflow.core.NodeContainer;
/**
* Default implementation of a node.
@@ -35,8 +35,10 @@
*/
public abstract class NodeImpl implements Node, Serializable {
- protected static final NodeImpl[] EMPTY_NODE_ARRAY = new NodeImpl[0];
+ private static final long serialVersionUID = 4L;
+ protected static final NodeImpl[] EMPTY_NODE_ARRAY = new NodeImpl[0];
+
private long id;
private String name;
@@ -192,7 +194,7 @@
return context;
}
}
- return nodeContainer.resolveContext(contextId, param);
+ return ((org.drools.workflow.core.NodeContainer) nodeContainer).resolveContext(contextId, param);
}
public void setMetaData(String name, Object value) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/WorkflowProcessImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/WorkflowProcessImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/impl/WorkflowProcessImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -16,31 +16,23 @@
* limitations under the License.
*/
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.NodeContainer;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.impl.ProcessImpl;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.NodeContainer;
-import org.drools.workflow.core.WorkflowProcess;
/**
* Default implementation of a RuleFlow process.
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public class WorkflowProcessImpl extends ProcessImpl implements WorkflowProcess {
+public class WorkflowProcessImpl extends ProcessImpl implements WorkflowProcess, org.drools.workflow.core.NodeContainer {
- private static final long serialVersionUID = 400L;
+ private static final long serialVersionUID = 400L;
- private NodeContainer nodeContainer;
- private List<String> imports;
- private Map<String, String> globals;
-
+ private org.drools.workflow.core.NodeContainer nodeContainer;
public WorkflowProcessImpl() {
- nodeContainer = createNodeContainer();
+ nodeContainer = (org.drools.workflow.core.NodeContainer) createNodeContainer();
}
protected NodeContainer createNodeContainer() {
@@ -61,38 +53,12 @@
public void removeNode(final Node node) {
nodeContainer.removeNode(node);
- node.setNodeContainer(null);
+ ((org.drools.workflow.core.Node) node).setNodeContainer(null);
}
public void addNode(final Node node) {
nodeContainer.addNode(node);
- node.setNodeContainer(this);
+ ((org.drools.workflow.core.Node) node).setNodeContainer(this);
}
- public List<String> getImports() {
- return imports;
- }
-
- public void setImports(List<String> imports) {
- this.imports = imports;
- }
-
- public Map<String, String> getGlobals() {
- return globals;
- }
-
- public void setGlobals(Map<String, String> globals) {
- this.globals = globals;
- }
-
- public String[] getGlobalNames() {
- final List<String> result = new ArrayList<String>();
- if (this.globals != null) {
- for ( Iterator<String> iterator = this.globals.keySet().iterator(); iterator.hasNext(); ) {
- result.add(iterator.next());
- }
- }
- return result.toArray(new String[result.size()]);
- }
-
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -5,8 +5,8 @@
import java.util.List;
import java.util.Map;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.workflow.core.NodeContainer;
import org.drools.workflow.core.impl.ConnectionImpl;
import org.drools.workflow.core.impl.NodeContainerImpl;
@@ -20,7 +20,7 @@
private static final long serialVersionUID = 400L;
- private NodeContainer nodeContainer;
+ private org.drools.workflow.core.NodeContainer nodeContainer;
private Map<String, CompositeNode.NodeAndType> inConnectionMap = new HashMap<String, CompositeNode.NodeAndType>();
private Map<String, CompositeNode.NodeAndType> outConnectionMap = new HashMap<String, CompositeNode.NodeAndType>();
@@ -58,10 +58,10 @@
id = n.getId();
}
}
- node.setId(++id);
+ ((org.drools.workflow.core.Node) node).setId(++id);
}
nodeContainer.addNode(node);
- node.setNodeContainer(this);
+ ((org.drools.workflow.core.Node) node).setNodeContainer(this);
}
protected void internalAddNode(Node node) {
@@ -70,7 +70,7 @@
public void removeNode(Node node) {
nodeContainer.removeNode(node);
- node.setNodeContainer(null);
+ ((org.drools.workflow.core.Node) node).setNodeContainer(null);
}
protected void internalRemoveNode(Node node) {
@@ -109,7 +109,7 @@
internalAddNode(start);
if (inNode.getNode() != null) {
new ConnectionImpl(
- start, Node.CONNECTION_DEFAULT_TYPE,
+ start, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE,
inNode.getNode(), inNode.getType());
}
}
@@ -138,7 +138,7 @@
if (outNode.getNode() != null) {
new ConnectionImpl(
outNode.getNode(), outNode.getType(),
- end, Node.CONNECTION_DEFAULT_TYPE);
+ end, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
}
}
}
@@ -186,7 +186,7 @@
public void addIncomingConnection(String type, Connection connection) {
if (connection.getFrom().getNodeContainer() == this) {
- linkOutgoingConnections(connection.getFrom().getId(), connection.getFromType(), Node.CONNECTION_DEFAULT_TYPE);
+ linkOutgoingConnections(connection.getFrom().getId(), connection.getFromType(), org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
} else {
super.addIncomingConnection(type, connection);
CompositeNode.NodeAndType inNode = internalGetLinkedIncomingNode(type);
@@ -196,7 +196,7 @@
NodeImpl node = (NodeImpl) inNode.getNode();
if (node != null) {
new ConnectionImpl(
- start, Node.CONNECTION_DEFAULT_TYPE,
+ start, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE,
inNode.getNode(), inNode.getType());
}
}
@@ -221,7 +221,9 @@
public void addOutgoingConnection(String type, Connection connection) {
if (connection.getTo().getNodeContainer() == this) {
- linkIncomingConnections(Node.CONNECTION_DEFAULT_TYPE, connection.getTo().getId(), connection.getToType());
+ linkIncomingConnections(
+ org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE,
+ connection.getTo().getId(), connection.getToType());
} else {
super.addOutgoingConnection(type, connection);
CompositeNode.NodeAndType outNode = internalGetLinkedOutgoingNode(type);
@@ -232,7 +234,7 @@
if (node != null) {
new ConnectionImpl(
outNode.getNode(), outNode.getType(),
- end, Node.CONNECTION_DEFAULT_TYPE);
+ end, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
}
}
}
@@ -391,7 +393,7 @@
public Connection getTo() {
final List<Connection> list =
- getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE);
+ getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
if (list.size() > 0) {
return (Connection) list.get(0);
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,10 +3,10 @@
import java.util.ArrayList;
import java.util.List;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.process.core.context.variable.Variable;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.datatype.DataType;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.ConnectionImpl;
/*
@@ -49,8 +49,8 @@
split.setMetaData("hidden", true);
super.addNode(split);
super.linkIncomingConnections(
- Node.CONNECTION_DEFAULT_TYPE,
- new CompositeNode.NodeAndType(split, Node.CONNECTION_DEFAULT_TYPE));
+ org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE,
+ new CompositeNode.NodeAndType(split, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE));
// Composite node
CompositeContextNode compositeNode = new CompositeContextNode();
compositeNode.setName("ForEachComposite");
@@ -65,15 +65,15 @@
join.setMetaData("hidden", true);
super.addNode(join);
super.linkOutgoingConnections(
- new CompositeNode.NodeAndType(join, Node.CONNECTION_DEFAULT_TYPE),
- Node.CONNECTION_DEFAULT_TYPE);
+ new CompositeNode.NodeAndType(join, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE),
+ org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
new ConnectionImpl(
- super.getNode(1), Node.CONNECTION_DEFAULT_TYPE,
- getCompositeNode(), Node.CONNECTION_DEFAULT_TYPE
+ super.getNode(1), org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE,
+ getCompositeNode(), org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE
);
new ConnectionImpl(
- getCompositeNode(), Node.CONNECTION_DEFAULT_TYPE,
- super.getNode(3), Node.CONNECTION_DEFAULT_TYPE
+ getCompositeNode(), org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE,
+ super.getNode(3), org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE
);
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/Join.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/Join.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/Join.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -18,8 +18,7 @@
import java.util.List;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
+import org.drools.knowledge.definitions.process.Connection;
import org.drools.workflow.core.impl.NodeImpl;
/**
@@ -66,7 +65,7 @@
public Connection getTo() {
final List<Connection> list =
- getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE);
+ getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
if (list.size() > 0) {
return (Connection) list.get(0);
}
@@ -74,13 +73,13 @@
}
public List<Connection> getDefaultIncomingConnections() {
- return getIncomingConnections(Node.CONNECTION_DEFAULT_TYPE);
+ return getIncomingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
}
public void validateAddIncomingConnection(final String type,
final Connection connection) {
super.validateAddIncomingConnection(type, connection);
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"This type of node only accepts default incoming connection type!");
}
@@ -88,11 +87,11 @@
public void validateAddOutgoingConnection(final String type, final Connection connection) {
super.validateAddOutgoingConnection(type, connection);
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"This type of node only accepts default outgoing connection type!");
}
- if (!getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE).isEmpty()) {
+ if (!getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE).isEmpty()) {
throw new IllegalArgumentException(
"This type of node cannot have more than one outgoing connection");
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/SequenceNode.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/SequenceNode.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/SequenceNode.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -2,8 +2,7 @@
import java.util.List;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
+import org.drools.knowledge.definitions.process.Connection;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
/**
@@ -12,9 +11,11 @@
*/
public abstract class SequenceNode extends ExtendedNodeImpl {
- public Connection getFrom() {
+ private static final long serialVersionUID = 4L;
+
+ public Connection getFrom() {
final List<Connection> list =
- getIncomingConnections(Node.CONNECTION_DEFAULT_TYPE);
+ getIncomingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
if (list.size() > 0) {
return (Connection) list.get(0);
}
@@ -23,7 +24,7 @@
public Connection getTo() {
final List<Connection> list =
- getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE);
+ getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
if (list.size() > 0) {
return (Connection) list.get(0);
}
@@ -33,12 +34,12 @@
public void validateAddIncomingConnection(final String type,
final Connection connection) {
super.validateAddIncomingConnection(type, connection);
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"This type of node only accepts default incoming connection type!");
}
- if (getIncomingConnections(Node.CONNECTION_DEFAULT_TYPE) != null
- && !getIncomingConnections(Node.CONNECTION_DEFAULT_TYPE).isEmpty()) {
+ if (getIncomingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE) != null
+ && !getIncomingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE).isEmpty()) {
throw new IllegalArgumentException(
"This type of node cannot have more than one incoming connection!");
}
@@ -46,12 +47,12 @@
public void validateAddOutgoingConnection(final String type, final Connection connection) {
super.validateAddOutgoingConnection(type, connection);
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"This type of node only accepts default outgoing connection type!");
}
- if (getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE) != null
- && !getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE).isEmpty()) {
+ if (getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE) != null
+ && !getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE).isEmpty()) {
throw new IllegalArgumentException(
"This type of node cannot have more than one outgoing connection!");
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/Split.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/Split.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/core/node/Split.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -22,9 +22,8 @@
import java.util.List;
import java.util.Map;
-import org.drools.workflow.core.Connection;
+import org.drools.knowledge.definitions.process.Connection;
import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.NodeImpl;
/**
@@ -102,8 +101,8 @@
if ( connection == null ) {
throw new IllegalArgumentException( "connection is null" );
}
- if (getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE) != null
- && !getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE).contains(connection)) {
+ if (getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE) != null
+ && !getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE).contains(connection)) {
throw new IllegalArgumentException("connection is unknown:" + connection);
}
internalSetConstraint(
@@ -124,7 +123,7 @@
public Connection getFrom() {
final List<Connection> list =
- getIncomingConnections(Node.CONNECTION_DEFAULT_TYPE);
+ getIncomingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
if (list.size() > 0) {
return (Connection) list.get(0);
}
@@ -132,17 +131,17 @@
}
public List<Connection> getDefaultOutgoingConnections() {
- return getOutgoingConnections(Node.CONNECTION_DEFAULT_TYPE);
+ return getOutgoingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
}
public void validateAddIncomingConnection(final String type,
final Connection connection) {
super.validateAddIncomingConnection(type, connection);
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"This type of node only accepts default incoming connection type!");
}
- if (!getIncomingConnections(Node.CONNECTION_DEFAULT_TYPE).isEmpty()) {
+ if (!getIncomingConnections(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE).isEmpty()) {
throw new IllegalArgumentException(
"This type of node cannot have more than one incoming connection!");
}
@@ -150,7 +149,7 @@
public void validateAddOutgoingConnection(final String type, final Connection connection) {
super.validateAddOutgoingConnection(type, connection);
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"This type of node only accepts default outgoing connection type!");
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,7 +1,7 @@
package org.drools.workflow.instance;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.process.instance.ContextInstance;
-import org.drools.workflow.core.Node;
/*
@@ -28,18 +28,10 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface NodeInstance {
+public interface NodeInstance extends org.drools.process.instance.NodeInstance {
- long getId();
+ void trigger(org.drools.process.instance.NodeInstance from, String type);
- long getNodeId();
-
- WorkflowProcessInstance getProcessInstance();
-
- NodeInstanceContainer getNodeInstanceContainer();
-
- void trigger(NodeInstance from, String type);
-
void cancel();
Node getNode();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -2,17 +2,16 @@
import java.util.Collection;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.NodeContainer;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.NodeContainer;
+import org.drools.process.instance.NodeInstance;
/**
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface NodeInstanceContainer {
+public interface NodeInstanceContainer extends org.drools.process.instance.NodeInstanceContainer {
- Collection<NodeInstance> getNodeInstances();
-
Collection<NodeInstance> getNodeInstances(boolean recursive);
NodeInstance getFirstNodeInstance(long nodeId);
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,38 +0,0 @@
-package org.drools.workflow.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.process.instance.EventListener;
-import org.drools.process.instance.InternalProcessInstance;
-import org.drools.workflow.core.WorkflowProcess;
-
-/**
- * A process instance for a RuleFlow process.
- * Contains a reference to all its node instances, and the agenda that
- * is controlling the RuleFlow process.
- *
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public interface WorkflowProcessInstance extends InternalProcessInstance, NodeInstanceContainer {
-
- WorkflowProcess getWorkflowProcess();
-
- void addEventListener(String type, EventListener eventListener, boolean external);
-
- void removeEventListener(String type, EventListener eventListener, boolean external);
-
-}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -2,10 +2,13 @@
import java.util.Map;
+import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
-import org.drools.WorkingMemory;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.WorkflowProcessInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
@@ -29,7 +32,7 @@
return;
}
((WorkflowProcessInstanceImpl) processInstance).disconnect();
- processInstance.setProcess(process);
+ ((InternalProcessInstance) processInstance).setProcess(process);
for (NodeInstance nodeInstance: processInstance.getNodeInstances()) {
Long oldNodeId = nodeInstance.getNodeId();
Long newNodeId = nodeMapping.get(oldNodeId);
@@ -43,7 +46,7 @@
((NodeInstanceImpl) nodeInstance).setNodeId(newNodeId);
}
}
- processInstance.setWorkingMemory((InternalWorkingMemory) workingMemory);
+ ((InternalProcessInstance) processInstance).setWorkingMemory((InternalWorkingMemory) workingMemory);
((WorkflowProcessInstanceImpl) processInstance).reconnect();
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/context/WorkflowReuseContextInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/context/WorkflowReuseContextInstanceFactory.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/context/WorkflowReuseContextInstanceFactory.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,7 +3,7 @@
import org.drools.process.core.Context;
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.context.AbstractContextInstance;
import org.drools.process.instance.impl.ContextInstanceFactory;
import org.drools.workflow.instance.NodeInstanceContainer;
@@ -16,7 +16,7 @@
this.cls = cls;
}
- public ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, InternalProcessInstance processInstance) {
+ public ContextInstance getContextInstance(Context context, ContextInstanceContainer contextInstanceContainer, ProcessInstance processInstance) {
ContextInstance result = contextInstanceContainer.getContextInstance( context.getType(), context.getId() );
if (result != null) {
return result;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ConstraintEvaluator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ConstraintEvaluator.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ConstraintEvaluator.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,6 +1,6 @@
package org.drools.workflow.instance.impl;
-import org.drools.workflow.core.Connection;
+import org.drools.knowledge.definitions.process.Connection;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.instance.node.SplitInstance;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -2,19 +2,19 @@
import java.util.List;
+import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
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.context.exception.ExceptionScopeInstance;
-import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
-import org.drools.workflow.instance.NodeInstance;
public abstract class ExtendedNodeInstanceImpl extends NodeInstanceImpl {
@@ -29,7 +29,7 @@
}
public void triggerCompleted(boolean remove) {
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, remove);
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, remove);
}
protected void triggerCompleted(String type, boolean remove) {
@@ -49,7 +49,7 @@
protected KnowledgeHelper createKnowledgeHelper() {
KnowledgeHelper knowledgeHelper = null;
- WorkingMemory workingMemory = getProcessInstance().getWorkingMemory();
+ WorkingMemory workingMemory = ((InternalProcessInstance) 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, getProcessInstance().getWorkingMemory(), context);
+ action.execute(knowledgeHelper, ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), context);
} catch (Exception exception) {
String exceptionName = exception.getClass().getName();
ExceptionScopeInstance exceptionScopeInstance = (ExceptionScopeInstance)
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,9 +1,9 @@
package org.drools.workflow.instance.impl;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.NodeInstanceContainer;
-import org.drools.workflow.instance.WorkflowProcessInstance;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.NodeInstanceContainer;
+import org.drools.process.instance.WorkflowProcessInstance;
public interface NodeInstanceFactory {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactoryRegistry.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactoryRegistry.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactoryRegistry.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.workflow.core.Node;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.workflow.core.node.ActionNode;
import org.drools.workflow.core.node.CompositeContextNode;
import org.drools.workflow.core.node.CompositeNode;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -18,30 +18,32 @@
import java.io.Serializable;
+import org.drools.WorkingMemory;
import org.drools.common.EventSupport;
import org.drools.common.InternalWorkingMemory;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.process.core.Context;
import org.drools.process.core.ContextContainer;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.ContextInstanceContainer;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
+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.workflow.core.impl.NodeImpl;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.NodeInstanceContainer;
-import org.drools.workflow.instance.WorkflowProcessInstance;
/**
* Default implementation of a RuleFlow node instance.
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public abstract class NodeInstanceImpl implements NodeInstance, Serializable {
+public abstract class NodeInstanceImpl implements org.drools.workflow.instance.NodeInstance, Serializable {
private long id;
private long nodeId;
private WorkflowProcessInstance processInstance;
- private NodeInstanceContainer nodeInstanceContainer;
+ private org.drools.workflow.instance.NodeInstanceContainer nodeInstanceContainer;
public void setId(final long id) {
this.id = id;
@@ -58,6 +60,10 @@
public long getNodeId() {
return this.nodeId;
}
+
+ public String getNodeName() {
+ return getNode().getName();
+ }
public void setProcessInstance(final WorkflowProcessInstance processInstance) {
this.processInstance = processInstance;
@@ -72,14 +78,15 @@
}
public void setNodeInstanceContainer(NodeInstanceContainer nodeInstanceContainer) {
- this.nodeInstanceContainer = nodeInstanceContainer;
+ this.nodeInstanceContainer = (org.drools.workflow.instance.NodeInstanceContainer) nodeInstanceContainer;
if (nodeInstanceContainer != null) {
- nodeInstanceContainer.addNodeInstance(this);
+ this.nodeInstanceContainer.addNodeInstance(this);
}
}
public Node getNode() {
- return this.nodeInstanceContainer.getNodeContainer().internalGetNode( this.nodeId );
+ return ((org.drools.workflow.core.NodeContainer)
+ this.nodeInstanceContainer.getNodeContainer()).internalGetNode( this.nodeId );
}
public boolean isInversionOfControl() {
@@ -95,12 +102,13 @@
if (getNode().getMetaData("hidden") != null) {
hidden = true;
}
+ WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
if (!hidden) {
- ((EventSupport) getProcessInstance().getWorkingMemory()).getRuleFlowEventSupport().fireBeforeRuleFlowNodeTriggered(this, (InternalWorkingMemory) getProcessInstance().getWorkingMemory());
+ ((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeTriggered(this, (InternalWorkingMemory) workingMemory);
}
internalTrigger(from, type);
if (!hidden) {
- ((EventSupport) getProcessInstance().getWorkingMemory()).getRuleFlowEventSupport().fireAfterRuleFlowNodeTriggered(this, (InternalWorkingMemory) getProcessInstance().getWorkingMemory());
+ ((EventSupport) workingMemory).getRuleFlowEventSupport().fireAfterRuleFlowNodeTriggered(this, (InternalWorkingMemory) workingMemory);
}
}
@@ -108,7 +116,7 @@
protected void triggerCompleted(String type, boolean remove) {
if (remove) {
- getNodeInstanceContainer().removeNodeInstance(this);
+ ((org.drools.workflow.instance.NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
}
for (Connection connection: getNode().getOutgoingConnections(type)) {
triggerConnection(connection);
@@ -120,13 +128,14 @@
if (getNode().getMetaData("hidden") != null) {
hidden = true;
}
+ WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
if (!hidden) {
- ((EventSupport) getProcessInstance().getWorkingMemory()).getRuleFlowEventSupport().fireBeforeRuleFlowNodeLeft(this, (InternalWorkingMemory) getProcessInstance().getWorkingMemory());
+ ((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeLeft(this, (InternalWorkingMemory) workingMemory);
}
- getNodeInstanceContainer().getNodeInstance(connection.getTo())
- .trigger(this, connection.getToType());
+ ((org.drools.workflow.instance.NodeInstance) ((org.drools.workflow.instance.NodeInstanceContainer) getNodeInstanceContainer())
+ .getNodeInstance(connection.getTo())).trigger(this, connection.getToType());
if (!hidden) {
- ((EventSupport) getProcessInstance().getWorkingMemory()).getRuleFlowEventSupport().fireAfterRuleFlowNodeLeft(this, (InternalWorkingMemory) getProcessInstance().getWorkingMemory());
+ ((EventSupport) workingMemory).getRuleFlowEventSupport().fireAfterRuleFlowNodeLeft(this, (InternalWorkingMemory) workingMemory);
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -21,11 +21,12 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.spi.CompiledInvoker;
import org.drools.spi.ProcessContext;
import org.drools.spi.ReturnValueEvaluator;
import org.drools.spi.Wireable;
-import org.drools.workflow.core.Connection;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.instance.node.SplitInstance;
@@ -117,7 +118,7 @@
try {
ProcessContext context = new ProcessContext();
context.setNodeInstance( instance );
- value = this.evaluator.evaluate( instance.getProcessInstance().getWorkingMemory(),
+ value = this.evaluator.evaluate( ((InternalProcessInstance) instance.getProcessInstance()).getWorkingMemory(),
context );
} catch ( Exception e ) {
throw new RuntimeException( "unable to execute ReturnValueEvaluator",
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -19,9 +19,10 @@
import java.io.Serializable;
import org.drools.common.InternalAgenda;
-import org.drools.workflow.core.Connection;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.WorkflowProcessInstance;
import org.drools.workflow.core.Constraint;
-import org.drools.workflow.instance.WorkflowProcessInstance;
import org.drools.workflow.instance.node.SplitInstance;
/**
@@ -88,8 +89,8 @@
Connection connection,
Constraint constraint) {
WorkflowProcessInstance processInstance = instance.getProcessInstance();
- InternalAgenda agenda = (InternalAgenda) processInstance.getAgenda();
- String rule = "RuleFlow-Split-" + processInstance.getProcess().getId() + "-" + instance.getNode().getId() + "-" + connection.getTo().getId();
+ InternalAgenda agenda = (InternalAgenda) ((InternalProcessInstance) processInstance).getAgenda();
+ String rule = "RuleFlow-Split-" + processInstance.getProcessId() + "-" + instance.getNode().getId() + "-" + connection.getTo().getId();
return agenda.isRuleActiveInRuleFlowGroup( "DROOLS_SYSTEM", rule );
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -29,18 +29,17 @@
import org.drools.common.EventSupport;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.NodeContainer;
+import org.drools.knowledge.definitions.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.impl.ProcessInstanceImpl;
-import org.drools.WorkingMemory;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.NodeContainer;
-import org.drools.workflow.core.WorkflowProcess;
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.WorkflowProcessInstance;
import org.drools.workflow.instance.node.EventBasedNodeInstance;
import org.drools.workflow.instance.node.EventBasedNodeInstanceInterface;
import org.drools.workflow.instance.node.EventNodeInstance;
@@ -52,7 +51,7 @@
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
public abstract class WorkflowProcessInstanceImpl extends ProcessInstanceImpl
- implements WorkflowProcessInstance {
+ implements WorkflowProcessInstance, org.drools.workflow.instance.NodeInstanceContainer {
private static final long serialVersionUID = 400L;
@@ -88,7 +87,7 @@
for (Iterator<NodeInstance> iterator = nodeInstances.iterator(); iterator.hasNext(); ) {
NodeInstance nodeInstance = iterator.next();
if (nodeInstance instanceof NodeInstanceContainer) {
- result.addAll(((NodeInstanceContainer) nodeInstance).getNodeInstances(true));
+ result.addAll(((org.drools.workflow.instance.NodeInstanceContainer) nodeInstance).getNodeInstances(true));
}
}
}
@@ -163,8 +162,8 @@
.fireBeforeRuleFlowProcessCompleted( this, workingMemory );
// deactivate all node instances of this process instance
while ( !nodeInstances.isEmpty() ) {
- NodeInstance nodeInstance = (NodeInstance) nodeInstances.get( 0 );
- nodeInstance.cancel();
+ NodeInstance nodeInstance = nodeInstances.get( 0 );
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance).cancel();
}
removeEventListeners();
workingMemory.removeProcessInstance( this );
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,9 +1,9 @@
package org.drools.workflow.instance.impl.factory;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.NodeInstanceContainer;
-import org.drools.workflow.instance.WorkflowProcessInstance;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.NodeInstanceContainer;
+import org.drools.process.instance.WorkflowProcessInstance;
import org.drools.workflow.instance.impl.NodeInstanceFactory;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,9 +1,9 @@
package org.drools.workflow.instance.impl.factory;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.NodeInstanceContainer;
-import org.drools.workflow.instance.WorkflowProcessInstance;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.NodeInstanceContainer;
+import org.drools.process.instance.WorkflowProcessInstance;
import org.drools.workflow.instance.impl.NodeInstanceFactory;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -16,7 +16,8 @@
}
public NodeInstance getNodeInstance(Node node, WorkflowProcessInstance processInstance, NodeInstanceContainer nodeInstanceContainer) {
- NodeInstance result = nodeInstanceContainer.getFirstNodeInstance( node.getId() );
+ NodeInstance result = ((org.drools.workflow.instance.NodeInstanceContainer)
+ nodeInstanceContainer).getFirstNodeInstance( node.getId() );
if (result != null) {
return result;
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -16,16 +16,16 @@
* limitations under the License.
*/
+import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.SequentialKnowledgeHelper;
import org.drools.common.InternalRuleBase;
-import org.drools.WorkingMemory;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
import org.drools.spi.Action;
+import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
-import org.drools.spi.KnowledgeHelper;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.ActionNode;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
/**
@@ -42,7 +42,7 @@
}
public void internalTrigger(final NodeInstance from, String type) {
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"An ActionNode only accepts default incoming connections!");
}
@@ -51,7 +51,7 @@
KnowledgeHelper knowledgeHelper = createKnowledgeHelper();
ProcessContext context = new ProcessContext();
context.setNodeInstance(this);
- action.execute(knowledgeHelper, getProcessInstance().getWorkingMemory(), context);
+ action.execute(knowledgeHelper, ((InternalProcessInstance) getProcessInstance()).getWorkingMemory(), context);
} catch (Exception e) {
throw new RuntimeException("unable to execute Action", e);
}
@@ -59,11 +59,11 @@
}
public void triggerCompleted() {
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, true);
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, true);
}
private KnowledgeHelper createKnowledgeHelper() {
- WorkingMemory workingMemory = getProcessInstance().getWorkingMemory();
+ WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
if ( ((InternalRuleBase) workingMemory.getRuleBase()).getConfiguration().isSequential() ) {
return new SequentialKnowledgeHelper( workingMemory );
} else {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeContextNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeContextNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeContextNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -10,6 +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.impl.ContextInstanceFactory;
import org.drools.process.instance.impl.ContextInstanceFactoryRegistry;
import org.drools.workflow.core.node.CompositeContextNode;
@@ -73,7 +74,8 @@
public ContextInstance getContextInstance(final Context context) {
ContextInstanceFactoryRegistry contextRegistry =
- ((InternalRuleBase) getProcessInstance().getWorkingMemory().getRuleBase())
+ ((InternalRuleBase) ((InternalProcessInstance) getProcessInstance())
+ .getWorkingMemory().getRuleBase())
.getConfiguration().getProcessContextInstanceFactoryRegistry();
ContextInstanceFactory conf = contextRegistry.getContextInstanceFactory(context);
if (conf == null) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -23,16 +23,17 @@
import java.util.List;
import org.drools.common.InternalRuleBase;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.NodeContainer;
import org.drools.process.instance.EventListener;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.NodeContainer;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.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.WorkflowProcessInstance;
import org.drools.workflow.instance.impl.NodeInstanceFactory;
import org.drools.workflow.instance.impl.NodeInstanceFactoryRegistry;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -58,7 +59,8 @@
for (Node node: getCompositeNode().getNodes()) {
if (node instanceof EventNode) {
if ("external".equals(((EventNode) node).getScope())) {
- getProcessInstance().addEventListener(((EventNode) node).getType(), new EventListener() {
+ ((InternalProcessInstance) getProcessInstance()).addEventListener(
+ ((EventNode) node).getType(), new EventListener() {
public String[] getEventTypes() {
return null;
}
@@ -87,7 +89,7 @@
(from == null ||
((CompositeNode.CompositeNodeStart) connection.getFrom()).getInNode().getId() == from.getNodeId())) {
NodeInstance nodeInstance = getNodeInstance(connection.getFrom());
- nodeInstance.trigger(null, nodeAndType.getType());
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance).trigger(null, nodeAndType.getType());
return;
}
}
@@ -99,14 +101,14 @@
triggerCompleted(outType, true);
while (!nodeInstances.isEmpty()) {
NodeInstance nodeInstance = (NodeInstance) nodeInstances.get(0);
- nodeInstance.cancel();
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance).cancel();
}
}
public void cancel() {
while (!nodeInstances.isEmpty()) {
NodeInstance nodeInstance = (NodeInstance) nodeInstances.get(0);
- nodeInstance.cancel();
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance).cancel();
}
super.cancel();
}
@@ -131,7 +133,8 @@
for (Iterator<NodeInstance> iterator = nodeInstances.iterator(); iterator.hasNext(); ) {
NodeInstance nodeInstance = iterator.next();
if (nodeInstance instanceof NodeInstanceContainer) {
- result.addAll(((NodeInstanceContainer) nodeInstance).getNodeInstances(true));
+ result.addAll(((NodeInstanceContainer)
+ nodeInstance).getNodeInstances(true));
}
}
}
@@ -165,7 +168,7 @@
}
NodeInstanceFactoryRegistry nodeRegistry =
- ((InternalRuleBase) getProcessInstance().getWorkingMemory().getRuleBase())
+ ((InternalRuleBase) ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getRuleBase())
.getConfiguration().getProcessNodeInstanceFactoryRegistry();
NodeInstanceFactory conf = nodeRegistry.getProcessNodeInstanceFactory(node);
if (conf == null) {
@@ -202,7 +205,7 @@
}
public void triggerCompleted() {
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, true);
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, true);
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EndNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -16,12 +16,14 @@
* limitations under the License.
*/
+import org.drools.WorkingMemory;
import org.drools.common.EventSupport;
import org.drools.common.InternalWorkingMemory;
import org.drools.process.instance.InternalProcessInstance;
-import org.drools.workflow.core.Node;
+import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.ProcessInstance;
import org.drools.workflow.core.node.EndNode;
-import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
/**
@@ -38,22 +40,23 @@
}
public void internalTrigger(final NodeInstance from, String type) {
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"An EndNode only accepts default incoming connections!");
}
- getNodeInstanceContainer().removeNodeInstance(this);
+ ((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
if (getEndNode().isTerminate()) {
boolean hidden = false;
if (getNode().getMetaData("hidden") != null) {
hidden = true;
}
+ WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
if (!hidden) {
- ((EventSupport) getProcessInstance().getWorkingMemory()).getRuleFlowEventSupport().fireBeforeRuleFlowNodeLeft(this, (InternalWorkingMemory) getProcessInstance().getWorkingMemory());
+ ((EventSupport) workingMemory).getRuleFlowEventSupport().fireBeforeRuleFlowNodeLeft(this, (InternalWorkingMemory) workingMemory);
}
- getProcessInstance().setState( InternalProcessInstance.STATE_COMPLETED );
+ ((InternalProcessInstance) getProcessInstance()).setState( ProcessInstance.STATE_COMPLETED );
if (!hidden) {
- ((EventSupport) getProcessInstance().getWorkingMemory()).getRuleFlowEventSupport().fireAfterRuleFlowNodeLeft(this, (InternalWorkingMemory) getProcessInstance().getWorkingMemory());
+ ((EventSupport) workingMemory).getRuleFlowEventSupport().fireAfterRuleFlowNodeLeft(this, (InternalWorkingMemory) workingMemory);
}
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EventBasedNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EventBasedNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EventBasedNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -6,13 +6,13 @@
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.timer.TimerInstance;
import org.drools.process.instance.timer.TimerManager;
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.NodeInstance;
import org.drools.workflow.instance.impl.ExtendedNodeInstanceImpl;
public abstract class EventBasedNodeInstance extends ExtendedNodeInstanceImpl implements EventBasedNodeInstanceInterface, EventListener {
@@ -32,7 +32,7 @@
if (timers != null) {
addTimerListener();
timerInstances = new ArrayList<Long>(timers.size());
- TimerManager timerManager = getProcessInstance().getWorkingMemory().getTimerManager();
+ TimerManager timerManager = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager();
for (Timer timer: timers.keySet()) {
TimerInstance timerInstance = createTimerInstance(timer);
timerManager.registerTimer(timerInstance, getProcessInstance());
@@ -73,7 +73,7 @@
}
public void triggerCompleted() {
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, true);
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, true);
}
public void addEventListeners() {
@@ -83,11 +83,11 @@
}
protected void addTimerListener() {
- getProcessInstance().addEventListener("timerTriggered", this, false);
+ ((InternalProcessInstance) getProcessInstance()).addEventListener("timerTriggered", this, false);
}
public void removeEventListeners() {
- getProcessInstance().removeEventListener("timerTriggered", this, false);
+ ((InternalProcessInstance) getProcessInstance()).removeEventListener("timerTriggered", this, false);
}
protected void triggerCompleted(String type, boolean remove) {
@@ -112,7 +112,7 @@
private void cancelTimers() {
// deactivate still active timers
if (timerInstances != null) {
- TimerManager timerManager = getProcessInstance().getWorkingMemory().getTimerManager();
+ TimerManager timerManager = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager();
for (Long id: timerInstances) {
timerManager.cancelTimer(id);
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EventNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EventNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/EventNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -18,10 +18,9 @@
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.workflow.core.Node;
import org.drools.workflow.core.node.EventNode;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
/**
@@ -68,7 +67,7 @@
}
public void triggerCompleted() {
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, true);
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, true);
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/FaultNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -19,11 +19,12 @@
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.workflow.core.Node;
import org.drools.workflow.core.node.FaultNode;
-import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
/**
@@ -40,17 +41,17 @@
}
public void internalTrigger(final NodeInstance from, String type) {
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"A FaultNode only accepts default incoming connections!");
}
String faultName = getFaultName();
ExceptionScopeInstance exceptionScopeInstance = getExceptionScopeInstance(faultName);
- getNodeInstanceContainer().removeNodeInstance(this);
+ ((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
if (exceptionScopeInstance != null) {
handleException(faultName, exceptionScopeInstance);
} else {
- getProcessInstance().setState(InternalProcessInstance.STATE_ABORTED);
+ ((InternalProcessInstance) getProcessInstance()).setState(ProcessInstance.STATE_ABORTED);
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -5,13 +5,14 @@
import java.util.Collections;
import java.util.List;
+import org.drools.knowledge.definitions.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;
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;
/*
@@ -76,22 +77,22 @@
public void internalTrigger(NodeInstance from, String type) {
String collectionExpression = getForEachNode().getCollectionExpression();
Collection<?> collection = evaluateCollectionExpression(collectionExpression);
- getNodeInstanceContainer().removeNodeInstance(this);
+ ((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
List<NodeInstance> nodeInstances = new ArrayList<NodeInstance>();
for (Object o: collection) {
String variableName = getForEachNode().getVariableName();
CompositeNodeInstance nodeInstance = (CompositeNodeInstance)
- getNodeInstanceContainer().getNodeInstance(getForEachSplitNode().getTo().getTo());
+ ((NodeInstanceContainer) getNodeInstanceContainer()).getNodeInstance(getForEachSplitNode().getTo().getTo());
VariableScopeInstance variableScopeInstance = (VariableScopeInstance)
nodeInstance.resolveContextInstance(VariableScope.VARIABLE_SCOPE, variableName);
variableScopeInstance.setVariable(variableName, o);
nodeInstances.add(nodeInstance);
}
for (NodeInstance nodeInstance: nodeInstances) {
- nodeInstance.trigger(this, getForEachSplitNode().getTo().getToType());
+ ((org.drools.workflow.instance.NodeInstance) nodeInstance).trigger(this, getForEachSplitNode().getTo().getToType());
}
if (!getForEachNode().isWaitForCompletion()) {
- ForEachNodeInstance.this.triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, false);
+ ForEachNodeInstance.this.triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, false);
}
}
@@ -133,7 +134,7 @@
public void internalTrigger(NodeInstance from, String type) {
if (getNodeInstanceContainer().getNodeInstances().size() == 1) {
- getNodeInstanceContainer().removeNodeInstance(this);
+ ((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
if (getForEachNode().isWaitForCompletion()) {
triggerConnection(getForEachJoinNode().getTo());
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -19,10 +19,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.process.instance.NodeInstance;
import org.drools.workflow.core.node.Join;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
/**
@@ -41,7 +40,7 @@
}
public void internalTrigger(final NodeInstance from, String type) {
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"An ActionNode only accepts default incoming connections!");
}
@@ -108,7 +107,7 @@
public void triggerCompleted() {
// join nodes are only removed from the container when they contain no more state
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, triggers.isEmpty());
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, triggers.isEmpty());
}
public Map<Long, Integer> getTriggers() {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -16,6 +16,7 @@
* limitations under the License.
*/
+import org.drools.WorkingMemory;
import org.drools.common.InternalAgenda;
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
@@ -24,10 +25,9 @@
import org.drools.event.AgendaGroupPoppedEvent;
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
-import org.drools.WorkingMemory;
-import org.drools.workflow.core.Node;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
import org.drools.workflow.core.node.MilestoneNode;
-import org.drools.workflow.instance.NodeInstance;
/**
* Runtime counterpart of a milestone node.
@@ -44,14 +44,15 @@
public void internalTrigger(final NodeInstance from, String type) {
super.internalTrigger(from, type);
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"A MilestoneNode only accepts default incoming connections!");
}
- String rule = "RuleFlow-Milestone-" + getProcessInstance().getProcess().getId()
+ String rule = "RuleFlow-Milestone-" + getProcessInstance().getProcessId()
+ "-" + getNode().getId();
- if( ((InternalAgenda)getProcessInstance().getAgenda()).isRuleActiveInRuleFlowGroup( "DROOLS_SYSTEM", rule ) ) {
+ if( ((InternalAgenda) ((InternalProcessInstance) getProcessInstance())
+ .getAgenda()).isRuleActiveInRuleFlowGroup( "DROOLS_SYSTEM", rule ) ) {
triggerCompleted();
} else {
addActivationListener();
@@ -64,12 +65,12 @@
}
private void addActivationListener() {
- getProcessInstance().getWorkingMemory().addEventListener(this);
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().addEventListener(this);
}
public void removeEventListeners() {
super.removeEventListeners();
- getProcessInstance().getWorkingMemory().removeEventListener(this);
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().removeEventListener(this);
}
public void activationCancelled(ActivationCancelledEvent event,
@@ -85,7 +86,7 @@
// new activations of the rule associate with a milestone node
// trigger node instances of that milestone node
String ruleName = event.getActivation().getRule().getName();
- String milestoneName = "RuleFlow-Milestone-" + getProcessInstance().getProcess().getId() + "-" + getNodeId();
+ String milestoneName = "RuleFlow-Milestone-" + getProcessInstance().getProcessId() + "-" + getNodeId();
if (milestoneName.equals(ruleName)) {
removeEventListeners();
triggerCompleted();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/RuleSetNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/RuleSetNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/RuleSetNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -18,9 +18,9 @@
import org.drools.common.InternalAgenda;
import org.drools.common.RuleFlowGroupListener;
-import org.drools.workflow.core.Node;
+import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
import org.drools.workflow.core.node.RuleSetNode;
-import org.drools.workflow.instance.NodeInstance;
/**
* Runtime counterpart of a ruleset node.
@@ -39,11 +39,11 @@
public void internalTrigger(final NodeInstance from,
String type) {
- if ( !Node.CONNECTION_DEFAULT_TYPE.equals( type ) ) {
+ if ( !org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals( type ) ) {
throw new IllegalArgumentException( "A RuleSetNode only accepts default incoming connections!" );
}
addRuleSetListener();
- getProcessInstance().getAgenda().activateRuleFlowGroup( getRuleSetNode().getRuleFlowGroup() );
+ ((InternalProcessInstance) getProcessInstance()).getAgenda().activateRuleFlowGroup( getRuleSetNode().getRuleFlowGroup() );
}
public void addEventListeners() {
@@ -52,19 +52,19 @@
}
private void addRuleSetListener() {
- ((InternalAgenda) getProcessInstance().getWorkingMemory().getAgenda()).addRuleFlowGroupListener( getRuleSetNode().getRuleFlowGroup(),
+ ((InternalAgenda) ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getAgenda()).addRuleFlowGroupListener( getRuleSetNode().getRuleFlowGroup(),
this );
}
public void removeEventListeners() {
super.removeEventListeners();
- ((InternalAgenda) getProcessInstance().getWorkingMemory().getAgenda()).removeRuleFlowGroupListener( getRuleSetNode().getRuleFlowGroup(),
+ ((InternalAgenda) ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getAgenda()).removeRuleFlowGroupListener( getRuleSetNode().getRuleFlowGroup(),
this );
}
public void cancel() {
super.cancel();
- getProcessInstance().getAgenda().deactivateRuleFlowGroup( getRuleSetNode().getRuleFlowGroup() );
+ ((InternalProcessInstance) getProcessInstance()).getAgenda().deactivateRuleFlowGroup( getRuleSetNode().getRuleFlowGroup() );
}
public void ruleFlowGroupDeactivated() {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -20,10 +20,10 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.process.instance.NodeInstance;
import org.drools.workflow.core.node.Split;
-import org.drools.workflow.instance.NodeInstance;
+import org.drools.workflow.instance.NodeInstanceContainer;
import org.drools.workflow.instance.impl.ConstraintEvaluator;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
@@ -41,7 +41,7 @@
}
public void internalTrigger(final NodeInstance from, String type) {
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"A Split only accepts default incoming connections!");
}
@@ -49,7 +49,7 @@
// TODO make different strategies for each type
switch ( split.getType() ) {
case Split.TYPE_AND :
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, true);
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, true);
break;
case Split.TYPE_XOR :
List<Connection> outgoing = split.getDefaultOutgoingConnections();
@@ -67,14 +67,14 @@
}
}
}
- getNodeInstanceContainer().removeNodeInstance(this);
+ ((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
if ( selected == null ) {
throw new IllegalArgumentException( "XOR split could not find at least one valid outgoing connection for split " + getSplit().getName() );
}
triggerConnection(selected);
break;
case Split.TYPE_OR :
- getNodeInstanceContainer().removeNodeInstance(this);
+ ((NodeInstanceContainer) getNodeInstanceContainer()).removeNodeInstance(this);
outgoing = split.getDefaultOutgoingConnections();
boolean found = false;
List<Connection> outgoingCopy = new ArrayList<Connection>(outgoing);
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/StartNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/StartNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/StartNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -16,9 +16,8 @@
* limitations under the License.
*/
-import org.drools.workflow.core.Node;
+import org.drools.process.instance.NodeInstance;
import org.drools.workflow.core.node.StartNode;
-import org.drools.workflow.instance.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
/**
@@ -47,7 +46,7 @@
}
public void triggerCompleted() {
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, true);
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, true);
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -24,10 +24,10 @@
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.workflow.core.Node;
import org.drools.workflow.core.node.SubProcessNode;
-import org.drools.workflow.instance.NodeInstance;
/**
* Runtime counterpart of a SubFlow node.
@@ -46,7 +46,7 @@
public void internalTrigger(final NodeInstance from, String type) {
super.internalTrigger(from, type);
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"A SubProcess node only accepts default incoming connections!");
}
@@ -63,14 +63,16 @@
}
}
String processId = getSubProcessNode().getProcessId();
- Process process = ((InternalRuleBase) getProcessInstance().getWorkingMemory().getRuleBase()).getProcess(processId);
+ Process process = ((InternalRuleBase) ((InternalProcessInstance) getProcessInstance())
+ .getWorkingMemory().getRuleBase()).getProcess(processId);
if (process == null) {
System.err.println("Could not find process " + processId);
System.err.println("Aborting process");
- getProcessInstance().setState(InternalProcessInstance.STATE_ABORTED);
+ ((InternalProcessInstance) getProcessInstance()).setState(InternalProcessInstance.STATE_ABORTED);
} else {
InternalProcessInstance processInstance = ( InternalProcessInstance )
- getProcessInstance().getWorkingMemory().startProcess(processId, parameters);
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory()
+ .startProcess(processId, parameters);
if (!getSubProcessNode().isWaitForCompletion()
|| processInstance.getState() == InternalProcessInstance.STATE_COMPLETED) {
triggerCompleted();
@@ -84,10 +86,10 @@
public void cancel() {
super.cancel();
if (!getSubProcessNode().isIndependent()) {
- InternalProcessInstance processInstance = ( InternalProcessInstance )
- getProcessInstance().getWorkingMemory()
+ InternalProcessInstance processInstance = (InternalProcessInstance)
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory()
.getProcessInstance(processInstanceId);
- processInstance.setState(InternalProcessInstance.STATE_ABORTED);
+ processInstance.setState(ProcessInstance.STATE_ABORTED);
}
}
@@ -105,12 +107,12 @@
}
private void addProcessListener() {
- getProcessInstance().addEventListener("processInstanceCompleted:" + processInstanceId, this, true);
+ ((InternalProcessInstance) getProcessInstance()).addEventListener("processInstanceCompleted:" + processInstanceId, this, true);
}
public void removeEventListeners() {
super.removeEventListeners();
- getProcessInstance().removeEventListener("processInstanceCompleted:" + processInstanceId, this, true);
+ ((InternalProcessInstance) getProcessInstance()).removeEventListener("processInstanceCompleted:" + processInstanceId, this, true);
}
public void signalEvent(String type, Object event) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/TimerNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/TimerNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/TimerNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -2,10 +2,10 @@
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.timer.TimerInstance;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.TimerNode;
-import org.drools.workflow.instance.NodeInstance;
public class TimerNodeInstance extends EventBasedNodeInstance implements EventListener {
@@ -26,7 +26,7 @@
}
public void internalTrigger(NodeInstance from, String type) {
- if (!Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
+ if (!org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE.equals(type)) {
throw new IllegalArgumentException(
"A TimerNode only accepts default incoming connections!");
}
@@ -34,7 +34,7 @@
if (getTimerInstances() == null) {
addTimerListener();
}
- getProcessInstance().getWorkingMemory().getTimerManager()
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager()
.registerTimer(timer, getProcessInstance());
timerId = timer.getId();
}
@@ -62,24 +62,24 @@
}
public void triggerCompleted(boolean remove) {
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, remove);
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, remove);
}
public void cancel() {
- getProcessInstance().getWorkingMemory().getTimerManager().cancelTimer(timerId);
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getTimerManager().cancelTimer(timerId);
super.cancel();
}
public void addEventListeners() {
super.addEventListeners();
if (getTimerInstances() == null) {
- getProcessInstance().addEventListener("timerTriggered", this, false);
+ ((InternalProcessInstance) getProcessInstance()).addEventListener("timerTriggered", this, false);
}
}
public void removeEventListeners() {
super.removeEventListeners();
- getProcessInstance().removeEventListener("timerTriggered", this, false);
+ ((InternalProcessInstance) getProcessInstance()).removeEventListener("timerTriggered", this, false);
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -22,18 +22,19 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.drools.WorkingMemory;
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.WorkItem;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.process.instance.impl.WorkItemImpl;
-import org.drools.WorkingMemory;
import org.drools.workflow.core.node.WorkItemNode;
-import org.drools.workflow.instance.NodeInstance;
/**
* Runtime counterpart of a work item node.
@@ -54,8 +55,8 @@
public WorkItem getWorkItem() {
if (workItem == null && workItemId >= 0) {
- workItem = ((InternalWorkItemManager) getProcessInstance().getWorkingMemory()
- .getWorkItemManager()).getWorkItem(workItemId);
+ workItem = ((InternalWorkItemManager) ((InternalProcessInstance) getProcessInstance())
+ .getWorkingMemory().getWorkItemManager()).getWorkItem(workItemId);
}
return workItem;
}
@@ -69,7 +70,8 @@
}
public boolean isInversionOfControl() {
- return ((InternalRuleBase) getProcessInstance().getWorkingMemory().getRuleBase()).getConfiguration().isAdvancedProcessRuleIntegration();
+ return ((InternalRuleBase) ((InternalProcessInstance) getProcessInstance())
+ .getWorkingMemory().getRuleBase()).getConfiguration().isAdvancedProcessRuleIntegration();
}
public void internalTrigger(final NodeInstance from, String type) {
@@ -85,9 +87,11 @@
addWorkItemListener();
}
if (isInversionOfControl()) {
- getProcessInstance().getWorkingMemory().update(getProcessInstance().getWorkingMemory().getFactHandle(this), this);
+ ((InternalProcessInstance) getProcessInstance()).getWorkingMemory()
+ .update(((InternalProcessInstance) getProcessInstance()).getWorkingMemory().getFactHandle(this), this);
} else {
- ((InternalWorkItemManager) getProcessInstance().getWorkingMemory().getWorkItemManager()).internalExecuteWorkItem(workItem);
+ ((InternalWorkItemManager) ((InternalProcessInstance) getProcessInstance())
+ .getWorkingMemory().getWorkItemManager()).internalExecuteWorkItem(workItem);
}
if (!workItemNode.isWaitForCompletion()) {
triggerCompleted();
@@ -158,7 +162,7 @@
}
}
if (isInversionOfControl()) {
- WorkingMemory workingMemory = getProcessInstance().getWorkingMemory();
+ WorkingMemory workingMemory = ((InternalProcessInstance) getProcessInstance()).getWorkingMemory();
workingMemory.update(workingMemory.getFactHandle(this), this);
} else {
triggerCompleted();
@@ -167,7 +171,8 @@
public void cancel() {
if (workItemId != -1) {
- ((InternalWorkItemManager) getProcessInstance().getWorkingMemory().getWorkItemManager()).internalAbortWorkItem(workItemId);
+ ((InternalWorkItemManager) ((InternalProcessInstance) getProcessInstance())
+ .getWorkingMemory().getWorkItemManager()).internalAbortWorkItem(workItemId);
}
super.cancel();
}
@@ -178,14 +183,14 @@
}
private void addWorkItemListener() {
- getProcessInstance().addEventListener("workItemCompleted", this, false);
- getProcessInstance().addEventListener("workItemAborted", this, false);
+ ((InternalProcessInstance) getProcessInstance()).addEventListener("workItemCompleted", this, false);
+ ((InternalProcessInstance) getProcessInstance()).addEventListener("workItemAborted", this, false);
}
public void removeEventListeners() {
super.removeEventListeners();
- getProcessInstance().removeEventListener("workItemCompleted", this, false);
- getProcessInstance().removeEventListener("workItemAborted", this, false);
+ ((InternalProcessInstance) getProcessInstance()).removeEventListener("workItemCompleted", this, false);
+ ((InternalProcessInstance) getProcessInstance()).removeEventListener("workItemAborted", this, false);
}
public void signalEvent(String type, Object event) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -8,8 +8,8 @@
import java.util.List;
import java.util.Map;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.instance.NodeInstance;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.process.instance.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
public class MockNodeInstance extends NodeInstanceImpl {
@@ -61,6 +61,6 @@
}
public void triggerCompleted() {
- triggerCompleted(Node.CONNECTION_DEFAULT_TYPE, true);
+ triggerCompleted(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE, true);
}
}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,10 +3,10 @@
*/
package org.drools.workflow.instance.node;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.instance.NodeInstance;
-import org.drools.workflow.instance.NodeInstanceContainer;
-import org.drools.workflow.instance.WorkflowProcessInstance;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.process.instance.NodeInstance;
+import org.drools.process.instance.NodeInstanceContainer;
+import org.drools.process.instance.WorkflowProcessInstance;
import org.drools.workflow.instance.impl.NodeInstanceFactory;
public class MockNodeInstanceFactory implements NodeInstanceFactory {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -10,13 +10,13 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.common.InternalWorkingMemory;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.process.instance.InternalProcessInstance;
+import org.drools.process.instance.NodeInstance;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.ConnectionImpl;
import org.drools.workflow.core.node.StartNode;
-import org.drools.workflow.instance.NodeInstance;
public class StartNodeInstanceTest extends TestCase {
@@ -32,12 +32,14 @@
RuleFlowProcess process = new RuleFlowProcess();
- Node startNode = new StartNode();
+ StartNode startNode = new StartNode();
startNode.setId( 1 );
startNode.setName( "start node" );
mockNode.setId( 2 );
- new ConnectionImpl(startNode, Node.CONNECTION_DEFAULT_TYPE, mockNode, Node.CONNECTION_DEFAULT_TYPE);
+ new ConnectionImpl(
+ startNode, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE,
+ mockNode, org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
process.addNode( startNode );
process.addNode( mockNode );
@@ -51,7 +53,8 @@
assertEquals( InternalProcessInstance.STATE_ACTIVE, processInstance.getState() );
MockNodeInstance mockNodeInstance = mockNodeFactory.getMockNodeInstance();
- List<NodeInstance> triggeredBy = mockNodeInstance.getTriggers().get(Node.CONNECTION_DEFAULT_TYPE);
+ List<NodeInstance> triggeredBy =
+ mockNodeInstance.getTriggers().get(org.drools.workflow.core.Node.CONNECTION_DEFAULT_TYPE);
assertNotNull(triggeredBy);
assertEquals(1, triggeredBy.size());
assertSame(startNode.getId(), triggeredBy.get(0).getNodeId());
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-jaxb/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-jaxb/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-jaxb/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,23 +1,25 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.0.3/jaxb-impl-2.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.0.3/jaxb-xjc-2.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-impl/2.0.3/jaxb-impl-2.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.0/jaxb-api-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jsr173_api/1.0/jsr173_api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/sun/xml/bind/jaxb-xjc/2.0.3/jaxb-xjc-2.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbStatefulSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbStatefulSession.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-jaxb/src/main/java/org/drools/dataloaders/jaxb/DroolsJaxbStatefulSession.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -25,8 +25,8 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import org.drools.FactHandle;
import org.drools.StatefulSession;
+import org.drools.runtime.rule.FactHandle;
import org.mvel.MVEL;
import org.mvel.ParserContext;
import org.mvel.compiler.ExpressionCompiler;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-smooks/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-smooks/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-smooks/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,28 +1,30 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/milyn/milyn-smooks-javabean/1.0.1/milyn-smooks-javabean-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/milyn/milyn-smooks-core/1.0.1/milyn-smooks-core-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/milyn/milyn-commons/1.0/milyn-commons-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.9/freemarker-2.3.9.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/milyn/milyn-smooks-javabean/1.0.1/milyn-smooks-javabean-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/milyn/milyn-smooks-core/1.0.1/milyn-smooks-core-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/milyn/milyn-commons/1.0/milyn-commons-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.9/freemarker-2.3.9.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatefulSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatefulSession.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-dataloaders/drools-dataloaders-smooks/src/main/java/org/drools/dataloaders/smooks/DroolsSmooksStatefulSession.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -6,9 +6,9 @@
import javax.xml.transform.Source;
-import org.drools.FactHandle;
import org.drools.StatefulSession;
import org.drools.common.InternalRuleBase;
+import org.drools.runtime.rule.FactHandle;
import org.milyn.Smooks;
import org.milyn.container.ExecutionContext;
import org.milyn.payload.JavaResult;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-decisiontables/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-decisiontables/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-decisiontables/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,20 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="src" path="/drools-templates"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="src" path="/drools-templates"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -15,5 +15,6 @@
<classpathentry exported="true" kind="lib" path="lib/antlr-runtime.jar"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="lib" path="lib/drools-api.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/META-INF/MANIFEST.MF 2008-10-07 16:01:55 UTC (rev 23352)
@@ -30,8 +30,9 @@
Eclipse-LazyStart: true
Eclipse-BuddyPolicy: registered
Bundle-ClassPath: .,
+ lib/drools-api.jar,
+ lib/drools-core.jar,
lib/drools-compiler.jar,
- lib/drools-core.jar,
lib/drools-decisiontables.jar,
lib/drools-jsr94.jar,
lib/jsr94.jar,
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/build.properties
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/build.properties 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/build.properties 2008-10-07 16:01:55 UTC (rev 23352)
@@ -4,7 +4,8 @@
plugin.xml,\
help/,\
lib/,\
- lib/drools-templates.jar
+ lib/drools-templates.jar,\
+ lib/drools-api.jar
bin.excludes = lib/drools-documentation.jar
src.includes = META-INF/,\
icons/,\
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/DroolsEclipsePlugin.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -474,7 +474,7 @@
Thread.currentThread().setContextClassLoader( newLoader );
PackageBuilderConfiguration configuration = new PackageBuilderConfiguration();
XmlProcessReader xmlReader = new XmlProcessReader( configuration.getSemanticModules() );
- Process process = xmlReader.read( new StringReader( input ) );
+ Process process = (Process) xmlReader.read( new StringReader( input ) );
if ( process != null ) {
return parseProcess( process,
resource );
@@ -498,7 +498,7 @@
IResource resource) {
PackageBuilder packageBuilder = new PackageBuilder();
ProcessBuilder processBuilder = new ProcessBuilder( packageBuilder );
- processBuilder.buildProcess( process );
+ processBuilder.buildProcess( process, resource.getLocation().toString() );
ProcessInfo processInfo = new ProcessInfo( process.getId(),
process );
processInfo.setErrors( processBuilder.getErrors() );
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/ProcessInfo.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/ProcessInfo.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/ProcessInfo.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -3,7 +3,7 @@
import java.util.List;
import org.drools.compiler.DroolsError;
-import org.drools.process.core.Process;
+import org.drools.knowledge.definitions.process.Process;
public class ProcessInfo {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/debug/ProcessInstanceViewer.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -104,7 +104,7 @@
try {
ProcessExtension processExtension = (ProcessExtension)
element.createExecutableExtension("className");
- Process process = processInfo.getProcess();
+ Process process = (Process) processInfo.getProcess();
if (processExtension.acceptsProcess(process.getType())) {
ProcessEditPartFactory editPartFactory = processExtension.getProcessEditPartFactory();
editPartFactory.setProject(javaProject);
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -22,8 +22,8 @@
import org.drools.eclipse.flow.common.editor.GenericModelEditor;
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ProcessWrapper;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Rectangle;
import org.eclipse.draw2d.graph.DirectedGraph;
@@ -71,7 +71,7 @@
protected DirectedGraph createDirectedGraph(Map<Long, Node> mapping) {
DirectedGraph graph = new DirectedGraph();
WorkflowProcess process = (WorkflowProcess) ((ProcessWrapper) ((GenericModelEditor) editor).getModel()).getProcess();
- for (org.drools.workflow.core.Node processNode: process.getNodes()) {
+ for (org.drools.knowledge.definitions.process.Node processNode: process.getNodes()) {
Node node = new Node();
Integer width = (Integer) processNode.getMetaData("width");
Integer height = (Integer) processNode.getMetaData("height");
@@ -85,7 +85,7 @@
graph.nodes.add(node);
mapping.put(processNode.getId(), node);
}
- for (org.drools.workflow.core.Node processNode: process.getNodes()) {
+ for (org.drools.knowledge.definitions.process.Node processNode: process.getNodes()) {
for (List<Connection> connections: processNode.getIncomingConnections().values()) {
for (Connection connection: connections) {
Node source = mapping.get(connection.getFrom().getId());
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -28,7 +28,7 @@
import org.drools.eclipse.flow.ruleflow.view.property.exceptionHandler.ExceptionHandlersPropertyDescriptor;
import org.drools.eclipse.flow.ruleflow.view.property.swimlane.SwimlanesCellEditor;
import org.drools.eclipse.flow.ruleflow.view.property.variable.VariableListCellEditor;
-import org.drools.process.core.Process;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.process.core.context.exception.ExceptionHandler;
import org.drools.process.core.context.exception.ExceptionScope;
import org.drools.process.core.context.swimlane.Swimlane;
@@ -65,13 +65,13 @@
public static final String SWIMLANES = "swimlanes";
public static final String EXCEPTION_HANDLERS = "exceptionHandlers";
- private Process process;
+ private org.drools.process.core.Process process;
private Map<String, ElementWrapper> elements = new HashMap<String, ElementWrapper>();
private transient List<ModelListener> listeners = new ArrayList<ModelListener>();
protected IPropertyDescriptor[] descriptors;
public ProcessWrapper() {
- process = createProcess();
+ process = (org.drools.process.core.Process) createProcess();
}
protected abstract Process createProcess();
@@ -81,7 +81,7 @@
}
public void localSetProcess(Process process) {
- this.process = process;
+ this.process = (org.drools.process.core.Process) process;
}
public String getName() {
@@ -227,13 +227,13 @@
return getRouterLayout();
}
if (VARIABLES.equals(id)) {
- return ((VariableScope) getProcess().getDefaultContext(VariableScope.VARIABLE_SCOPE)).getVariables();
+ return ((VariableScope) process.getDefaultContext(VariableScope.VARIABLE_SCOPE)).getVariables();
}
if (SWIMLANES.equals(id)) {
- return ((SwimlaneContext) getProcess().getDefaultContext(SwimlaneContext.SWIMLANE_SCOPE)).getSwimlanes();
+ return ((SwimlaneContext) process.getDefaultContext(SwimlaneContext.SWIMLANE_SCOPE)).getSwimlanes();
}
if (EXCEPTION_HANDLERS.equals(id)) {
- return ((ExceptionScope) getProcess().getDefaultContext(ExceptionScope.EXCEPTION_SCOPE)).getExceptionHandlers();
+ return ((ExceptionScope) process.getDefaultContext(ExceptionScope.EXCEPTION_SCOPE)).getExceptionHandlers();
}
return null;
}
@@ -259,15 +259,15 @@
setRouterLayout(null);
}
if (VARIABLES.equals(id)) {
- ((VariableScope) getProcess().getDefaultContext(
+ ((VariableScope) process.getDefaultContext(
VariableScope.VARIABLE_SCOPE)).setVariables(new ArrayList<Variable>());
}
if (SWIMLANES.equals(id)) {
- ((SwimlaneContext) getProcess().getDefaultContext(
+ ((SwimlaneContext) process.getDefaultContext(
SwimlaneContext.SWIMLANE_SCOPE)).setSwimlanes(new ArrayList<Swimlane>());
}
if (EXCEPTION_HANDLERS.equals(id)) {
- ((ExceptionScope) getProcess().getDefaultContext(
+ ((ExceptionScope) process.getDefaultContext(
ExceptionScope.EXCEPTION_SCOPE)).setExceptionHandlers(new HashMap<String, ExceptionHandler>());
}
}
@@ -285,13 +285,13 @@
} else if (ROUTER_LAYOUT.equals(id)) {
setRouterLayout((Integer) value);
} else if (VARIABLES.equals(id)) {
- ((VariableScope) getProcess().getDefaultContext(
+ ((VariableScope) process.getDefaultContext(
VariableScope.VARIABLE_SCOPE)).setVariables((List<Variable>) value);
} else if (SWIMLANES.equals(id)) {
- ((SwimlaneContext) getProcess().getDefaultContext(
+ ((SwimlaneContext) process.getDefaultContext(
SwimlaneContext.SWIMLANE_SCOPE)).setSwimlanes((List<Swimlane>) value);
} else if (EXCEPTION_HANDLERS.equals(id)) {
- ((ExceptionScope) getProcess().getDefaultContext(
+ ((ExceptionScope) process.getDefaultContext(
ExceptionScope.EXCEPTION_SCOPE)).setExceptionHandlers((Map<String, ExceptionHandler>) value);
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapperBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapperBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapperBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,6 +1,6 @@
package org.drools.eclipse.flow.common.editor.core;
-import org.drools.process.core.Process;
+import org.drools.knowledge.definitions.process.Process;
import org.eclipse.jdt.core.IJavaProject;
public interface ProcessWrapperBuilder {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ActionWrapper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -19,8 +19,8 @@
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
import org.drools.eclipse.flow.ruleflow.view.property.action.ActionPropertyDescriptor;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.ActionNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EventBasedNodeWrapper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EventBasedNodeWrapper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/EventBasedNodeWrapper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -4,9 +4,9 @@
import org.drools.eclipse.flow.common.editor.core.DefaultElementWrapper;
import org.drools.eclipse.flow.ruleflow.view.property.timers.TimersPropertyDescriptor;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.timer.Timer;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.EventBasedNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ExtendedNodeWrapper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ExtendedNodeWrapper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/ExtendedNodeWrapper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -4,8 +4,8 @@
import org.drools.eclipse.flow.ruleflow.view.property.action.OnEntryActionsPropertyDescriptor;
import org.drools.eclipse.flow.ruleflow.view.property.action.OnExitActionsPropertyDescriptor;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/MilestoneWrapper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -18,7 +18,7 @@
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.MilestoneConstraintPropertyDescriptor;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,9 +17,9 @@
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ProcessWrapper;
-import org.drools.process.core.Process;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.workflow.core.Node;
/**
* Wrapper for a RuleFlow process.
@@ -46,7 +46,7 @@
id = n.getId();
}
}
- node.setId(++id);
+ ((org.drools.workflow.core.Node) node).setId(++id);
getRuleFlowProcess().addNode(node);
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowWrapperBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowWrapperBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowWrapperBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -11,13 +11,13 @@
import org.drools.eclipse.flow.common.editor.core.ElementContainer;
import org.drools.eclipse.flow.common.editor.core.ProcessWrapper;
import org.drools.eclipse.flow.common.editor.core.ProcessWrapperBuilder;
-import org.drools.process.core.Process;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.process.core.Work;
import org.drools.process.core.WorkDefinition;
import org.drools.process.core.impl.WorkDefinitionImpl;
import org.drools.ruleflow.core.RuleFlowProcess;
-import org.drools.workflow.core.Connection;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.ActionNode;
import org.drools.workflow.core.node.CompositeContextNode;
import org.drools.workflow.core.node.CompositeNode;
@@ -56,7 +56,7 @@
Map<Node, NodeWrapper> nodeWrappers = new HashMap<Node, NodeWrapper>();
for (Node node: nodes) {
NodeWrapper nodeWrapper = getNodeWrapper(node, project);
- nodeWrapper.setNode(node);
+ nodeWrapper.setNode((org.drools.workflow.core.Node) node);
nodeWrapper.setParent(container);
container.localAddElement(nodeWrapper);
nodeWrappers.put(node, nodeWrapper);
@@ -80,7 +80,7 @@
}
for (Connection connection: connections) {
ConnectionWrapper connectionWrapper = new ConnectionWrapper();
- connectionWrapper.localSetConnection(connection);
+ connectionWrapper.localSetConnection((org.drools.workflow.core.Connection) connection);
connectionWrapper.localSetBendpoints(null);
NodeWrapper from = nodeWrappers.get(connection.getFrom());
NodeWrapper to = nodeWrappers.get(connection.getTo());
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -25,9 +25,9 @@
import org.drools.eclipse.flow.common.editor.core.ElementConnection;
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.ConstraintsPropertyDescriptor;
-import org.drools.workflow.core.Connection;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.Split;
import org.eclipse.ui.views.properties.ComboBoxPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCellEditor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.node.ActionNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -26,7 +26,7 @@
import org.drools.eclipse.editors.DRLRuleEditor;
import org.drools.eclipse.editors.completion.RuleCompletionProcessor;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaProject;
@@ -94,7 +94,7 @@
private void loadImports() {
this.imports = new ArrayList();
- List imports = process.getImports();
+ List imports = ((org.drools.process.core.Process) process).getImports();
if (imports != null) {
Iterator iterator = imports.iterator();
while (iterator.hasNext()) {
@@ -120,7 +120,7 @@
}
private void loadGlobals() {
- this.globals = Arrays.asList(process.getGlobalNames());
+ this.globals = Arrays.asList(((org.drools.process.core.Process) process).getGlobalNames());
}
private void loadAttributes() {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -23,8 +23,9 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowGlobalsDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowImportsDialog;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.process.core.Process;
import org.drools.util.ArrayUtils;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
@@ -223,7 +224,7 @@
int code = dialog.open();
if (code != CANCEL) {
List imports = dialog.getImports();
- process.setImports(imports);
+ ((Process) process).setImports(imports);
completionProcessor.reset();
}
}
@@ -240,7 +241,7 @@
int code = dialog.open();
if (code != CANCEL) {
Map globals = dialog.getGlobals();
- process.setGlobals(globals);
+ ((Process) process).setGlobals(globals);
completionProcessor.reset();
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionPropertyDescriptor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.node.ActionNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionsDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,8 +17,8 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditListDialog;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.swt.widgets.Shell;
/**
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsCellEditor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnEntryActionsPropertyDescriptor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,6 +1,6 @@
package org.drools.eclipse.flow.ruleflow.view.property.action;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsCellEditor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/OnExitActionsPropertyDescriptor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,6 +1,6 @@
package org.drools.eclipse.flow.ruleflow.view.property.action;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintCompletionProcessor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -23,7 +23,7 @@
import org.drools.eclipse.editors.DRLRuleEditor;
import org.drools.eclipse.editors.completion.RuleCompletionProcessor;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jdt.core.IJavaProject;
@@ -82,7 +82,7 @@
private void loadImports() {
this.imports = new ArrayList();
- List imports = process.getImports();
+ List imports = ((org.drools.process.core.Process) process).getImports();
if (imports != null) {
Iterator iterator = imports.iterator();
while (iterator.hasNext()) {
@@ -108,7 +108,7 @@
}
private void loadGlobals() {
- this.globals = Arrays.asList(process.getGlobalNames());
+ this.globals = Arrays.asList(((org.drools.process.core.Process) process).getGlobalNames());
}
private IJavaProject getJavaProject() {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListCellEditor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.node.Split;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -20,9 +20,9 @@
import java.util.Map;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.Connection;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.Split;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintsPropertyDescriptor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.node.Split;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintCellEditor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -21,7 +21,7 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
@@ -181,7 +181,7 @@
int code = dialog.open();
if (code != CANCEL) {
List imports = dialog.getImports();
- process.setImports(imports);
+ ((org.drools.process.core.Process) process).setImports(imports);
completionProcessor.reset();
}
}
@@ -198,7 +198,7 @@
int code = dialog.open();
if (code != CANCEL) {
Map globals = dialog.getGlobals();
- process.setGlobals(globals);
+ ((org.drools.process.core.Process) process).setGlobals(globals);
completionProcessor.reset();
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/MilestoneConstraintPropertyDescriptor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -16,7 +16,7 @@
*/
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.node.MilestoneNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowConstraintDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -20,9 +20,9 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.util.ArrayUtils;
import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.ConstraintImpl;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.resource.JFaceResources;
@@ -257,7 +257,7 @@
int code = dialog.open();
if (code != CANCEL) {
List imports = dialog.getImports();
- process.setImports(imports);
+ ((org.drools.process.core.Process) process).setImports(imports);
completionProcessor.reset();
}
}
@@ -274,7 +274,7 @@
int code = dialog.open();
if (code != CANCEL) {
Map globals = dialog.getGlobals();
- process.setGlobals(globals);
+ ((org.drools.process.core.Process) process).setGlobals(globals);
completionProcessor.reset();
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowGlobalsDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -22,7 +22,7 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -114,7 +114,7 @@
private String getProcessImports() {
String result = "# define your globals here: e.g. global java.util.List myList\n";
- Map<String, String> globals = process.getGlobals();
+ Map<String, String> globals = ((org.drools.process.core.Process) process).getGlobals();
if (globals != null) {
for (Map.Entry<String, String> entry: globals.entrySet()) {
result += "global " + entry.getValue() + " " + entry.getKey() + "\n";
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/RuleFlowImportsDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -22,7 +22,8 @@
import org.drools.eclipse.editors.DRLSourceViewerConfig;
import org.drools.eclipse.editors.scanners.DRLPartionScanner;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.process.core.Process;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.text.Document;
import org.eclipse.jface.text.IDocument;
@@ -114,7 +115,7 @@
private String getProcessImports() {
String result = "# define your imports here: e.g. import com.sample.MyClass\n";
- List<String> imports = process.getImports();
+ List<String> imports = ((Process) process).getImports();
if (imports != null) {
for (String importString: imports) {
result += "import " + importString + "\n";
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlerDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -25,10 +25,11 @@
import org.drools.eclipse.flow.ruleflow.view.property.action.ActionCompletionProcessor;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowGlobalsDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowImportsDialog;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.process.core.Process;
import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.drools.util.ArrayUtils;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
@@ -247,7 +248,7 @@
int code = dialog.open();
if (code != CANCEL) {
List<String> imports = dialog.getImports();
- process.setImports(imports);
+ ((Process) process).setImports(imports);
completionProcessor.reset();
}
}
@@ -264,7 +265,7 @@
int code = dialog.open();
if (code != CANCEL) {
Map<String, String> globals = dialog.getGlobals();
- process.setGlobals(globals);
+ ((Process) process).setGlobals(globals);
completionProcessor.reset();
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -19,7 +19,7 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.process.core.Process;
+import org.drools.knowledge.definitions.process.Process;
import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,9 +17,9 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditMapDialog;
-import org.drools.process.core.Process;
+import org.drools.knowledge.definitions.process.Process;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.context.exception.ActionExceptionHandler;
-import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.swt.widgets.Shell;
/**
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,7 +1,7 @@
package org.drools.eclipse.flow.ruleflow.view.property.exceptionHandler;
import org.drools.eclipse.flow.common.view.property.ListPropertyDescriptor;
-import org.drools.process.core.Process;
+import org.drools.knowledge.definitions.process.Process;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimerDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -25,10 +25,11 @@
import org.drools.eclipse.flow.ruleflow.view.property.action.ActionCompletionProcessor;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowGlobalsDialog;
import org.drools.eclipse.flow.ruleflow.view.property.constraint.RuleFlowImportsDialog;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.process.core.Process;
import org.drools.process.core.timer.Timer;
import org.drools.util.ArrayUtils;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.Document;
@@ -246,7 +247,7 @@
int code = dialog.open();
if (code != CANCEL) {
List<String> imports = dialog.getImports();
- process.setImports(imports);
+ ((Process) process).setImports(imports);
completionProcessor.reset();
}
}
@@ -263,7 +264,7 @@
int code = dialog.open();
if (code != CANCEL) {
Map<String, String> globals = dialog.getGlobals();
- process.setGlobals(globals);
+ ((Process) process).setGlobals(globals);
completionProcessor.reset();
}
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersCellEditor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -19,9 +19,9 @@
import org.drools.eclipse.flow.common.view.property.BeanDialogCellEditor;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.timer.Timer;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.EventBasedNode;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersDialog.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -17,9 +17,9 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditMapDialog;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.process.core.timer.Timer;
import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/timers/TimersPropertyDescriptor.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,6 +1,6 @@
package org.drools.eclipse.flow.ruleflow.view.property.timers;
-import org.drools.workflow.core.WorkflowProcess;
+import org.drools.knowledge.definitions.process.WorkflowProcess;
import org.drools.workflow.core.node.EventBasedNode;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,87 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6/dom4j-1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/emma/emma/2.0.5312/emma-2.0.5312.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.0/cobogw-1.0.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="src" path="/drools-decisiontables"/>
- <classpathentry kind="src" path="/drools-templates"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="src" path="/drools-repository"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2.CR6/jboss-security-acl-impl-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2.CR6/identity-impl-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl/2.0.2.Beta4/jboss-security-acl-2.0.2.Beta4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/acl-spi/2.0.2.CR6/acl-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-spi/2.0.2.CR6/identity-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/authorization-spi/2.0.2.CR6/authorization-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="src" path="/drools-verifier"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.1.0.BETA1/jboss-seam-2.1.0.BETA1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/el/jboss-el/1.0_02.CR2/jboss-el-1.0_02.CR2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-remoting/2.1.0.BETA1/jboss-seam-remoting-2.1.0.BETA1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/pl/balon/gwt/gwt-diagrams/0.1/gwt-diagrams-0.1.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/1.5.2/gwt-servlet-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/gwtext/gwtext/2.0.5/gwtext-2.0.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6/dom4j-1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/emma/emma/2.0.5312/emma-2.0.5312.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-api/1.2/el-api-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/el/el-ri/1.2/el-ri-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.0/cobogw-1.0.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="src" path="/drools-decisiontables"/>
+ <classpathentry kind="src" path="/drools-templates"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="src" path="/drools-repository"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2.CR6/jboss-security-acl-impl-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.4.GA/jboss-common-core-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2.CR6/identity-impl-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl/2.0.2.Beta4/jboss-security-acl-2.0.2.Beta4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/acl-spi/2.0.2.CR6/acl-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-spi/2.0.2.CR6/identity-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/authorization-spi/2.0.2.CR6/authorization-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+ <classpathentry kind="src" path="/drools-verifier"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.1.0.BETA1/jboss-seam-2.1.0.BETA1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/el/jboss-el/1.0_02.CR2/jboss-el-1.0_02.CR2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam-remoting/2.1.0.BETA1/jboss-seam-remoting-2.1.0.BETA1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/pl/balon/gwt/gwt-diagrams/0.1/gwt-diagrams-0.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -12,10 +12,11 @@
import org.drools.guvnor.client.rulefloweditor.TransferConnection;
import org.drools.guvnor.client.rulefloweditor.TransferNode;
import org.drools.guvnor.client.rulefloweditor.WorkItemTransferNode;
+import org.drools.knowledge.definitions.process.Connection;
+import org.drools.knowledge.definitions.process.Node;
import org.drools.process.core.Work;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.ActionNode;
import org.drools.workflow.core.node.CompositeNode;
import org.drools.workflow.core.node.EndNode;
@@ -140,15 +141,15 @@
private void createConnections(RuleFlowContentModel model,
Node node) {
- for ( List<org.drools.workflow.core.Connection> inConnections : node.getIncomingConnections().values() ) {
- for ( org.drools.workflow.core.Connection connection : inConnections ) {
+ for ( List<Connection> inConnections : node.getIncomingConnections().values() ) {
+ for ( Connection connection : inConnections ) {
createConnection( model,
connection );
}
}
- for ( List<org.drools.workflow.core.Connection> outConnections : node.getOutgoingConnections().values() ) {
- for ( org.drools.workflow.core.Connection connection : outConnections ) {
+ for ( List<Connection> outConnections : node.getOutgoingConnections().values() ) {
+ for ( Connection connection : outConnections ) {
createConnection( model,
connection );
}
@@ -162,7 +163,7 @@
* @param connection
*/
private void createConnection(RuleFlowContentModel model,
- org.drools.workflow.core.Connection connection) {
+ Connection connection) {
TransferConnection tc = new TransferConnection();
tc.setFromId( connection.getFrom().getId() );
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -8,16 +8,16 @@
import org.drools.guvnor.client.rulefloweditor.SplitTransferNode;
import org.drools.guvnor.client.rulefloweditor.TransferNode;
import org.drools.guvnor.client.rulefloweditor.WorkItemTransferNode;
+import org.drools.knowledge.definitions.process.Node;
+import org.drools.knowledge.definitions.process.NodeContainer;
import org.drools.process.core.Work;
+import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.workflow.core.Constraint;
-import org.drools.workflow.core.Node;
-import org.drools.workflow.core.NodeContainer;
import org.drools.workflow.core.node.ForEachNode;
import org.drools.workflow.core.node.HumanTaskNode;
import org.drools.workflow.core.node.Split;
import org.drools.workflow.core.node.WorkItemNode;
import org.drools.workflow.core.node.Split.ConnectionRef;
-import org.drools.ruleflow.core.RuleFlowProcess;
public class RuleFlowProcessBuilder {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,24 +1,26 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="src" path="/drools-decisiontables"/>
- <classpathentry kind="src" path="/drools-templates"/>
- <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94/1.1/jsr94-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-sigtest/1.1/jsr94-sigtest-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jsr94/jsr94-tck/1.0.3/jsr94-tck-1.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="src" path="/drools-decisiontables"/>
+ <classpathentry kind="src" path="/drools-templates"/>
+ <classpathentry kind="var" path="M2_REPO/jexcelapi/jxl/2.4.2/jxl-2.4.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/src/main/java/org/drools/jsr94/rules/ObjectFilterAdapter.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/src/main/java/org/drools/jsr94/rules/ObjectFilterAdapter.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/src/main/java/org/drools/jsr94/rules/ObjectFilterAdapter.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -7,7 +7,7 @@
* @author mproctor
*
*/
-public class ObjectFilterAdapter implements org.drools.ObjectFilter {
+public class ObjectFilterAdapter implements org.drools.runtime.ObjectFilter {
private ObjectFilter filter;
public ObjectFilterAdapter(ObjectFilter filter) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/src/main/java/org/drools/jsr94/rules/admin/RuleExecutionSetImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/src/main/java/org/drools/jsr94/rules/admin/RuleExecutionSetImpl.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-jsr94/src/main/java/org/drools/jsr94/rules/admin/RuleExecutionSetImpl.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -35,7 +35,6 @@
import org.drools.jsr94.rules.Jsr94FactHandleFactory;
import org.drools.rule.Package;
import org.drools.rule.Rule;
-import org.drools.util.UUIDGenerator;
/**
* The Drools implementation of the <code>RuleExecutionSet</code> interface
@@ -121,11 +120,11 @@
RuleBaseConfiguration config = ( RuleBaseConfiguration ) this.properties.get( Constants.RES_RULEBASE_CONFIG );
org.drools.reteoo.ReteooRuleBase ruleBase;
if ( config != null ) {
- ruleBase = new org.drools.reteoo.ReteooRuleBase( UUIDGenerator.getInstance().generateRandomBasedUUID().toString(),
+ ruleBase = new org.drools.reteoo.ReteooRuleBase( null,
config,
new Jsr94FactHandleFactory() );
} else {
- ruleBase = new org.drools.reteoo.ReteooRuleBase( UUIDGenerator.getInstance().generateRandomBasedUUID().toString(),
+ ruleBase = new org.drools.reteoo.ReteooRuleBase( null,
new Jsr94FactHandleFactory() );
}
ruleBase.addPackage( pkg );
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-repository/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-repository/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-repository/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,62 +1,62 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/acl-spi/2.0.2.CR6/acl-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-spi/2.0.2.CR6/identity-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/authorization-spi/2.0.2.CR6/authorization-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl/2.0.2.Beta4/jboss-security-acl-2.0.2.Beta4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2.CR6/jboss-security-acl-impl-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
- <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
- <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/javassist/3.3.ga/javassist-3.3.ga.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2.CR6/identity-impl-2.0.2.CR6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
+ <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
+ <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/hsqldb/hsqldb/1.8.0.2/hsqldb-1.8.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/jcr/jcr/1.0/jcr-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-core/1.4.5/jackrabbit-core-1.4.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/concurrent/concurrent/1.3.4/concurrent-1.3.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-api/1.4/jackrabbit-api-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-jcr-commons/1.4/jackrabbit-jcr-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi-commons/1.4/jackrabbit-spi-commons-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-spi/1.4/jackrabbit-spi-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jackrabbit/jackrabbit-text-extractors/1.4/jackrabbit-text-extractors-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.8.0/xercesImpl-2.8.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/lucene/lucene-core/2.2.0/lucene-core-2.2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/derby/derby/10.2.1.6/derby-10.2.1.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/acl-spi/2.0.2.CR6/acl-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-spi/2.0.2.CR6/identity-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/authorization-spi/2.0.2.CR6/authorization-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl/2.0.2.Beta4/jboss-security-acl-2.0.2.Beta4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.1.GA/jboss-common-core-2.2.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.7.1/xml-apis-2.7.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-httpclient/commons-httpclient/2.0.2/commons-httpclient-2.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-slide/webdavlib/2.0/webdavlib-2.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-logging-spi/2.0.4.GA/jboss-common-logging-spi-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-spi/2.0.2.GA/jboss-logging-spi-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-logging-log4j/2.0.2.GA/jboss-logging-log4j-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-common-core/2.0.2.GA/jboss-common-core-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-acl-impl/2.0.2.CR6/jboss-security-acl-impl-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.2.CR6/jboss-security-spi-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate/3.2.4.sp1/hibernate-3.2.4.sp1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/net/sf/ehcache/ehcache/1.2.3/ehcache-1.2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm-attrs/1.5.3/asm-attrs-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1_3/cglib-2.1_3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/asm/asm/1.5.3/asm-1.5.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.3.0.ga/hibernate-annotations-3.3.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.3.1.ga/hibernate-entitymanager-3.3.1.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.0.0.ga/hibernate-commons-annotations-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-validator/3.0.0.ga/hibernate-validator-3.0.0.ga.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.3.GA/javassist-3.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/identity-impl/2.0.2.CR6/identity-impl-2.0.2.CR6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/tmatesoft/svnkit/1.1.2/svnkit-1.1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ch/ethz/ganymed/ganymed-ssh2/build210/ganymed-ssh2-build210.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-repository/.project
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-repository/.project 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-repository/.project 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,13 +1,13 @@
-<projectDescription>
- <name>drools-repository</name>
- <comment>A rule production system</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+<projectDescription>
+ <name>drools-repository</name>
+ <comment>A rule production system</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
</projectDescription>
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-core/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-core/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-core/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,25 +1,27 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,26 +1,28 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar"/>
- <classpathentry kind="src" path="/drools-solver-core"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.3/commons-lang-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.13/log4j-1.2.13.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-io/1.3.2/commons-io-1.3.2.jar"/>
+ <classpathentry kind="src" path="/drools-solver-core"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.4.3/slf4j-api-1.4.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.4.3/slf4j-log4j12-1.4.3.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/business/SolutionBusiness.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/business/SolutionBusiness.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/common/business/SolutionBusiness.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -11,7 +11,7 @@
import java.util.Map;
import org.drools.WorkingMemory;
-import org.drools.base.ClassObjectFilter;
+import org.drools.runtime.ClassObjectFilter;
import org.drools.solver.core.Solver;
import org.drools.solver.core.localsearch.DefaultLocalSearchSolver;
import org.drools.solver.core.localsearch.LocalSearchSolverScope;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/move/CurriculumCourseMoveHelper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,7 +1,8 @@
package org.drools.solver.examples.itc2007.curriculumcourse.solver.move;
-import org.drools.FactHandle;
+
import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.solver.examples.itc2007.curriculumcourse.domain.Lecture;
import org.drools.solver.examples.itc2007.curriculumcourse.domain.Period;
import org.drools.solver.examples.itc2007.curriculumcourse.domain.Room;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/curriculumcourse/solver/solution/initializer/CurriculumCourseStartingSolutionInitializer.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -5,8 +5,8 @@
import java.util.List;
import org.apache.commons.lang.builder.CompareToBuilder;
-import org.drools.FactHandle;
import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.solver.core.localsearch.LocalSearchSolverScope;
import org.drools.solver.core.solution.initializer.AbstractStartingSolutionInitializer;
import org.drools.solver.examples.common.domain.PersistableIdComparator;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/ExaminationMoveHelper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/ExaminationMoveHelper.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/move/ExaminationMoveHelper.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,7 +1,7 @@
package org.drools.solver.examples.itc2007.examination.solver.move;
-import org.drools.FactHandle;
import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.solver.examples.itc2007.examination.domain.Exam;
import org.drools.solver.examples.itc2007.examination.domain.Period;
import org.drools.solver.examples.itc2007.examination.domain.Room;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/itc2007/examination/solver/solution/initializer/ExaminationStartingSolutionInitializer.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -9,8 +9,8 @@
import java.util.Set;
import org.apache.commons.lang.builder.CompareToBuilder;
-import org.drools.FactHandle;
import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.solver.core.localsearch.LocalSearchSolverScope;
import org.drools.solver.core.solution.initializer.AbstractStartingSolutionInitializer;
import org.drools.solver.examples.common.domain.PersistableIdComparator;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/lessonschedule/solver/move/TimeslotChangeMove.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/lessonschedule/solver/move/TimeslotChangeMove.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/lessonschedule/solver/move/TimeslotChangeMove.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -6,8 +6,8 @@
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.drools.FactHandle;
import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.lessonschedule.domain.Lesson;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/nqueens/solver/move/YChangeMove.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/nqueens/solver/move/YChangeMove.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/nqueens/solver/move/YChangeMove.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -5,8 +5,8 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.drools.FactHandle;
import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.nqueens.domain.Queen;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/simple/move/DayChangeMove.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/simple/move/DayChangeMove.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/simple/move/DayChangeMove.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -6,8 +6,8 @@
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.drools.FactHandle;
import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.travelingtournament.domain.Day;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MatchSwapMove.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MatchSwapMove.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MatchSwapMove.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -5,8 +5,8 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.drools.FactHandle;
import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.travelingtournament.domain.Day;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-solver/drools-solver-examples/src/main/java/org/drools/solver/examples/travelingtournament/solver/smart/move/MultipleMatchListRotateMove.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -8,8 +8,8 @@
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.drools.FactHandle;
import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.solver.core.localsearch.decider.accepter.tabu.TabuPropertyEnabled;
import org.drools.solver.core.move.Move;
import org.drools.solver.examples.travelingtournament.domain.Day;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-templates/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-templates/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-templates/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,18 +1,20 @@
-<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-</classpath>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java 2008-10-07 16:01:55 UTC (rev 23352)
@@ -11,8 +11,6 @@
import org.drools.Agenda;
import org.drools.FactException;
-import org.drools.FactHandle;
-import org.drools.ObjectFilter;
import org.drools.QueryResults;
import org.drools.RuleBase;
import org.drools.StatefulSession;
@@ -26,6 +24,8 @@
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.runtime.rule.FactHandle;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AgendaGroup;
import org.drools.spi.AsyncExceptionHandler;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-verifier/.classpath
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-verifier/.classpath 2008-10-07 15:16:36 UTC (rev 23351)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-verifier/.classpath 2008-10-07 16:01:55 UTC (rev 23352)
@@ -1,20 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes"/>
- <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
- <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
-</classpath>
\ No newline at end of file
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/com/thoughtworks/xstream/xstream/1.3/xstream-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0M2/mvel-2.0M2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.0.1/antlr-runtime-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/3.4.2.v_883_R34x/core-3.4.2.v_883_R34x.jar"/>
+ <classpathentry kind="var" path="M2_REPO/janino/janino/2.5.15/janino-2.5.15.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jmock/jmock/2.5.0.1/jmock-2.5.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
More information about the jboss-svn-commits
mailing list