[jboss-svn-commits] JBL Code SVN: r23698 - in labs/jbossrules: branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule and 82 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Nov 4 18:49:41 EST 2008
Author: mark.proctor at jboss.com
Date: 2008-11-04 18:49:41 -0500 (Tue, 04 Nov 2008)
New Revision: 23698
Added:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/KnowledgePackage.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/rule/
Removed:
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/KnowledgePackage.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/process/
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/rule/
Modified:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgeBaseLockedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgePackageAddedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgePackageRemovedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterRuleAddedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterRuleRemovedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeKnowledgePackageAddedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeKnowledgePackageRemovedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeRuleAddedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeRuleRemovedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/Activation.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/RuleContext.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgeBaseLockedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageAddedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageRemovedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleAddedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleRemovedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageAddedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageRemovedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleAddedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleRemovedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectInsertedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectUpdatedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializableActivation.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializablePropagationContext.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/SerializedRule.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/knowledge/definitions/rule/impl/RuleImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java
labs/jbossrules/trunk/drools-ant/.classpath
labs/jbossrules/trunk/drools-api/.classpath
labs/jbossrules/trunk/drools-api/.project
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderConfiguration.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Connection.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Node.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/NodeContainer.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Process.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/WorkflowProcess.java
labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/rule/Rule.java
labs/jbossrules/trunk/drools-clips/.classpath
labs/jbossrules/trunk/drools-clips/.project
labs/jbossrules/trunk/drools-compiler/.classpath
labs/jbossrules/trunk/drools-compiler/.project
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/EventBasedNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ExtendedNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ProcessBuildContext.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ProcessBuildData.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlWorkflowProcessDumper.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/CompositeNodeHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ExceptionHandlerHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ForEachNodeHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/SwimlaneHandler.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGenerator.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/StoreHandler.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/XMLPersistenceTest.java
labs/jbossrules/trunk/drools-core/.classpath
labs/jbossrules/trunk/drools-core/.project
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ProcessIntegrationException.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/QueryResult.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/StatefulSession.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DelegateJavaFactHandler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/JavaFactRegistryEntry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EventFactHandle.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemoryActions.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/LogicalDependency.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/RetractObject.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectInsertedEvent.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectRetractedEvent.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectUpdatedEvent.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/Process.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/ProcessValidationError.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/ProcessValidator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/impl/ProcessValidationErrorImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactoryRegistry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/RuleFlowProcess.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Activation.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PropagationContext.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/Connection.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/Node.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/NodeContainer.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/WorkflowProcess.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/NodeContainerImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/NodeImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/WorkflowProcessImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Join.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/SequenceNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Split.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ConstraintEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactoryRegistry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/MockFactHandle.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/BaseQueueable.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/.classpath
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/.project
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.classpath
labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.project
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/ProcessInfo.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapperBuilder.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowWrapperBuilder.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java
labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java
labs/jbossrules/trunk/drools-examples/drools-examples-drl/.classpath
labs/jbossrules/trunk/drools-guvnor/.classpath
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java
labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java
labs/jbossrules/trunk/drools-jsr94/.classpath
labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
labs/jbossrules/trunk/drools-process/drools-process-task/.project
labs/jbossrules/trunk/drools-process/drools-workitems/.classpath
labs/jbossrules/trunk/drools-process/drools-workitems/.project
labs/jbossrules/trunk/drools-repository/.classpath
labs/jbossrules/trunk/drools-repository/.project
labs/jbossrules/trunk/drools-server/.classpath
labs/jbossrules/trunk/drools-solver/drools-solver-core/.classpath
labs/jbossrules/trunk/drools-solver/drools-solver-examples/.classpath
labs/jbossrules/trunk/drools-templates/.classpath
labs/jbossrules/trunk/drools-templates/.project
labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
Log:
JBRULES-1734 Drools API
-refactored to move org.drools.knowledge.defintions to org.drools.defintion
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgeBaseLockedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgeBaseLockedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgeBaseLockedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
public interface AfterKnowledgeBaseLockedEvent extends KnowledgeBaseEvent {
Rule getRule();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgePackageAddedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgePackageAddedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgePackageAddedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.event.knowledgebase;
-import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.definition.KnowledgePackage;
/*
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgePackageRemovedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgePackageRemovedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterKnowledgePackageRemovedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.definition.KnowledgePackage;
public interface AfterKnowledgePackageRemovedEvent extends KnowledgeBaseEvent {
public KnowledgePackage getKnowledgePackage();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterRuleAddedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterRuleAddedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterRuleAddedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.event.knowledgebase;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterRuleRemovedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterRuleRemovedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/AfterRuleRemovedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.event.knowledgebase;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeKnowledgePackageAddedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeKnowledgePackageAddedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeKnowledgePackageAddedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.event.knowledgebase;
-import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.definition.KnowledgePackage;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeKnowledgePackageRemovedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeKnowledgePackageRemovedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeKnowledgePackageRemovedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,7 +1,7 @@
package org.drools.event.knowledgebase;
-import org.drools.knowledge.definitions.KnowledgePackage;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.KnowledgePackage;
+import org.drools.definition.rule.Rule;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeRuleAddedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeRuleAddedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeRuleAddedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.event.knowledgebase;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeRuleRemovedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeRuleRemovedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/knowledgebase/BeforeRuleRemovedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.event.knowledgebase;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/Activation.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/Activation.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/Activation.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,7 +2,7 @@
import java.util.Collection;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
public interface Activation {
/**
@@ -24,5 +24,5 @@
* @return
* The matched FactHandles for this activation
*/
- Collection<FactHandle> getFactHandles();
+ Collection<? extends FactHandle> getFactHandles();
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.runtime.rule;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
public interface PropagationContext {
public static final int ASSERTION = 0;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/RuleContext.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/RuleContext.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/RuleContext.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.runtime.rule;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
import org.drools.runtime.KnowledgeRuntime;
public interface RuleContext {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/builder/impl/KnowledgeBuilderImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -8,7 +8,7 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.compiler.PackageBuilder;
-import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.definition.KnowledgePackage;
import org.drools.knowledge.definitions.impl.KnowledgePackageImp;
import org.drools.rule.Package;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/api/KnowledgeBuilderTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -5,9 +5,9 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
-import org.drools.knowledge.definitions.KnowledgePackage;
-import org.drools.knowledge.definitions.rule.Rule;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.KnowledgePackage;
+import org.drools.definition.process.Process;
+import org.drools.definition.rule.Rule;
import junit.framework.TestCase;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/api/KnowledgeSessionTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -5,8 +5,8 @@
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
-import org.drools.knowledge.definitions.KnowledgePackage;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.KnowledgePackage;
+import org.drools.definition.rule.Rule;
import junit.framework.TestCase;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgeBaseLockedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgeBaseLockedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgeBaseLockedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.AfterKnowledgeBaseLockedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class AfterKnowledgeBaseLockedEventImpl extends KnowledgeBaseEventImpl implements AfterKnowledgeBaseLockedEvent {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageAddedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageAddedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageAddedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.knowledgebase.AfterKnowledgePackageAddedEvent;
-import org.drools.knowledge.definitions.KnowledgePackage;
public class AfterKnowledgePackageAddedEventImpl extends KnowledgeBaseEventImpl implements AfterKnowledgePackageAddedEvent {
private KnowledgePackage knowledgePackage;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageRemovedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageRemovedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterKnowledgePackageRemovedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.knowledgebase.AfterKnowledgePackageRemovedEvent;
-import org.drools.knowledge.definitions.KnowledgePackage;
public class AfterKnowledgePackageRemovedEventImpl extends KnowledgeBaseEventImpl implements AfterKnowledgePackageRemovedEvent {
private KnowledgePackage knowledgePackage;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleAddedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleAddedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleAddedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.AfterRuleAddedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class AfterRuleAddedEventImpl extends KnowledgeBaseEventImpl implements AfterRuleAddedEvent {
private Rule rule;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleRemovedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleRemovedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/AfterRuleRemovedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.AfterRuleRemovedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class AfterRuleRemovedEventImpl extends KnowledgeBaseEventImpl implements AfterRuleRemovedEvent {
private Rule rule;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageAddedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageAddedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageAddedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.knowledgebase.BeforeKnowledgePackageAddedEvent;
-import org.drools.knowledge.definitions.KnowledgePackage;
public class BeforeKnowledgePackageAddedEventImpl extends KnowledgeBaseEventImpl implements BeforeKnowledgePackageAddedEvent {
private KnowledgePackage knowledgePackage;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageRemovedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageRemovedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeKnowledgePackageRemovedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.knowledgebase.BeforeKnowledgePackageRemovedEvent;
-import org.drools.knowledge.definitions.KnowledgePackage;
public class BeforeKnowledgePackageRemovedEventImpl extends KnowledgeBaseEventImpl implements BeforeKnowledgePackageRemovedEvent {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleAddedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleAddedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleAddedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.BeforeRuleAddedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class BeforeRuleAddedEventImpl extends KnowledgeBaseEventImpl implements BeforeRuleAddedEvent {
private Rule rule;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleRemovedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleRemovedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/knowlegebase/impl/BeforeRuleRemovedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
package org.drools.event.knowlegebase.impl;
import org.drools.KnowledgeBase;
+import org.drools.definition.rule.Rule;
import org.drools.event.knowledgebase.BeforeRuleRemovedEvent;
-import org.drools.knowledge.definitions.rule.Rule;
public class BeforeRuleRemovedEventImpl extends KnowledgeBaseEventImpl implements BeforeRuleRemovedEvent {
private Rule rule;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectInsertedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectInsertedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectInsertedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -7,7 +7,7 @@
import org.drools.event.rule.ObjectInsertedEvent;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.reteoo.ReteooStatefulSession;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.runtime.rule.WorkingMemory;
public class ObjectInsertedEventImpl extends WorkingMemoryEventImpl
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -7,7 +7,7 @@
import org.drools.event.rule.ObjectRetractedEvent;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.reteoo.ReteooStatefulSession;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.runtime.rule.WorkingMemory;
public class ObjectRetractedEventImpl extends WorkingMemoryEventImpl implements ObjectRetractedEvent {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectUpdatedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectUpdatedEventImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectUpdatedEventImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -7,7 +7,7 @@
import org.drools.event.rule.ObjectUpdatedEvent;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.reteoo.ReteooStatefulSession;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.runtime.rule.WorkingMemory;
public class ObjectUpdatedEventImpl extends WorkingMemoryEventImpl implements ObjectUpdatedEvent {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializableActivation.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializableActivation.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializableActivation.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -6,7 +6,7 @@
import java.io.ObjectOutput;
import java.util.Collection;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
import org.drools.runtime.rule.Activation;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.PropagationContext;
@@ -16,7 +16,7 @@
Activation,
Externalizable {
private Rule rule;
- private Collection<FactHandle> factHandles;
+ private Collection<? extends FactHandle> factHandles;
private PropagationContext propgationContext;
public SerializableActivation(Activation activation) {
@@ -36,7 +36,7 @@
return this.rule;
}
- public Collection<FactHandle> getFactHandles() {
+ public Collection<? extends FactHandle> getFactHandles() {
return this.factHandles;
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializablePropagationContext.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializablePropagationContext.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializablePropagationContext.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -5,8 +5,8 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.definition.rule.Rule;
import org.drools.impl.SerializedRule;
-import org.drools.knowledge.definitions.rule.Rule;
import org.drools.runtime.rule.FactHandle;
import org.drools.runtime.rule.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/SerializedRule.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/SerializedRule.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/SerializedRule.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -5,7 +5,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.rule.Rule;
public class SerializedRule
implements
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-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/knowledge/definitions/impl/KnowledgePackageImp.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -4,9 +4,9 @@
import java.util.Collection;
import java.util.List;
-import org.drools.knowledge.definitions.KnowledgePackage;
-import org.drools.knowledge.definitions.process.Process;
-import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.definition.KnowledgePackage;
+import org.drools.definition.process.Process;
+import org.drools.definition.rule.Rule;
import org.drools.knowledge.definitions.rule.impl.RuleImpl;
import org.drools.rule.Package;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/knowledge/definitions/rule/impl/RuleImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/knowledge/definitions/rule/impl/RuleImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/knowledge/definitions/rule/impl/RuleImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,7 +2,7 @@
import org.drools.rule.Rule;
-public class RuleImpl implements org.drools.knowledge.definitions.rule.Rule {
+public class RuleImpl implements org.drools.definition.rule.Rule {
private Rule rule;
public RuleImpl(Rule rule) {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,10 +16,9 @@
* limitations under the License.
*/
-import java.io.Serializable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
@@ -28,13 +27,10 @@
import org.drools.Cheese;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.base.ClassFieldReader;
import org.drools.base.ClassFieldAccessorCache;
+import org.drools.base.ClassFieldReader;
import org.drools.base.ClassObjectType;
import org.drools.base.FieldFactory;
-import org.drools.base.ShadowProxy;
import org.drools.base.ValueType;
import org.drools.base.evaluators.ComparableEvaluatorsDefinition;
import org.drools.base.evaluators.EqualityEvaluatorsDefinition;
Modified: labs/jbossrules/trunk/drools-ant/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-ant/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-ant/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -11,7 +11,7 @@
<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.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
<classpathentry kind="src" path="/drools-api"/>
<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"/>
Modified: labs/jbossrules/trunk/drools-api/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-api/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-api/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,12 +1,12 @@
-<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" including="**" 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/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>
+ <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" including="**" 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/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
Modified: labs/jbossrules/trunk/drools-api/.project
===================================================================
--- labs/jbossrules/trunk/drools-api/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-api/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,20 +1,20 @@
-<projectDescription>
- <name>drools-api</name>
- <comment>A rule production system</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.drools.eclipse.droolsbuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
- </natures>
+<projectDescription>
+ <name>drools-api</name>
+ <comment>A rule production system</comment>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.drools.eclipse.droolsbuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
+ </natures>
</projectDescription>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/KnowledgeBase.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,8 +2,8 @@
import java.util.Collection;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.knowledgebase.KnowledgeBaseEventManager;
-import org.drools.knowledge.definitions.KnowledgePackage;
import org.drools.runtime.KnowledgeSessionConfiguration;
import org.drools.runtime.StatefulKnowledgeSession;
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,7 +2,7 @@
import java.util.Collection;
-import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.definition.KnowledgePackage;
public interface KnowledgeBuilder extends RuleBuilder, ProcessBuilder {
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderConfiguration.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/builder/KnowledgeBuilderConfiguration.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,5 +1,6 @@
package org.drools.builder;
public interface KnowledgeBuilderConfiguration {
-
+ public void setProperty(String name, String value);
+ public String getProperty(String name);
}
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/KnowledgePackage.java (from rev 23635, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/KnowledgePackage.java)
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/KnowledgePackage.java (rev 0)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/KnowledgePackage.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -0,0 +1,15 @@
+package org.drools.definition;
+
+import java.util.Collection;
+
+import org.drools.definition.process.Process;
+import org.drools.definition.rule.Rule;
+
+public interface KnowledgePackage {
+ String getName();
+
+ Collection<Rule> getRules();
+
+ Collection<Process> getProcesses();
+
+}
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process (from rev 23655, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/process)
Property changes on: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Connection.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/process/Connection.java 2008-10-31 15:08:13 UTC (rev 23655)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Connection.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,4 +1,4 @@
-package org.drools.knowledge.definitions.process;
+package org.drools.definition.process;
public interface Connection {
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Node.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/process/Node.java 2008-10-31 15:08:13 UTC (rev 23655)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Node.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,4 +1,4 @@
-package org.drools.knowledge.definitions.process;
+package org.drools.definition.process;
import java.util.List;
import java.util.Map;
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/NodeContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/process/NodeContainer.java 2008-10-31 15:08:13 UTC (rev 23655)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/NodeContainer.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,4 +1,4 @@
-package org.drools.knowledge.definitions.process;
+package org.drools.definition.process;
public interface NodeContainer {
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Process.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/process/Process.java 2008-10-31 15:08:13 UTC (rev 23655)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/Process.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,4 +1,4 @@
-package org.drools.knowledge.definitions.process;
+package org.drools.definition.process;
public interface Process {
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/WorkflowProcess.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/process/WorkflowProcess.java 2008-10-31 15:08:13 UTC (rev 23655)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/process/WorkflowProcess.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,4 +1,4 @@
-package org.drools.knowledge.definitions.process;
+package org.drools.definition.process;
public interface WorkflowProcess extends Process, NodeContainer {
Copied: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/rule (from rev 23655, labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/rule)
Property changes on: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/rule
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/rule/Rule.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/rule/Rule.java 2008-10-31 15:08:13 UTC (rev 23655)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/definition/rule/Rule.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,4 +1,4 @@
-package org.drools.knowledge.definitions.rule;
+package org.drools.definition.rule;
public interface Rule {
Deleted: labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/KnowledgePackage.java
===================================================================
--- labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/KnowledgePackage.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-api/src/main/java/org/drools/knowledge/definitions/KnowledgePackage.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,15 +0,0 @@
-package org.drools.knowledge.definitions;
-
-import java.util.Collection;
-
-import org.drools.knowledge.definitions.process.Process;
-import org.drools.knowledge.definitions.rule.Rule;
-
-public interface KnowledgePackage {
- String getName();
-
- Collection<Rule> getRules();
-
- Collection<Process> getProcesses();
-
-}
Modified: labs/jbossrules/trunk/drools-clips/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-clips/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-clips/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,19 +1,19 @@
-<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" including="**" 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/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
- <classpathentry kind="src" path="/drools-api"/>
- <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>
+ <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" including="**" 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/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-api"/>
+ <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
Modified: labs/jbossrules/trunk/drools-clips/.project
===================================================================
--- labs/jbossrules/trunk/drools-clips/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-clips/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,17 +1,17 @@
-<projectDescription>
- <name>drools-clips</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-compiler</project>
- <project>drools-core</project>
- <project>drools-api</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+<projectDescription>
+ <name>drools-clips</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-compiler</project>
+ <project>drools-core</project>
+ <project>drools-api</project>
+ </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/trunk/drools-compiler/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,23 +1,23 @@
-<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" including="**" 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/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/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
- <classpathentry kind="src" path="/drools-api"/>
- <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"/>
+<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" including="**" 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/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/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-api"/>
+ <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"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/.project
===================================================================
--- labs/jbossrules/trunk/drools-compiler/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,16 +1,16 @@
-<projectDescription>
- <name>drools-compiler</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-core</project>
- <project>drools-api</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+<projectDescription>
+ <name>drools-compiler</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-core</project>
+ <project>drools-api</project>
+ </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/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -36,6 +36,7 @@
import org.drools.base.ClassFieldAccessorStore;
import org.drools.common.InternalRuleBase;
import org.drools.commons.jci.problems.CompilationProblem;
+import org.drools.definition.process.Process;
import org.drools.factmodel.ClassBuilder;
import org.drools.factmodel.ClassDefinition;
import org.drools.factmodel.FieldDefinition;
@@ -56,7 +57,6 @@
import org.drools.lang.descr.RuleDescr;
import org.drools.lang.descr.TypeDeclarationDescr;
import org.drools.lang.descr.TypeFieldDescr;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.reteoo.ReteooRuleBase;
import org.drools.rule.CompositeClassLoader;
import org.drools.rule.JavaDialectRuntimeData;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -168,6 +168,37 @@
buildDumpDirectory();
}
+
+ public void setProperty(String name, String value) {
+ if ( name == null ) {
+ return;
+ }
+
+ name = name.trim();
+
+ if ( name.equals( "drools.dialect.default" ) ) {
+ setDefaultDialect( value );
+ } else if ( name.startsWith( "drools.accumulate.function" ) ) {
+ addAccumulateFunction( name.substring( name.lastIndexOf( '.' ) ), value );
+ }else if ( name.startsWith( "drools.evaluator." ) ) {
+ this.evaluatorRegistry.addEvaluatorDefinition( value );
+ } else if ( name.equals( "drools.dump.dir" ) ) {
+ buildDumpDirectory( value );
+ }
+ }
+
+ public String getProperty(String name) {
+ if ( name.equals( "drools.dialect.default" ) ) {
+ return getDefaultDialect( );
+ } else if ( name.startsWith( "drools.accumulate.function" ) ) {
+ return this.accumulateFunctions.get( name );
+ }else if ( name.startsWith( "drools.evaluator." ) ) {
+ return this.evaluatorRegistry.getEvaluatorDefinition( name.substring( name.lastIndexOf( '.' ) ) ).getClass().getName();
+ } else if ( name.equals( "drools.dump.dir" ) ) {
+ return Boolean.toString( this.dumpDirectory != null );
+ }
+ return null;
+ }
public ChainedProperties getChainedProperties() {
return this.chainedProperties;
@@ -498,6 +529,10 @@
private void buildDumpDirectory() {
String dumpStr = this.chainedProperties.getProperty( "drools.dump.dir",
null );
+ buildDumpDirectory( dumpStr );
+ }
+
+ private void buildDumpDirectory(String dumpStr) {
if ( dumpStr != null ) {
this.dumpDirectory = new File( dumpStr );
if ( !dumpDirectory.isDirectory() || !dumpDirectory.canWrite() || !dumpDirectory.canRead() ) {
@@ -505,7 +540,7 @@
throw new RuntimeDroolsException( "Drools dump directory is not accessible: " + dumpStr );
}
}
- }
+ }
public File getDumpDir() {
return this.dumpDirectory;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuildError.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,7 +1,7 @@
package org.drools.compiler;
import org.drools.lang.descr.BaseDescr;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
public class ProcessBuildError extends DescrBuildError {
private final Process process;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/ProcessBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -24,11 +24,11 @@
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.definition.process.Connection;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.NodeContainer;
+import org.drools.definition.process.Process;
+import org.drools.definition.process.WorkflowProcess;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
import org.drools.process.builder.ProcessNodeBuilder;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ActionNodeBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
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.definition.process.Node;
+import org.drools.definition.process.Process;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
import org.drools.rule.builder.ProcessBuildContext;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/EventBasedNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/EventBasedNodeBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/EventBasedNodeBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,8 +2,8 @@
import java.util.Map;
-import org.drools.knowledge.definitions.process.Node;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.Process;
import org.drools.lang.descr.ProcessDescr;
import org.drools.process.core.timer.Timer;
import org.drools.rule.builder.ProcessBuildContext;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ExtendedNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ExtendedNodeBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ExtendedNodeBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,8 +3,8 @@
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.definition.process.Node;
+import org.drools.definition.process.Process;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
import org.drools.rule.builder.ProcessBuildContext;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,7 +1,7 @@
package org.drools.process.builder;
-import org.drools.knowledge.definitions.process.Node;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.Process;
import org.drools.lang.descr.ProcessDescr;
import org.drools.rule.builder.ProcessBuildContext;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/ProcessNodeBuilderRegistry.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.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/trunk/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/process/builder/SplitNodeBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -6,9 +6,9 @@
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.definition.process.Connection;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.Process;
import org.drools.lang.descr.ProcessDescr;
import org.drools.rule.builder.ProcessBuildContext;
import org.drools.workflow.core.Constraint;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ProcessBuildContext.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ProcessBuildContext.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/ProcessBuildContext.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,9 +3,9 @@
import org.drools.compiler.Dialect;
import org.drools.compiler.DialectCompiletimeRegistry;
import org.drools.compiler.PackageBuilder;
+import org.drools.definition.process.Process;
import org.drools.lang.descr.BaseDescr;
import org.drools.lang.descr.ProcessDescr;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.rule.Package;
public class ProcessBuildContext extends PackageBuildContext {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaDialect.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -31,6 +31,7 @@
import org.drools.compiler.PackageBuilder.RuleErrorHandler;
import org.drools.compiler.PackageBuilder.RuleInvokerErrorHandler;
import org.drools.compiler.PackageBuilder.SrcErrorHandler;
+import org.drools.definition.process.Process;
import org.drools.lang.descr.AccumulateDescr;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.BaseDescr;
@@ -47,7 +48,6 @@
import org.drools.lang.descr.ProcessDescr;
import org.drools.lang.descr.QueryDescr;
import org.drools.lang.descr.RuleDescr;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.rule.Function;
import org.drools.rule.JavaDialectRuntimeData;
import org.drools.rule.LineMappings;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -27,7 +27,7 @@
import org.drools.guvnor.server.util.ScenarioXMLPersistence;
import org.drools.rule.Package;
import org.drools.rule.TimeMachine;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.mvel2.MVEL;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ProcessBuildData.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ProcessBuildData.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ProcessBuildData.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -8,7 +8,7 @@
import org.drools.workflow.core.Node;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
public class ProcessBuildData {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlProcessReader.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -6,7 +6,7 @@
import javax.xml.parsers.SAXParser;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlWorkflowProcessDumper.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlWorkflowProcessDumper.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/XmlWorkflowProcessDumper.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -5,9 +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.definition.process.Connection;
+import org.drools.definition.process.Node;
+import org.drools.definition.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;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/CompositeNodeHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/CompositeNodeHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/CompositeNodeHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -4,7 +4,7 @@
import java.util.List;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.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;
@@ -84,7 +84,7 @@
protected List<Node> getSubNodes(CompositeNode compositeNode) {
List<Node> subNodes =
new ArrayList<Node>();
- for (org.drools.knowledge.definitions.process.Node subNode: compositeNode.getNodes()) {
+ for (org.drools.definition.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))) {
@@ -96,7 +96,7 @@
protected List<Connection> getSubConnections(CompositeNode compositeNode) {
List<Connection> connections = new ArrayList<Connection>();
- for (org.drools.knowledge.definitions.process.Node subNode: compositeNode.getNodes()) {
+ for (org.drools.definition.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/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ConnectionHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,7 +2,7 @@
import java.util.HashSet;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.workflow.core.Connection;
import org.drools.workflow.core.NodeContainer;
import org.drools.workflow.core.impl.ConnectionImpl;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ExceptionHandlerHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ExceptionHandlerHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ExceptionHandlerHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
import java.util.HashSet;
import org.drools.process.core.ContextContainer;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.drools.process.core.context.exception.ExceptionHandler;
import org.drools.process.core.context.exception.ExceptionScope;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ForEachNodeHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ForEachNodeHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ForEachNodeHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
import java.util.List;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.process.core.datatype.impl.type.ObjectDataType;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.CompositeNode;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/GlobalHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -4,7 +4,7 @@
import java.util.HashSet;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.workflow.core.impl.WorkflowProcessImpl;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ImportHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.HashSet;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.workflow.core.impl.WorkflowProcessImpl;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/ProcessHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -62,7 +62,7 @@
}
public Class generateNodeFor() {
- return org.drools.knowledge.definitions.process.Process.class;
+ return org.drools.definition.process.Process.class;
}
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/SwimlaneHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/SwimlaneHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/processes/SwimlaneHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,7 +2,7 @@
import java.util.HashSet;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.process.core.context.swimlane.Swimlane;
import org.drools.process.core.context.swimlane.SwimlaneContext;
import org.drools.workflow.core.impl.WorkflowProcessImpl;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -86,7 +86,7 @@
import org.drools.rule.SlidingTimeWindow;
import org.drools.rule.TypeDeclaration;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.CompiledInvoker;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -23,7 +23,7 @@
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
public class AccumulateTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -26,7 +26,7 @@
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.rule.Package;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
public class DynamicRulesTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -36,7 +36,7 @@
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.rule.Package;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ActivationGroup;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -29,7 +29,7 @@
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
public class FirstOrderLogicTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -113,7 +113,7 @@
import org.drools.rule.Package;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
import org.drools.runtime.ClassObjectFilter;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ConsequenceExceptionHandler;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -12,7 +12,7 @@
import org.drools.KnowledgeBaseFactory;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
-import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.definition.KnowledgePackage;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -15,9 +15,9 @@
import org.drools.RuleBaseConfiguration;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
-import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.definition.KnowledgePackage;
import org.drools.runtime.StatefulKnowledgeSession;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
public class StatefulSessionTest extends TestCase {
final List list = new ArrayList();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -23,12 +23,13 @@
import org.drools.common.InternalWorkingMemory;
import org.drools.common.TruthMaintenanceSystem;
import org.drools.compiler.PackageBuilder;
+import org.drools.definition.KnowledgePackage;
import org.drools.event.DefaultWorkingMemoryEventListener;
import org.drools.event.ObjectInsertedEvent;
import org.drools.event.ObjectRetractedEvent;
import org.drools.event.ObjectUpdatedEvent;
import org.drools.event.WorkingMemoryEventListener;
-import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.rule.Package;
import org.drools.runtime.ClassObjectFilter;
import org.drools.runtime.StatefulKnowledgeSession;
@@ -786,35 +787,37 @@
public void FIXME_testLogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion() throws Exception {
// TODO JBRULES-1804
- final PackageBuilder builder = new PackageBuilder();
- builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion.drl" ) ) );
- final Package pkg = builder.getPackage();
+
+ KnowledgeBuilder kbuilder = KnowledgeBuilderFactory.newKnowledgeBuilder();
+ kbuilder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_LogicalInsertionsModifySameRuleGivesDifferentLogicalInsertion.drl" ) ) );
+ Collection<KnowledgePackage> pkgs = kbuilder.getKnowledgePackages();
- RuleBase ruleBase = getRuleBase();
- ruleBase.addPackage( pkg );
- ruleBase = SerializationHelper.serializeObject(ruleBase);
- final WorkingMemory workingMemory = ruleBase.newStatefulSession();
+ KnowledgeBase kbase = getKnowledgeBase();
+ kbase.addKnowledgePackages( pkgs );
+ kbase = SerializationHelper.serializeObject(kbase);
+ final StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
Sensor sensor1 = new Sensor( 100, 0 );
- FactHandle sensor1Handle = workingMemory.insert( sensor1 );
+ FactHandle sensor1Handle = session.insert( sensor1 );
Sensor sensor2 = new Sensor( 200, 0 );
- FactHandle sensor2Handle = workingMemory.insert( sensor2 );
+ FactHandle sensor2Handle = session.insert( sensor2 );
Sensor sensor3 = new Sensor( 200, 0 );
- FactHandle sensor3Handle = workingMemory.insert( sensor3 );
+ FactHandle sensor3Handle = session.insert( sensor3 );
- workingMemory.fireAllRules();
+ session.fireAllRules();
- List temperatureList = IteratorToList.convert(workingMemory.iterateObjects(new ClassObjectFilter(Integer.class)));
+ List temperatureList = new ArrayList( session.getObjects( new ClassObjectFilter(Integer.class) ) );
assertTrue(temperatureList.contains(Integer.valueOf(100)));
assertTrue(temperatureList.contains(Integer.valueOf(200)));
assertEquals(2, temperatureList.size());
- workingMemory.modifyRetract(sensor1Handle);
+
+ ((StatefulKnowledgeSessionImpl)session).session.modifyRetract( (org.drools.FactHandle) sensor1Handle);
sensor1.setTemperature(150);
- workingMemory.modifyInsert(sensor1Handle, sensor1);
- workingMemory.fireAllRules();
+ ((StatefulKnowledgeSessionImpl)session).session.modifyInsert( (org.drools.FactHandle) sensor1Handle, sensor1);
+ session.fireAllRules();
- temperatureList = IteratorToList.convert(workingMemory.iterateObjects(new ClassObjectFilter(Integer.class)));
+ temperatureList = new ArrayList( session.getObjects( new ClassObjectFilter(Integer.class) ) );
assertFalse(temperatureList.contains(Integer.valueOf(100))); // TODO currently it fails here, because 100 lingers
assertTrue(temperatureList.contains(Integer.valueOf(150)));
assertTrue(temperatureList.contains(Integer.valueOf(200)));
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGenerator.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGenerator.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGenerator.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -15,7 +15,7 @@
import java.util.Map;
import java.util.Random;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/process/builder/StoreNodeBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,8 +1,8 @@
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.definition.process.Node;
+import org.drools.definition.process.Process;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
import org.drools.rule.builder.ProcessBuildContext;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -5,7 +5,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -38,6 +38,7 @@
import org.drools.process.instance.ProcessInstanceFactory;
import org.drools.process.instance.ProcessInstanceManager;
import org.drools.process.instance.InternalWorkItemManager;
+import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.event.SignalManager;
import org.drools.process.instance.event.SignalManager;
import org.drools.process.instance.timer.TimerManager;
@@ -48,7 +49,7 @@
import org.drools.rule.Rule;
import org.drools.rule.TimeMachine;
import org.drools.runtime.ObjectFilter;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AgendaGroup;
@@ -80,413 +81,283 @@
out.writeObject(timeMachine);
out.writeObject(globals);
}
-
- public void addLIANodePropagation(LIANodePropagation liaNodePropagation) {
- // TODO Auto-generated method stub
-
- }
-
- public void clearNodeMemory(NodeMemory node) {
- // TODO Auto-generated method stub
-
- }
-
-
-
- public void executeQueuedActions() {
- // TODO Auto-generated method stub
-
- }
-
- public ObjectHashMap getAssertMap() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public FactHandleFactory getFactHandleFactory() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public ObjectHashMap getFactHandleMap() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public long getId() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public Lock getLock() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public long getNextPropagationIdCounter() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public Object getNodeMemory(NodeMemory node) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public TimeMachine getTimeMachine() {
- return this.timeMachine;
- }
-
- public TruthMaintenanceSystem getTruthMaintenanceSystem() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public boolean isSequential() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public void queueWorkingMemoryAction(WorkingMemoryAction action) {
- // TODO Auto-generated method stub
-
- }
-
- public void removeLogicalDependencies(Activation activation,
- PropagationContext context, Rule rule) throws FactException {
- // TODO Auto-generated method stub
-
- }
-
- public void retract(FactHandle factHandle, boolean removeLogical,
- boolean updateEqualsMap, Rule rule, Activation activation)
- throws FactException {
- // TODO Auto-generated method stub
-
- }
-
- public void setAgendaEventSupport(AgendaEventSupport agendaEventSupport) {
- // TODO Auto-generated method stub
-
- }
-
- public void setRuleFlowEventSupport(
- RuleFlowEventSupport ruleFlowEventSupport) {
- // TODO Auto-generated method stub
-
- }
-
- public void setWorkingMemoryEventSupport(
- WorkingMemoryEventSupport workingMemoryEventSupport) {
- // TODO Auto-generated method stub
-
- }
-
- public void clearActivationGroup(String group) {
- // TODO Auto-generated method stub
-
- }
-
- public void clearAgenda() {
- // TODO Auto-generated method stub
-
- }
-
- public void clearAgendaGroup(String group) {
- // TODO Auto-generated method stub
-
- }
-
- public void clearRuleFlowGroup(String group) {
- // TODO Auto-generated method stub
-
- }
-
- public int fireAllRules() throws FactException {
- // TODO Auto-generated method stub
- return 0;
-
- }
-
- public int fireAllRules(AgendaFilter agendaFilter) throws FactException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int fireAllRules(int fireLimit) throws FactException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int fireAllRules(AgendaFilter agendaFilter, int fireLimit)
- throws FactException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public Agenda getAgenda() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public FactHandle getFactHandle(Object object) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public AgendaGroup getFocus() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Object getGlobal(String identifier) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public GlobalResolver getGlobalResolver() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Object getObject(FactHandle handle) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public QueryResults getQueryResults(String query) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public QueryResults getQueryResults(String query, Object[] arguments) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public RuleBase getRuleBase() {
- return new MockRuleBase();
- }
-
- public void halt() {
- // TODO Auto-generated method stub
-
- }
-
- public FactHandle insert(Object object) throws FactException {
- this.facts .add(object);
- return new MockFactHandle(object.hashCode());
- }
-
- public FactHandle insert(Object object, long duration)
- throws FactException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public FactHandle insert(Object object, boolean dynamic)
- throws FactException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public FactHandle insert(Object object, long duration, boolean dynamic)
- throws FactException {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Iterator iterateFactHandles() {
- // TODO Auto-generated method stub
- return null;
- }
-
- public Iterator iterateFactHandles(ObjectFilter filter) {
- // TODO Auto-generated method stub
- return null;
- }
-
public Iterator iterateObjects() {
return this.facts.iterator();
}
- public Iterator iterateObjects(ObjectFilter filter) {
- // TODO Auto-generated method stub
- return null;
+ public void setGlobal(String identifier, Object value) {
+ this.globals.put(identifier, value);
+
}
- public void modifyInsert(FactHandle factHandle, Object object) {
- // TODO Auto-generated method stub
-
+ public void addEventListener(AgendaEventListener listener) {
+ this.agendaEventListener = listener;
}
- public void modifyRetract(FactHandle factHandle) {
- // TODO Auto-generated method stub
+ public void setTimeMachine(TimeMachine tm) {
+ this.timeMachine = tm;
}
- public void retract(FactHandle handle) throws FactException {
- // TODO Auto-generated method stub
+ public void addLIANodePropagation(LIANodePropagation liaNodePropagation) {
+ // TODO Auto-generated method stub
+
+ }
- }
+ public void clearNodeMemory(NodeMemory node) {
+ // TODO Auto-generated method stub
+
+ }
- public void setAsyncExceptionHandler(AsyncExceptionHandler handler) {
- // TODO Auto-generated method stub
+ public void executeQueuedActions() {
+ // TODO Auto-generated method stub
+
+ }
- }
+ public ExecutorService getExecutorService() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- public void setFocus(String focus) {
- // TODO Auto-generated method stub
+ public FactHandle getFactHandleByIdentity(Object object) {
+ // TODO Auto-generated method stub
+ return null;
+ }
- }
+ public FactHandleFactory getFactHandleFactory() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- public void setFocus(AgendaGroup focus) {
- // TODO Auto-generated method stub
+ public long getId() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
- }
+ public InternalFactHandle getInitialFactHandle() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- public void setGlobal(String identifier, Object value) {
- this.globals.put(identifier, value);
+ public Lock getLock() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- }
+ public long getNextPropagationIdCounter() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
- public void setGlobalResolver(GlobalResolver globalResolver) {
- // TODO Auto-generated method stub
+ public Object getNodeMemory(NodeMemory node) {
+ // TODO Auto-generated method stub
+ return null;
+ }
- }
+ public ObjectStore getObjectStore() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- public InternalProcessInstance startProcess(String processId) {
- // TODO Auto-generated method stub
- return null;
- }
+ public ObjectTypeConfigurationRegistry getObjectTypeConfigurationRegistry() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- public InternalProcessInstance startProcess(String processId,
- Map<String, Object> parameters) {
+ public PartitionTaskManager getPartitionManager(RuleBasePartitionId partitionId) {
// TODO Auto-generated method stub
return null;
}
- public void update(FactHandle handle, Object object) throws FactException {
- // TODO Auto-generated method stub
+ public ProcessInstanceManager getProcessInstanceManager() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- }
+ public TimeMachine getTimeMachine() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- public void addEventListener(WorkingMemoryEventListener listener) {
- // TODO Auto-generated method stub
+ public TimerService getTimerService() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- }
+ public TruthMaintenanceSystem getTruthMaintenanceSystem() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- public void addEventListener(AgendaEventListener listener) {
- this.agendaEventListener = listener;
- }
+ public boolean isSequential() {
+ // TODO Auto-generated method stub
+ return false;
+ }
- public void addEventListener(RuleFlowEventListener listener) {
- // TODO Auto-generated method stub
+ public void queueWorkingMemoryAction(WorkingMemoryAction action) {
+ // TODO Auto-generated method stub
+
+ }
- }
+ public void removeLogicalDependencies(Activation activation,
+ PropagationContext context,
+ Rule rule) throws FactException {
+ // TODO Auto-generated method stub
+
+ }
- public List getAgendaEventListeners() {
- // TODO Auto-generated method stub
- return null;
- }
+ public void removeProcessInstance(ProcessInstance processInstance) {
+ // TODO Auto-generated method stub
+
+ }
- public List getRuleFlowEventListeners() {
- // TODO Auto-generated method stub
- return null;
- }
+ public void retract(FactHandle factHandle,
+ boolean removeLogical,
+ boolean updateEqualsMap,
+ Rule rule,
+ Activation activation) throws FactException {
+ // TODO Auto-generated method stub
+
+ }
- public List getWorkingMemoryEventListeners() {
- // TODO Auto-generated method stub
- return null;
- }
+ public void setAgendaEventSupport(AgendaEventSupport agendaEventSupport) {
+ // TODO Auto-generated method stub
+
+ }
- public void removeEventListener(WorkingMemoryEventListener listener) {
- // TODO Auto-generated method stub
+ public void setExecutorService(ExecutorService executor) {
+ // TODO Auto-generated method stub
+
+ }
- }
+ public void setId(long id) {
+ // TODO Auto-generated method stub
+
+ }
- public void removeEventListener(AgendaEventListener listener) {
- // TODO Auto-generated method stub
+ public void setRuleBase(InternalRuleBase ruleBase) {
+ // TODO Auto-generated method stub
+
+ }
- }
+ public void setRuleFlowEventSupport(RuleFlowEventSupport ruleFlowEventSupport) {
+ // TODO Auto-generated method stub
+
+ }
- public void removeEventListener(RuleFlowEventListener listener) {
- // TODO Auto-generated method stub
+ public void setWorkingMemoryEventSupport(WorkingMemoryEventSupport workingMemoryEventSupport) {
+ // TODO Auto-generated method stub
+
+ }
- }
+ public void clearActivationGroup(String group) {
+ // TODO Auto-generated method stub
+
+ }
- public void addEventListener(RuleBaseEventListener listener) {
- // TODO Auto-generated method stub
+ public void clearAgenda() {
+ // TODO Auto-generated method stub
+
+ }
- }
+ public void clearAgendaGroup(String group) {
+ // TODO Auto-generated method stub
+
+ }
- public List getRuleBaseEventListeners() {
- // TODO Auto-generated method stub
- return null;
- }
+ public void clearRuleFlowGroup(String group) {
+ // TODO Auto-generated method stub
+
+ }
- public void removeEventListener(RuleBaseEventListener listener) {
- // TODO Auto-generated method stub
+ public int fireAllRules() throws FactException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
- }
+ public int fireAllRules(AgendaFilter agendaFilter) throws FactException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
- public void setTimeMachine(TimeMachine tm) {
- this.timeMachine = tm;
+ public int fireAllRules(int fireLimit) throws FactException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
- }
+ public int fireAllRules(AgendaFilter agendaFilter,
+ int fireLimit) throws FactException {
+ // TODO Auto-generated method stub
+ return 0;
+ }
- public void setId(long id) {
+ public Agenda getAgenda() {
// TODO Auto-generated method stub
+ return null;
+ }
+ public FactHandle getFactHandle(Object object) {
+ // TODO Auto-generated method stub
+ return null;
}
- public void setRuleBase(InternalRuleBase ruleBase) {
+ public Object getGlobal(String identifier) {
// TODO Auto-generated method stub
+ return null;
+ }
+ public GlobalResolver getGlobalResolver() {
+ // TODO Auto-generated method stub
+ return null;
}
- public void addProcessInstance(ProcessInstance processInstance) {
+ public Object getObject(FactHandle handle) {
// TODO Auto-generated method stub
-
+ return null;
}
-
- public void removeProcessInstance(ProcessInstance processInstance) {
+
+ public ProcessInstance getProcessInstance(long id) {
// TODO Auto-generated method stub
+ return null;
+ }
+ public Collection<ProcessInstance> getProcessInstances() {
+ // TODO Auto-generated method stub
+ return null;
}
- public InternalProcessInstance getProcessInstance(long id) {
+ public QueryResults getQueryResults(String query) {
// TODO Auto-generated method stub
return null;
}
- public Collection getProcessInstances() {
+ public QueryResults getQueryResults(String query,
+ Object[] arguments) {
// TODO Auto-generated method stub
return null;
}
- public InternalWorkItemManager getWorkItemManager() {
+ public RuleBase getRuleBase() {
// TODO Auto-generated method stub
return null;
}
- public ObjectTypeConf getObjectTypeConf(Object object) {
+ public SessionClock getSessionClock() {
// TODO Auto-generated method stub
return null;
}
- public Map<Object, ObjectTypeConf> getObjectTypeConfMap() {
+ public SignalManager getSignalManager() {
// TODO Auto-generated method stub
return null;
}
- public ObjectTypeConf getObjectTypeConf(EntryPoint entryPoint,
- Object object) {
+ public TimerManager getTimerManager() {
// TODO Auto-generated method stub
return null;
}
- public Map<Object, ObjectTypeConf> getObjectTypeConfMap(EntryPoint entryPoint) {
+ public WorkItemManager getWorkItemManager() {
// TODO Auto-generated method stub
return null;
}
@@ -496,74 +367,138 @@
return null;
}
- public FactHandle getFactHandleByIdentity(Object object) {
+ public void halt() {
// TODO Auto-generated method stub
+
+ }
+
+ public Iterator< ? > iterateFactHandles() {
+ // TODO Auto-generated method stub
return null;
}
- public void registerProcessInstanceFactory(String type,
- ProcessInstanceFactory nodeInstanceFactory) {
+ public Iterator< ? > iterateFactHandles(ObjectFilter filter) {
// TODO Auto-generated method stub
+ return null;
+ }
+ public Iterator< ? > iterateObjects(ObjectFilter filter) {
+ // TODO Auto-generated method stub
+ return null;
}
- public ObjectStore getObjectStore() {
+ public void setAsyncExceptionHandler(AsyncExceptionHandler handler) {
// TODO Auto-generated method stub
+
+ }
+
+ public void setFocus(String focus) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void setGlobalResolver(GlobalResolver globalResolver) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public ProcessInstance startProcess(String processId) {
+ // TODO Auto-generated method stub
return null;
}
- public ExecutorService getExecutorService() {
+ public ProcessInstance startProcess(String processId,
+ Map<String, Object> parameters) {
// TODO Auto-generated method stub
return null;
}
- public void setExecutorService(ExecutorService executor) {
+ public void addEventListener(WorkingMemoryEventListener listener) {
// TODO Auto-generated method stub
+
+ }
+ public void addEventListener(RuleFlowEventListener listener) {
+ // TODO Auto-generated method stub
+
}
- public TimerManager getTimerManager() {
+ public List getAgendaEventListeners() {
// TODO Auto-generated method stub
return null;
}
- public ObjectTypeConfigurationRegistry getObjectTypeConfigurationRegistry() {
+ public List getRuleFlowEventListeners() {
// TODO Auto-generated method stub
return null;
}
- public InternalFactHandle getInitialFactHandle() {
+ public List getWorkingMemoryEventListeners() {
// TODO Auto-generated method stub
return null;
}
- public TimerService getTimerService() {
+ public void removeEventListener(WorkingMemoryEventListener listener) {
// TODO Auto-generated method stub
+
+ }
+
+ public void removeEventListener(AgendaEventListener listener) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void removeEventListener(RuleFlowEventListener listener) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void addEventListener(RuleBaseEventListener listener) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public List<RuleBaseEventListener> getRuleBaseEventListeners() {
+ // TODO Auto-generated method stub
return null;
}
- public PartitionTaskManager getPartitionManager( RuleBasePartitionId partitionId ) {
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ public void removeEventListener(RuleBaseEventListener listener) {
+ // TODO Auto-generated method stub
+
}
- public SessionClock getSessionClock() {
+ public FactHandle insert(Object object) throws FactException {
// TODO Auto-generated method stub
return null;
}
- public ProcessInstanceManager getProcessInstanceManager() {
+ public FactHandle insert(Object object,
+ boolean dynamic) throws FactException {
// TODO Auto-generated method stub
return null;
}
- public void dispose() {
- // TODO Auto-generated method stub
-
- }
+ public void modifyInsert(FactHandle factHandle,
+ Object object) {
+ // TODO Auto-generated method stub
+
+ }
- public SignalManager getSignalManager() {
- // TODO Auto-generated method stub
- return null;
- }
+ public void modifyRetract(FactHandle factHandle) {
+ // TODO Auto-generated method stub
+
+ }
+ public void retract(org.drools.runtime.rule.FactHandle handle) throws FactException {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void update(org.drools.runtime.rule.FactHandle handle,
+ Object object) throws FactException {
+ // TODO Auto-generated method stub
+
+ }
+
}
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -11,7 +11,7 @@
import org.drools.event.AfterActivationFiredEvent;
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/StoreHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/StoreHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/StoreHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,7 +2,7 @@
import java.util.HashSet;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.workflow.core.impl.DroolsConsequenceAction;
import org.drools.workflow.core.impl.WorkflowProcessImpl;
import org.drools.workflow.core.node.ActionNode;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/XMLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/XMLPersistenceTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/processes/XMLPersistenceTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -58,7 +58,7 @@
RuleFlowProcess process = new RuleFlowProcess() {
private static final long serialVersionUID = 400L;
int id = 0;
- public void addNode(org.drools.knowledge.definitions.process.Node node) {
+ public void addNode(org.drools.definition.process.Node node) {
((Node) node).setId(++id);
super.addNode(node);
}
@@ -112,7 +112,7 @@
RuleFlowProcess process = new RuleFlowProcess() {
private static final long serialVersionUID = 400L;
int id = 0;
- public void addNode(org.drools.knowledge.definitions.process.Node node) {
+ public void addNode(org.drools.definition.process.Node node) {
((Node) node).setId(++id);
super.addNode(node);
}
Modified: labs/jbossrules/trunk/drools-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-core/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,16 +1,16 @@
-<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" including="**" 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-api"/>
- <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/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.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" including="**" 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-api"/>
+ <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/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/.project
===================================================================
--- labs/jbossrules/trunk/drools-core/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,22 +1,22 @@
-<projectDescription>
- <name>drools-core</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-api</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.drools.eclipse.droolsbuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
- </natures>
+<projectDescription>
+ <name>drools-core</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-api</project>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.drools.eclipse.droolsbuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>org.devzuz.q.maven.jdt.core.mavenIncrementalBuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.devzuz.q.maven.jdt.core.mavenNature</nature>
+ </natures>
</projectDescription>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ProcessIntegrationException.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ProcessIntegrationException.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ProcessIntegrationException.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
/**
* Indicates an error integrating a <code>Process</code> or <code>Package</code>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/QueryResult.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/QueryResult.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/QueryResult.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -20,7 +20,7 @@
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.rule.Declaration;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -31,9 +31,9 @@
import org.drools.common.AgendaGroupFactory;
import org.drools.common.ArrayAgendaGroupFactory;
import org.drools.common.PriorityQueueAgendaGroupFactory;
+import org.drools.definition.process.Process;
import org.drools.process.core.Context;
import org.drools.process.core.ParameterDefinition;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.process.core.WorkDefinition;
import org.drools.process.core.datatype.DataType;
import org.drools.process.core.impl.ParameterDefinitionImpl;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/StatefulSession.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/StatefulSession.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/StatefulSession.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -4,7 +4,7 @@
import java.util.List;
import org.drools.concurrent.Future;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.AgendaFilter;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemory.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -25,7 +25,7 @@
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.FactHandle;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AsyncExceptionHandler;
import org.drools.spi.GlobalResolver;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -18,7 +18,7 @@
package org.drools;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
/**
* An interface for instances that allow handling of entry-point-scoped
@@ -68,7 +68,7 @@
* @throws FactException
* If a RuntimeException error occurs.
*/
- void retract(FactHandle handle) throws FactException;
+ void retract(org.drools.runtime.rule.FactHandle handle) throws FactException;
/**
* Inform the WorkingMemory that a Fact has been modified and that it
@@ -82,21 +82,21 @@
* @throws FactException
* If a RuntimeException error occurs.
*/
- void update(FactHandle handle,
+ void update(org.drools.runtime.rule.FactHandle handle,
Object object) throws FactException;
/**
*
* @param factHandle
*/
- public void modifyRetract(final FactHandle factHandle);
+ public void modifyRetract(final org.drools.FactHandle factHandle);
/**
*
* @param factHandle
* @param object
*/
- public void modifyInsert(final FactHandle factHandle,
+ public void modifyInsert(final org.drools.FactHandle factHandle,
final Object object);
public WorkingMemoryEntryPoint getWorkingMemoryEntryPoint(String name);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -69,7 +69,7 @@
import org.drools.event.BeforeRuleAddedEvent;
import org.drools.event.BeforeRuleRemovedEvent;
import org.drools.rule.Declaration;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -29,7 +29,7 @@
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
import org.drools.runtime.KnowledgeRuntime;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DelegateJavaFactHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DelegateJavaFactHandler.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DelegateJavaFactHandler.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.base;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.JavaFact;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/JavaFactRegistryEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/JavaFactRegistryEntry.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/JavaFactRegistryEntry.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
*/
package org.drools.base;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
public class JavaFactRegistryEntry {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -24,7 +24,7 @@
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
import org.drools.runtime.KnowledgeRuntime;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -41,10 +41,10 @@
import org.drools.SessionConfiguration;
import org.drools.StatefulSession;
import org.drools.base.ClassFieldAccessorCache;
+import org.drools.definition.process.Process;
import org.drools.event.RuleBaseEventListener;
import org.drools.event.RuleBaseEventSupport;
import org.drools.marshalling.Marshaller;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.rule.CompositeClassLoader;
import org.drools.rule.DialectRuntimeRegistry;
import org.drools.rule.FactType;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -51,6 +51,7 @@
import org.drools.RuleBaseConfiguration.LogicalOverride;
import org.drools.base.MapGlobalResolver;
import org.drools.concurrent.ExecutorService;
+import org.drools.definition.process.Process;
import org.drools.event.AgendaEventListener;
import org.drools.event.AgendaEventSupport;
import org.drools.event.RuleBaseEventListener;
@@ -58,7 +59,6 @@
import org.drools.event.RuleFlowEventSupport;
import org.drools.event.WorkingMemoryEventListener;
import org.drools.event.WorkingMemoryEventSupport;
-import org.drools.knowledge.definitions.process.Process;
import org.drools.process.core.ContextContainer;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.core.event.EventFilter;
@@ -87,7 +87,7 @@
import org.drools.rule.TimeMachine;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.runtime.ObjectFilter;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AsyncExceptionHandler;
@@ -1063,15 +1063,15 @@
}
}
- public void retract(final FactHandle handle) throws FactException {
- retract( handle,
+ public void retract(final org.drools.runtime.rule.FactHandle handle) throws FactException {
+ retract( (org.drools.FactHandle) handle,
true,
true,
null,
null );
}
- public void retract(final FactHandle factHandle,
+ public void retract(final org.drools.FactHandle factHandle,
final boolean removeLogical,
final boolean updateEqualsMap,
final Rule rule,
@@ -1271,9 +1271,9 @@
}
}
- public void update(final FactHandle handle,
+ public void update(final org.drools.runtime.rule.FactHandle handle,
final Object object) throws FactException {
- update( handle,
+ update( (org.drools.FactHandle) handle,
object,
null,
null );
@@ -1285,7 +1285,7 @@
*
* @see WorkingMemory
*/
- public void update(final FactHandle factHandle,
+ public void update(final org.drools.FactHandle factHandle,
final Object object,
final Rule rule,
final Activation activation) throws FactException {
@@ -1374,7 +1374,7 @@
this );
this.workingMemoryEventSupport.fireObjectUpdated( propagationContext,
- factHandle,
+ (org.drools.FactHandle) factHandle,
originalObject,
object,
this );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -27,7 +27,7 @@
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -18,7 +18,7 @@
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.RightTuple;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
/**
* Implementation of <code>FactHandle</code>.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -21,7 +21,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.util.AbstractHashTable.ObjectComparator;
public class EqualityAssertMapComparator
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EventFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EventFactHandle.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EventFactHandle.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.common;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
public class EventFactHandle extends DefaultFactHandle {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -21,7 +21,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.util.AbstractHashTable.ObjectComparator;
public class IdentityAssertMapComparator
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -24,13 +24,13 @@
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.StatefulSession;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.reteoo.Rete;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.rule.CompositeClassLoader;
import org.drools.rule.Package;
import org.drools.rule.TypeDeclaration;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -14,7 +14,7 @@
import org.drools.reteoo.PartitionTaskManager;
import org.drools.rule.Rule;
import org.drools.rule.TimeMachine;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.FactHandleFactory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemoryActions.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemoryActions.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalWorkingMemoryActions.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -18,7 +18,7 @@
import org.drools.FactException;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.Activation;
public interface InternalWorkingMemoryActions
@@ -36,13 +36,13 @@
Rule rule,
Activation activation) throws FactException;
- FactHandle insert(Object object,
+ org.drools.FactHandle insert(Object object,
boolean dynamic,
boolean logical,
Rule rule,
Activation activation) throws FactException;
- public FactHandle insertLogical(Object object,
+ public org.drools.FactHandle insertLogical(Object object,
boolean dynamic) throws FactException;
public void modifyRetract(final FactHandle factHandle,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/LogicalDependency.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/LogicalDependency.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/LogicalDependency.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.util.AbstractBaseLinkedListNode;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,7 +16,7 @@
import org.drools.reteoo.ObjectTypeConf;
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.FactHandleFactory;
@@ -158,7 +158,7 @@
wm );
}
- public void update(final FactHandle handle,
+ public void update(final org.drools.runtime.rule.FactHandle handle,
final Object object) throws FactException {
update( handle,
object,
@@ -166,7 +166,7 @@
null );
}
- protected void update(final FactHandle factHandle,
+ protected void update(final org.drools.runtime.rule.FactHandle factHandle,
final Object object,
final Rule rule,
final Activation activation) throws FactException {
@@ -223,7 +223,7 @@
this.wm );
this.wm.getWorkingMemoryEventSupport().fireObjectUpdated( propagationContext,
- factHandle,
+ (org.drools.FactHandle)factHandle,
originalObject,
object,
this.wm );
@@ -236,8 +236,8 @@
}
}
- public void retract(final FactHandle handle) throws FactException {
- retract( handle,
+ public void retract(final org.drools.runtime.rule.FactHandle handle) throws FactException {
+ retract( (org.drools.FactHandle) handle,
true,
true,
null,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -23,7 +23,7 @@
import org.drools.reteoo.LeftTuple;
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.PropagationContext;
import org.drools.util.ObjectHashMap;
@@ -125,7 +125,7 @@
return this.rule;
}
- public org.drools.knowledge.definitions.rule.Rule getRule() {
+ public org.drools.definition.rule.Rule getRule() {
return this.rule;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/RetractObject.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/RetractObject.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/RetractObject.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -9,7 +9,7 @@
import java.io.ObjectOutput;
import org.drools.WorkingMemory;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
public class RetractObject
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectInsertedEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectInsertedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectInsertedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectRetractedEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectRetractedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectRetractedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectUpdatedEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectUpdatedEvent.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/ObjectUpdatedEvent.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -25,7 +25,7 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.drools.common.InternalWorkingMemory;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.PropagationContext;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/Process.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/Process.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/Process.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
import java.util.List;
import java.util.Map;
-public interface Process extends org.drools.knowledge.definitions.process.Process, ContextContainer {
+public interface Process extends org.drools.definition.process.Process, ContextContainer {
/**
* Sets the id of this process.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/ProcessValidationError.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/ProcessValidationError.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/ProcessValidationError.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
/**
* Represents a RuleFlow validation error.
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/ProcessValidator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/ProcessValidator.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/ProcessValidator.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -17,7 +17,7 @@
*/
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
/**
* A validator for validating a RuleFlow process.
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/impl/ProcessValidationErrorImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/impl/ProcessValidationErrorImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/validation/impl/ProcessValidationErrorImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.process.core.validation.impl;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.process.core.validation.ProcessValidationError;
public class ProcessValidationErrorImpl implements ProcessValidationError {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -18,7 +18,7 @@
import org.drools.Agenda;
import org.drools.common.InternalWorkingMemory;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.WorkingMemory;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactoryRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactoryRegistry.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/ProcessInstanceFactoryRegistry.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.ruleflow.instance.RuleFlowProcessInstanceFactory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -25,7 +25,7 @@
import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.process.core.Context;
import org.drools.process.core.ContextContainer;
import org.drools.process.instance.ContextInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -42,7 +42,7 @@
import org.drools.rule.InvalidPatternException;
import org.drools.rule.Package;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.ExecutorServiceFactory;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -15,7 +15,7 @@
import org.drools.concurrent.Future;
import org.drools.concurrent.RetractObject;
import org.drools.concurrent.UpdateObject;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.AgendaFilter;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.RuleBaseUpdateListener;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -33,8 +33,8 @@
import org.drools.base.ClassFieldAccessorStore;
import org.drools.common.DroolsObjectInputStream;
import org.drools.common.DroolsObjectOutputStream;
+import org.drools.definition.process.Process;
import org.drools.facttemplates.FactTemplate;
-import org.drools.knowledge.definitions.process.Process;
/**
* Collection of related <code>Rule</code>s.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -54,7 +54,7 @@
Externalizable,
Wireable,
Dialectable,
- org.drools.knowledge.definitions.rule.Rule {
+ org.drools.definition.rule.Rule {
/**
*
*/
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/RuleFlowProcess.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/RuleFlowProcess.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/RuleFlowProcess.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,7 +1,7 @@
package org.drools.ruleflow.core;
-import org.drools.knowledge.definitions.process.Node;
-import org.drools.knowledge.definitions.process.NodeContainer;
+import org.drools.definition.process.Node;
+import org.drools.definition.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;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -22,9 +22,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.Process;
+import org.drools.definition.process.Connection;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.Process;
import org.drools.process.core.Work;
import org.drools.process.core.context.variable.Variable;
import org.drools.process.core.validation.ProcessValidationError;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Activation.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Activation.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Activation.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -17,12 +17,14 @@
*/
import java.io.Serializable;
+import java.util.Collection;
import org.drools.common.ActivationGroupNode;
import org.drools.common.LogicalDependency;
import org.drools.common.RuleFlowGroupNode;
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
import org.drools.util.LinkedList;
/**
@@ -78,7 +80,7 @@
*
* @return The propagation context
*/
- PropagationContext getPropagationContext();
+ PropagationContext getPropagationContext();
/**
* Cancel the <code>Activation</code> by removing it from the <code>Agenda</code>.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -19,7 +19,7 @@
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.reteoo.ObjectTypeConf;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
/**
* Factory Interface to return new <code>FactHandle</code>s
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -21,7 +21,7 @@
import org.drools.FactException;
import org.drools.rule.Declaration;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.runtime.rule.RuleContext;
import org.drools.WorkingMemory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PropagationContext.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PropagationContext.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PropagationContext.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -21,7 +21,7 @@
import org.drools.reteoo.LeftTuple;
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
public interface PropagationContext
extends
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/Connection.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/Connection.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/Connection.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -21,7 +21,7 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface Connection extends org.drools.knowledge.definitions.process.Connection {
+public interface Connection extends org.drools.definition.process.Connection {
void setMetaData(String name, Object value);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/Node.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/Node.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/Node.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -18,8 +18,8 @@
import java.io.Serializable;
-import org.drools.knowledge.definitions.process.Connection;
-import org.drools.knowledge.definitions.process.NodeContainer;
+import org.drools.definition.process.Connection;
+import org.drools.definition.process.NodeContainer;
import org.drools.process.core.Contextable;
/**
@@ -27,7 +27,7 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface Node extends org.drools.knowledge.definitions.process.Node, Contextable, Serializable {
+public interface Node extends org.drools.definition.process.Node, Contextable, Serializable {
static final String CONNECTION_DEFAULT_TYPE = "DROOLS_DEFAULT";
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/NodeContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/NodeContainer.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/NodeContainer.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,13 +1,13 @@
package org.drools.workflow.core;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.core.Context;
/**
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface NodeContainer extends org.drools.knowledge.definitions.process.NodeContainer {
+public interface NodeContainer extends org.drools.definition.process.NodeContainer {
/**
* Method for adding a node to this node container.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/WorkflowProcess.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/WorkflowProcess.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/WorkflowProcess.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -26,7 +26,7 @@
*
* @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
*/
-public interface WorkflowProcess extends org.drools.knowledge.definitions.process.WorkflowProcess, Process, NodeContainer {
+public interface WorkflowProcess extends org.drools.definition.process.WorkflowProcess, Process, NodeContainer {
/**
* Returns the imports of this RuleFlow process.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/ConnectionImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -20,7 +20,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.workflow.core.Connection;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/NodeContainerImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/NodeContainerImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/NodeContainerImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -4,7 +4,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.core.Context;
import org.drools.workflow.core.NodeContainer;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/NodeImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/NodeImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/NodeImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -23,8 +23,8 @@
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.definition.process.Connection;
+import org.drools.definition.process.NodeContainer;
import org.drools.process.core.Context;
import org.drools.workflow.core.Node;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/WorkflowProcessImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/WorkflowProcessImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/impl/WorkflowProcessImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.drools.knowledge.definitions.process.Node;
-import org.drools.knowledge.definitions.process.NodeContainer;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.NodeContainer;
import org.drools.process.core.impl.ProcessImpl;
import org.drools.workflow.core.WorkflowProcess;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/CompositeNode.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -5,8 +5,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.definition.process.Connection;
+import org.drools.definition.process.Node;
import org.drools.workflow.core.NodeContainer;
import org.drools.workflow.core.impl.ConnectionImpl;
import org.drools.workflow.core.impl.NodeContainerImpl;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/ForEachNode.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.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;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Join.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Join.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Join.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -18,7 +18,7 @@
import java.util.List;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.workflow.core.impl.NodeImpl;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/SequenceNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/SequenceNode.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/SequenceNode.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,7 +2,7 @@
import java.util.List;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.workflow.core.impl.ExtendedNodeImpl;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Split.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Split.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/node/Split.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.core.impl.NodeImpl;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstance.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.workflow.instance;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.instance.ContextInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/NodeInstanceContainer.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -2,8 +2,8 @@
import java.util.Collection;
-import org.drools.knowledge.definitions.process.Node;
-import org.drools.knowledge.definitions.process.NodeContainer;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.NodeContainer;
import org.drools.process.instance.NodeInstance;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -5,7 +5,7 @@
import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.definition.process.WorkflowProcess;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.WorkflowProcessInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ConstraintEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ConstraintEvaluator.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ConstraintEvaluator.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.workflow.instance.impl;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.instance.node.SplitInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactory.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.workflow.instance.impl;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.NodeInstanceContainer;
import org.drools.process.instance.WorkflowProcessInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactoryRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactoryRegistry.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceFactoryRegistry.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.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/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/NodeInstanceImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -21,8 +21,8 @@
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.definition.process.Connection;
+import org.drools.definition.process.Node;
import org.drools.process.core.Context;
import org.drools.process.core.ContextContainer;
import org.drools.process.instance.ContextInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/ReturnValueConstraintEvaluator.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -21,7 +21,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.spi.CompiledInvoker;
import org.drools.spi.ProcessContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/RuleConstraintEvaluator.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -19,7 +19,7 @@
import java.io.Serializable;
import org.drools.common.InternalAgenda;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkflowProcessInstance;
import org.drools.workflow.core.Constraint;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -29,9 +29,9 @@
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.definition.process.Node;
+import org.drools.definition.process.NodeContainer;
+import org.drools.definition.process.WorkflowProcess;
import org.drools.process.instance.EventListener;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.NodeInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/CreateNewNodeFactory.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.workflow.instance.impl.factory;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.NodeInstanceContainer;
import org.drools.process.instance.WorkflowProcessInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/impl/factory/ReuseNodeFactory.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.workflow.instance.impl.factory;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.NodeInstanceContainer;
import org.drools.process.instance.WorkflowProcessInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/CompositeNodeInstance.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -23,9 +23,9 @@
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.definition.process.Connection;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.NodeContainer;
import org.drools.process.instance.EventListener;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.NodeInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/ForEachNodeInstance.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -5,7 +5,7 @@
import java.util.Collections;
import java.util.List;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/JoinInstance.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -19,7 +19,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.process.instance.NodeInstance;
import org.drools.workflow.core.node.Join;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SplitInstance.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -20,7 +20,7 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.process.instance.NodeInstance;
import org.drools.workflow.core.node.Split;
import org.drools.workflow.instance.NodeInstanceContainer;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/instance/node/SubProcessNodeInstance.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -20,7 +20,7 @@
import java.util.Map;
import org.drools.common.InternalRuleBase;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.instance.EventListener;
import org.drools.process.instance.InternalProcessInstance;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/MockFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/MockFactHandle.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/MockFactHandle.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -4,7 +4,7 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -44,7 +44,7 @@
import org.drools.rule.Package;
import org.drools.rule.Pattern;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.Evaluator;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -25,7 +25,7 @@
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
/**
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -29,7 +29,7 @@
import org.drools.rule.LiteralConstraint;
import org.drools.rule.Pattern;
import org.drools.rule.VariableConstraint;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.DataProvider;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -35,7 +35,7 @@
import org.drools.reteoo.ReteooBuilder.IdGenerator;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -40,7 +40,7 @@
import org.drools.rule.Behavior;
import org.drools.rule.LiteralConstraint;
import org.drools.rule.Query;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.Evaluator;
import org.drools.spi.FieldValue;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -36,7 +36,7 @@
import org.drools.reteoo.ReteooBuilder.IdGenerator;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.EntryPoint;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.PropagationContext;
/**
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -15,7 +15,7 @@
import org.drools.common.EqualityKey;
import org.drools.common.InternalWorkingMemory;
import org.drools.common.TruthMaintenanceSystem;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.GlobalResolver;
public class ReteooWorkingMemoryTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/BaseQueueable.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/BaseQueueable.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/BaseQueueable.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -7,7 +7,7 @@
import org.drools.common.RuleFlowGroupNode;
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
-import org.drools.runtime.rule.FactHandle;
+import org.drools.FactHandle;
import org.drools.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstance.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -8,7 +8,7 @@
import java.util.List;
import java.util.Map;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.instance.NodeInstance;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/MockNodeInstanceFactory.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
*/
package org.drools.workflow.instance.node;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.instance.NodeInstance;
import org.drools.process.instance.NodeInstanceContainer;
import org.drools.process.instance.WorkflowProcessInstance;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/workflow/instance/node/StartNodeInstanceTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -10,7 +10,7 @@
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.common.InternalWorkingMemory;
-import org.drools.knowledge.definitions.process.Node;
+import org.drools.definition.process.Node;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.NodeInstance;
import org.drools.ruleflow.core.RuleFlowProcess;
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,24 +1,24 @@
-<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" including="**" 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="var" path="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-api/5.0.0.SNAPSHOT/drools-api-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-api/5.0.0.SNAPSHOT/drools-api-5.0.0.SNAPSHOT-sources.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>
+ <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" including="**" 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/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-api"/>
+ <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
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/.project
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-jaxb/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,13 +1,17 @@
-<projectDescription>
- <name>drools-dataloaders-jaxb</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-dataloaders-jaxb</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-compiler</project>
+ <project>drools-core</project>
+ <project>drools-api</project>
+ </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/trunk/drools-dataloaders/drools-dataloaders-smooks/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,30 +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" including="**" 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/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/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/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/1.3.3-java1.5/mvel-1.3.3-java1.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.9/freemarker-2.3.9.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-compiler/5.0.0.SNAPSHOT/drools-compiler-5.0.0.SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-core/5.0.0.SNAPSHOT/drools-core-5.0.0.SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/drools/drools-api/5.0.0.SNAPSHOT/drools-api-5.0.0.SNAPSHOT.jar" sourcepath="M2_REPO/org/drools/drools-api/5.0.0.SNAPSHOT/drools-api-5.0.0.SNAPSHOT-sources.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>
+ <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" including="**" 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/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/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/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/1.3.3-java1.5/mvel-1.3.3-java1.5.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/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-api"/>
+ <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
Modified: labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.project
===================================================================
--- labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-dataloaders/drools-dataloaders-smooks/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,13 +1,17 @@
-<projectDescription>
- <name>drools-dataloaders-smooks</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-dataloaders-smooks</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-compiler</project>
+ <project>drools-core</project>
+ <project>drools-api</project>
+ </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/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/ProcessInfo.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/ProcessInfo.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/ProcessInfo.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -3,7 +3,7 @@
import java.util.List;
import org.drools.compiler.DroolsError;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
public class ProcessInfo {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/action/VerticalAutoLayoutAction.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -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.knowledge.definitions.process.Connection;
-import org.drools.knowledge.definitions.process.WorkflowProcess;
+import org.drools.definition.process.Connection;
+import org.drools.definition.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.knowledge.definitions.process.Node processNode: process.getNodes()) {
+ for (org.drools.definition.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.knowledge.definitions.process.Node processNode: process.getNodes()) {
+ for (org.drools.definition.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/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapper.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -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.knowledge.definitions.process.Process;
+import org.drools.definition.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;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapperBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapperBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/common/editor/core/ProcessWrapperBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,6 +1,6 @@
package org.drools.eclipse.flow.common.editor.core;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.eclipse.jdt.core.IJavaProject;
public interface ProcessWrapperBuilder {
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowProcessWrapper.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -17,8 +17,8 @@
import org.drools.eclipse.flow.common.editor.core.ElementWrapper;
import org.drools.eclipse.flow.common.editor.core.ProcessWrapper;
-import org.drools.knowledge.definitions.process.Node;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.Process;
import org.drools.ruleflow.core.RuleFlowProcess;
/**
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowWrapperBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowWrapperBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/RuleFlowWrapperBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -11,9 +11,9 @@
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.knowledge.definitions.process.Connection;
-import org.drools.knowledge.definitions.process.Node;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Connection;
+import org.drools.definition.process.Node;
+import org.drools.definition.process.Process;
import org.drools.process.core.Work;
import org.drools.process.core.WorkDefinition;
import org.drools.process.core.impl.WorkDefinitionImpl;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/core/SplitWrapper.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -25,7 +25,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.ConstraintsPropertyDescriptor;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.WorkflowProcess;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/action/ActionCompletionProcessor.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -39,6 +39,7 @@
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;
+import java.util.Arrays;
/**
* Completion for ruleflow constraints.
@@ -94,8 +95,9 @@
}
private void loadImports() {
- this.imports = new ArrayList<String>();
- List<String> imports = process.getImports();
+ this.imports = new ArrayList();
+ List<String> imports = ((org.drools.process.core.Process) process).getImports();
+
if (imports != null) {
Iterator<String> iterator = imports.iterator();
while (iterator.hasNext()) {
@@ -122,7 +124,11 @@
private void loadGlobals() {
String[] globalNames = process.getGlobalNames();
- this.globals = new ArrayList<GlobalDescr>(globalNames.length);
+
+ if ( this.globals == null ) {
+ this.globals = new ArrayList<GlobalDescr>( globalNames.length );
+ }
+
for (String globalName: globalNames) {
this.globals.add(new GlobalDescr(globalName, "java.lang.Object"));
}
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/constraint/ConstraintListDialog.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -20,7 +20,7 @@
import java.util.Map;
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
-import org.drools.knowledge.definitions.process.Connection;
+import org.drools.definition.process.Connection;
import org.drools.workflow.core.Constraint;
import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.core.node.Split;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersCellEditor.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -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.knowledge.definitions.process.Process;
+import org.drools.definition.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/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersDialog.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -17,7 +17,7 @@
import org.drools.eclipse.flow.common.view.property.EditBeanDialog;
import org.drools.eclipse.flow.common.view.property.EditMapDialog;
-import org.drools.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.drools.process.core.context.exception.ActionExceptionHandler;
import org.drools.workflow.core.WorkflowProcess;
import org.eclipse.swt.widgets.Shell;
Modified: labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java
===================================================================
--- labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-eclipse/drools-eclipse-plugin/src/main/java/org/drools/eclipse/flow/ruleflow/view/property/exceptionHandler/ExceptionHandlersPropertyDescriptor.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -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.knowledge.definitions.process.Process;
+import org.drools.definition.process.Process;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.swt.widgets.Composite;
Modified: labs/jbossrules/trunk/drools-examples/drools-examples-drl/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-examples/drools-examples-drl/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-examples/drools-examples-drl/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -8,5 +8,10 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/foxtrot-2.0.jar"/>
<classpathentry kind="lib" path="lib/jgoodies-forms-1.0.4.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-api"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-compiler"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-core"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-decisiontables"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/drools-templates"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: labs/jbossrules/trunk/drools-guvnor/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-guvnor/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -24,7 +24,7 @@
<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.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
<classpathentry kind="src" path="/drools-api"/>
<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"/>
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowContentModelBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -12,8 +12,8 @@
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.definition.process.Connection;
+import org.drools.definition.process.Node;
import org.drools.process.core.Work;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.workflow.core.Constraint;
Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/builder/RuleFlowProcessBuilder.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -24,8 +24,8 @@
import org.drools.guvnor.client.rulefloweditor.SplitTransferNode;
import org.drools.guvnor.client.rulefloweditor.TransferNode;
import org.drools.guvnor.client.rulefloweditor.WorkItemTransferNode;
+import org.drools.definition.process.Node;
import org.drools.guvnor.client.rulefloweditor.TransferNode.Type;
-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;
Modified: labs/jbossrules/trunk/drools-jsr94/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-jsr94/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-jsr94/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -11,7 +11,7 @@
<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.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
<classpathentry kind="src" path="/drools-api"/>
<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"/>
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,54 +1,55 @@
-<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" including="**" 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/h2database/h2/1.0.77/h2-1.0.77.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/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M3/mina-core-2.0.0-M3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
- <classpathentry kind="src" path="/drools-api"/>
- <classpathentry kind="src" path="/drools-workitems"/>
- <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/javax/mail/mail/1.4/mail-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-cli/2.0-SNAPSHOT/commons-cli-2.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0-SNAPSHOT/commons-compress-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.0-SNAPSHOT/commons-exec-1.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.1.0-SNAPSHOT/jboss-seam-2.1.0-SNAPSHOT.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/javax/el/el-api/1.0/el-api-1.0.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-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-wiser/1.2/subethasmtp-wiser-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-smtp/1.2/subethasmtp-smtp-1.2.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/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/postgresql/postgresql/8.3-603.jdbc3/postgresql-8.3-603.jdbc3.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" including="**" 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/h2database/h2/1.0.77/h2-1.0.77.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/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/mina/mina-core/2.0.0-M3/mina-core-2.0.0-M3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-api"/>
+ <classpathentry kind="src" path="/drools-workitems"/>
+ <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/javax/mail/mail/1.4/mail-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-cli/2.0-SNAPSHOT/commons-cli-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0-SNAPSHOT/commons-compress-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.0-SNAPSHOT/commons-exec-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.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/javax/transaction/jta/1.1/jta-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.4.GA/javassist-3.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/seam/jboss-seam/2.1.0-SNAPSHOT/jboss-seam-2.1.0-SNAPSHOT.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/javax/el/el-api/1.0/el-api-1.0.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-jdk14/1.5.2/slf4j-jdk14-1.5.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-wiser/1.2/subethasmtp-wiser-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-smtp/1.2/subethasmtp-smtp-1.2.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/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/postgresql/postgresql/8.3-603.jdbc3/postgresql-8.3-603.jdbc3.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-process-task/.project
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-process-task/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-process/drools-process-task/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,18 +1,18 @@
-<projectDescription>
- <name>drools-process-task</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-core</project>
- <project>drools-api</project>
- <project>drools-workitems</project>
- <project>drools-compiler</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+<projectDescription>
+ <name>drools-process-task</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-core</project>
+ <project>drools-api</project>
+ <project>drools-workitems</project>
+ <project>drools-compiler</project>
+ </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/trunk/drools-process/drools-workitems/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,33 +1,33 @@
-<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" including="**" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0-SNAPSHOT/commons-compress-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.0-SNAPSHOT/commons-exec-1.0.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-cli/2.0-SNAPSHOT/commons-cli-2.0-SNAPSHOT.jar"/>
- <classpathentry kind="src" path="/drools-compiler"/>
- <classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
- <classpathentry kind="src" path="/drools-api"/>
- <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/subethamail/subethasmtp-wiser/1.2/subethasmtp-wiser-1.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-smtp/1.2/subethasmtp-smtp-1.2.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/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.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" including="**" excluding="**/*.java"/>
+ <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.4/commons-io-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1/activation-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-compress/1.0-SNAPSHOT/commons-compress-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-exec/1.0.0-SNAPSHOT/commons-exec-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-finder/1.0-SNAPSHOT/commons-finder-1.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/commons/commons-cli/2.0-SNAPSHOT/commons-cli-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-compiler"/>
+ <classpathentry kind="src" path="/drools-core"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-api"/>
+ <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/subethamail/subethasmtp-wiser/1.2/subethasmtp-wiser-1.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/subethamail/subethasmtp-smtp/1.2/subethasmtp-smtp-1.2.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/logkit/logkit/1.0.1/logkit-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar"/>
</classpath>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-process/drools-workitems/.project
===================================================================
--- labs/jbossrules/trunk/drools-process/drools-workitems/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-process/drools-workitems/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,17 +1,17 @@
-<projectDescription>
- <name>drools-workitems</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-compiler</project>
- <project>drools-core</project>
- <project>drools-api</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+<projectDescription>
+ <name>drools-workitems</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-compiler</project>
+ <project>drools-core</project>
+ <project>drools-api</project>
+ </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/trunk/drools-repository/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-repository/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-repository/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -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" including="**" 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>
+ <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" including="**" 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/trunk/drools-repository/.project
===================================================================
--- labs/jbossrules/trunk/drools-repository/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-repository/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -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/trunk/drools-server/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-server/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-server/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -13,7 +13,7 @@
<classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/>
<classpathentry kind="src" path="/drools-compiler"/>
<classpathentry kind="src" path="/drools-core"/>
- <classpathentry kind="var" path="M2_REPO/org/mvel/mvel/2.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
<classpathentry kind="src" path="/drools-api"/>
<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"/>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-core/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-core/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-core/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -13,7 +13,7 @@
<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.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
<classpathentry kind="src" path="/drools-api"/>
<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"/>
Modified: labs/jbossrules/trunk/drools-solver/drools-solver-examples/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-solver/drools-solver-examples/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-solver/drools-solver-examples/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -13,7 +13,7 @@
<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.0-SNAPSHOT/mvel-2.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
<classpathentry kind="src" path="/drools-api"/>
<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"/>
Modified: labs/jbossrules/trunk/drools-templates/.classpath
===================================================================
--- labs/jbossrules/trunk/drools-templates/.classpath 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-templates/.classpath 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,19 +1,19 @@
-<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" including="**" 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/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
- <classpathentry kind="src" path="/drools-api"/>
- <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>
+ <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" including="**" 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/mvel2/2.0.1-SNAPSHOT/mvel2-2.0.1-SNAPSHOT.jar"/>
+ <classpathentry kind="src" path="/drools-api"/>
+ <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
Modified: labs/jbossrules/trunk/drools-templates/.project
===================================================================
--- labs/jbossrules/trunk/drools-templates/.project 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-templates/.project 2008-11-04 23:49:41 UTC (rev 23698)
@@ -1,17 +1,17 @@
-<projectDescription>
- <name>drools-templates</name>
- <comment>A rule production system</comment>
- <projects>
- <project>drools-compiler</project>
- <project>drools-core</project>
- <project>drools-api</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
+<projectDescription>
+ <name>drools-templates</name>
+ <comment>A rule production system</comment>
+ <projects>
+ <project>drools-compiler</project>
+ <project>drools-core</project>
+ <project>drools-api</project>
+ </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/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java 2008-11-04 18:34:56 UTC (rev 23697)
+++ labs/jbossrules/trunk/drools-templates/src/test/java/org/drools/template/parser/ExternalSheetListenerTest.java 2008-11-04 23:49:41 UTC (rev 23698)
@@ -25,7 +25,7 @@
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.FactHandle;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AgendaGroup;
import org.drools.spi.AsyncExceptionHandler;
@@ -198,7 +198,7 @@
return null;
}
- public void update(FactHandle arg0, Object arg1)
+ public void update(org.drools.runtime.rule.FactHandle arg0, Object arg1)
throws FactException {
}
@@ -215,7 +215,7 @@
}
- public void retract(FactHandle arg0) throws FactException {
+ public void retract(org.drools.runtime.rule.FactHandle arg0) throws FactException {
}
More information about the jboss-svn-commits
mailing list