[jboss-svn-commits] JBL Code SVN: r23331 - in labs/jbossrules/branches/drools-api-refactor-20080929: drools-api/src/main/java/org/drools/event/process and 48 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 6 17:10:18 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-10-06 17:10:17 -0400 (Mon, 06 Oct 2008)
New Revision: 23331
Added:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessRuntimeEventManager.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationCancelledEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationCreatedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AfterActivationFiredEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaEventListener.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupPoppedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupPushedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/BeforeActivationFiredEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEventListener.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEventManager.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/ClassObjectFilter.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/ObjectFilter.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatefulKnowledgeSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatelessKnowledgeSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/ProcessRuntime.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatefulProcessSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatelessProcessSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/
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/Agenda.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/AgendaGroup.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/FactHandle.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/StatefulRuleSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/StatelessRuleSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/FactHandle.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationCancelledEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationCreatedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AfterActivationFiredEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupPoppedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupPushedEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/BeforeActivationFiredEventImpl.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/WorkingMemoryEventImpl.java
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/WorkingMemoryEventSupportTest.java
Removed:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ClassObjectFilter.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/FactHandle.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ObjectFilter.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ProcessRuntime.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/PropagationContext.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/RuleRuntime.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulKnowledgeSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulProcessSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulRuleSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessKnowledgeSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessProcessSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessRuleSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventListener.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventManager.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/RuleRuntimeEventImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/RuleRuntimeEventSupportTest.java
Modified:
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBase.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectInsertedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectRetractedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectUpdatedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/RuleCoverageListener.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGenerator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/example/ExampleScenario.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/Agenda.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/QueryResult.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/QueryResults.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/RuleBase.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/StatefulSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/StatelessSessionResult.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/WorkingMemory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/ThreadedWorkingMemoryFileLogger.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/CopyIdentifiersGlobalExporter.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/DelegateJavaFactHandler.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/JavaFactRegistryEntry.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/accumulators/JavaAccumulatorFunctionExecutor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractFactHandleFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AgendaItem.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/BinaryHeapQueueAgendaGroup.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/EventFactHandle.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalFactHandle.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemoryActions.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/LogicalDependency.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/ObjectStore.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/RetractObject.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/UpdateObject.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/AgendaEventSupport.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectInsertedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectRetractedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectUpdatedEvent.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.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/SerializablePropagationContext.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/impl/AsynchronousCommandService.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/impl/DefaultCommandService.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManagerFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteStatelessSessionResult.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/rule/Accumulate.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/Accumulator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/Activation.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/AgendaGroup.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/DataProvider.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/EvalExpression.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/JavaFact.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/PredicateExpression.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/PropagationContext.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ReturnValueExpression.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/util/JavaIteratorAdapter.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/MockFactHandle.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/RuleBaseEventListenerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterSessionTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/EventTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/ForEachTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/SubProcessTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/AgendaTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/CrossProductTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/MockAccumulator.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/OtherwiseTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooRuleBaseTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/SchedulerTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/builder/ReteooRuleBuilderTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/spi/MockConstraint.java
labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/util/BaseQueueable.java
Log:
JBRULES-1734 Drools API
-AgendaEvents are now mapped
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ClassObjectFilter.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ClassObjectFilter.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ClassObjectFilter.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,29 +0,0 @@
-package org.drools;
-
-
-/**
- * Filters Objects by Class, only accepting Classes of the specified type
- * @author mproctor
- *
- */
-public class ClassObjectFilter implements ObjectFilter {
- private Class clazz;
-
- /**
- * The Allowed Class type
- * @param clazz
- */
- public ClassObjectFilter(Class clazz) {
- this.clazz = clazz;
- }
-
- /**
- * Returning true means the Iterator accepts, and thus returns, the current Object's Class type.
- * @param object
- * @return
- */
- public boolean accept(Object object) {
- return this.clazz.isAssignableFrom( object.getClass() );
- }
-
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/FactHandle.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/FactHandle.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/FactHandle.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,5 +0,0 @@
-package org.drools;
-
-public interface FactHandle {
-
-}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBase.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBase.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/KnowledgeBase.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,6 +3,7 @@
import java.util.Collection;
import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.runtime.StatefulKnowledgeSession;
public interface KnowledgeBase {
void addKnowledgePackage(KnowledgePackage knowledgePackage);
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ObjectFilter.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ObjectFilter.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ObjectFilter.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,16 +0,0 @@
-package org.drools;
-
-/**
- * ObjectFilter is used with WorkingMemories to filter out instances during Iteration
- * @author mproctor
- *
- */
-public interface ObjectFilter {
-
- /**
- * Returning true means the Iterator accepts, and thus returns, the current Object.
- * @param object
- * @return
- */
- boolean accept(Object object);
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ProcessRuntime.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ProcessRuntime.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ProcessRuntime.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,5 +0,0 @@
-package org.drools;
-
-public interface ProcessRuntime {
-
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/PropagationContext.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/PropagationContext.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/PropagationContext.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,20 +0,0 @@
-package org.drools;
-
-import org.drools.knowledge.definitions.rule.Rule;
-
-public interface PropagationContext {
- public static final int ASSERTION = 0;
- public static final int RETRACTION = 1;
- public static final int MODIFICATION = 2;
- public static final int RULE_ADDITION = 3;
- public static final int RULE_REMOVAL = 4;
-
- public long getPropagationNumber();
-
- public Rule getRule();
-
- public FactHandle getFactHandle();
-
-
- public int getType();
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/RuleRuntime.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/RuleRuntime.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/RuleRuntime.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,33 +0,0 @@
-package org.drools;
-
-import java.util.Collection;
-
-import org.drools.event.rule.RuleRuntimeEventManager;
-import org.drools.time.SessionClock;
-
-public interface RuleRuntime extends RuleRuntimeEventManager {
- FactHandle insert(Object object);
-
- void retract(FactHandle factHandle);
-
- void update(FactHandle factHandle);
-
- void update(FactHandle factHandle, Object object);
-
- void halt();
- /**
- * Returns the session clock instance associated with this session
- * @return
- */
- public SessionClock getSessionClock();
-
- FactHandle getFactHandle(Object object);
-
- Collection<?> getObjects();
-
- Collection<?> getObjects(ObjectFilter filter);
-
- Collection<? extends FactHandle> getFactHandles();
-
- Collection<? extends FactHandle> getFactHandles(ObjectFilter filter);
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulKnowledgeSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulKnowledgeSession.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulKnowledgeSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,10 +0,0 @@
-package org.drools;
-
-public interface StatefulKnowledgeSession extends StatefulRuleSession, StatefulProcessSession {
-
- void setGlobal(String identifier,
- Object object);
-
- KnowledgeBase getKnowledgeBase();
-
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulProcessSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulProcessSession.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulProcessSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,21 +0,0 @@
-package org.drools;
-
-import java.util.Collection;
-import java.util.Map;
-
-import org.drools.process.instance.ProcessInstance;
-import org.drools.process.instance.WorkItemManager;
-
-public interface StatefulProcessSession extends ProcessRuntime {
-
- ProcessInstance startProcess(String processId);
-
- ProcessInstance startProcess(String processId, Map<String, Object> parameters);
-
- Collection<ProcessInstance> getProcessInstances();
-
- ProcessInstance getProcessInstance(long id);
-
- WorkItemManager getWorkItemManager();
-
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulRuleSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulRuleSession.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulRuleSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,17 +0,0 @@
-package org.drools;
-
-import java.util.concurrent.Future;
-
-public interface StatefulRuleSession extends RuleRuntime {
-
- Future<Object> asyncInsert( Object object );
-
- Future<Object> asyncInsert( Object[] array );
-
- Future<Object> asyncInsert( Iterable<?> iterable );
-
- void fireAllRules();
-
- Future<?> asyncFireAllRules();
-
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessKnowledgeSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessKnowledgeSession.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessKnowledgeSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,5 +0,0 @@
-package org.drools;
-
-public interface StatelessKnowledgeSession extends StatelessRuleSession, StatelessProcessSession {
-
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessProcessSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessProcessSession.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessProcessSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,5 +0,0 @@
-package org.drools;
-
-public interface StatelessProcessSession {
-
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessRuleSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessRuleSession.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessRuleSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,5 +0,0 @@
-package org.drools;
-
-public interface StatelessRuleSession {
-
-}
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessRuntimeEventManager.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessRuntimeEventManager.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/process/ProcessRuntimeEventManager.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,28 @@
+package org.drools.event.process;
+
+import java.util.List;
+
+public interface ProcessRuntimeEventManager {
+// /**
+// * Add an event listener.
+// *
+// * @param listener
+// * The listener to add.
+// */
+// public void addEventListener(RuleFlowEventListener listener);
+//
+// /**
+// * Remove an event listener.
+// *
+// * @param listener
+// * The listener to remove.
+// */
+// public void removeEventListener(RuleFlowEventListener listener);
+//
+// /**
+// * Returns all event listeners.
+// *
+// * @return listeners The listeners.
+// */
+// public Collection<RuleFlowEventListener> getRuleFlowEventListeners();
+}
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationCancelledEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationCancelledEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationCancelledEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,21 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+public interface ActivationCancelledEvent extends ActivationEvent {
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationCreatedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationCreatedEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationCreatedEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,21 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public interface ActivationCreatedEvent extends ActivationEvent {
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ActivationEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,26 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.drools.runtime.rule.Activation;
+
+
+public interface ActivationEvent {
+
+ public Activation getActivation();
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AfterActivationFiredEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AfterActivationFiredEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AfterActivationFiredEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,21 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public interface AfterActivationFiredEvent extends ActivationEvent {
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaEventListener.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaEventListener.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaEventListener.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,44 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.EventListener;
+
+import org.drools.runtime.rule.WorkingMemory;
+
+
+public interface AgendaEventListener
+ extends
+ EventListener {
+ void activationCreated(ActivationCreatedEvent event,
+ WorkingMemory workingMemory);
+
+ void activationCancelled(ActivationCancelledEvent event,
+ WorkingMemory workingMemory);
+
+ void beforeActivationFired(BeforeActivationFiredEvent event,
+ WorkingMemory workingMemory);
+
+ void afterActivationFired(AfterActivationFiredEvent event,
+ WorkingMemory workingMemory);
+
+ void agendaGroupPopped(AgendaGroupPoppedEvent event,
+ WorkingMemory workingMemory);
+
+ void agendaGroupPushed(AgendaGroupPushedEvent event,
+ WorkingMemory workingMemory);
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,27 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.EventObject;
+
+import org.drools.runtime.rule.AgendaGroup;
+
+public interface AgendaGroupEvent {
+
+ public AgendaGroup getAgendaGroup();
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupPoppedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupPoppedEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupPoppedEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,23 @@
+package org.drools.event.rule;
+
+import org.drools.runtime.rule.AgendaGroup;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public interface AgendaGroupPoppedEvent extends AgendaGroupEvent {
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupPushedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupPushedEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/AgendaGroupPushedEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,23 @@
+package org.drools.event.rule;
+
+import org.drools.runtime.rule.AgendaGroup;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public interface AgendaGroupPushedEvent extends AgendaGroupEvent {
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/BeforeActivationFiredEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/BeforeActivationFiredEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/BeforeActivationFiredEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,22 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+public interface BeforeActivationFiredEvent extends ActivationEvent {
+
+}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectInsertedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectInsertedEvent.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectInsertedEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
-public interface ObjectInsertedEvent extends RuleRuntimeEvent {
+public interface ObjectInsertedEvent extends WorkingMemoryEvent {
FactHandle getFactHandle();
Object getObject();
}
\ No newline at end of file
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectRetractedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectRetractedEvent.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectRetractedEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
-public interface ObjectRetractedEvent extends RuleRuntimeEvent {
+public interface ObjectRetractedEvent extends WorkingMemoryEvent {
public FactHandle getFactHandle();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectUpdatedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectUpdatedEvent.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/ObjectUpdatedEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
-public interface ObjectUpdatedEvent extends RuleRuntimeEvent {
+public interface ObjectUpdatedEvent extends WorkingMemoryEvent {
public FactHandle getFactHandle();
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEvent.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,14 +0,0 @@
-package org.drools.event.rule;
-
-import org.drools.PropagationContext;
-import org.drools.RuleRuntime;
-
-public interface RuleRuntimeEvent {
-
- /**
- * This method returns null after it is Serialized
- */
- public RuleRuntime getRuleRuntime();
-
- public PropagationContext getPropagationContext();
-}
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventListener.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventListener.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventListener.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,30 +0,0 @@
-package org.drools.event.rule;
-
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.EventListener;
-
-public interface RuleRuntimeEventListener
- extends
- EventListener {
- void objectInserted(ObjectInsertedEvent event);
-
- void objectUpdated(ObjectUpdatedEvent event);
-
- void objectRetracted(ObjectRetractedEvent event);
-
-}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventManager.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventManager.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventManager.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,30 +0,0 @@
-package org.drools.event.rule;
-
-import java.util.Collection;
-
-public interface RuleRuntimeEventManager {
-
- /**
- * Add an event listener.
- *
- * @param listener
- * The listener to add.
- */
- public void addEventListener(RuleRuntimeEventListener listener);
-
- /**
- * Remove an event listener.
- *
- * @param listener
- * The listener to remove.
- */
- public void removeEventListener(RuleRuntimeEventListener listener);
-
- /**
- * Returns all event listeners.
- *
- * @return listeners The listeners.
- */
- public Collection<RuleRuntimeEventListener> getRuleRuntimeEventListeners();
-
-}
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEvent.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEvent.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEvent.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,14 @@
+package org.drools.event.rule;
+
+import org.drools.runtime.rule.PropagationContext;
+import org.drools.runtime.rule.WorkingMemory;
+
+public interface WorkingMemoryEvent {
+
+ /**
+ * This method returns null after it is Serialized
+ */
+ public WorkingMemory getWorkingMemory();
+
+ public PropagationContext getPropagationContext();
+}
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEventListener.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventListener.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEventListener.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEventListener.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,30 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.EventListener;
+
+public interface WorkingMemoryEventListener
+ extends
+ EventListener {
+ void objectInserted(ObjectInsertedEvent event);
+
+ void objectUpdated(ObjectUpdatedEvent event);
+
+ void objectRetracted(ObjectRetractedEvent event);
+
+}
\ No newline at end of file
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEventManager.java (from rev 23250, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/RuleRuntimeEventManager.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEventManager.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEventManager.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,54 @@
+package org.drools.event.rule;
+
+import java.util.Collection;
+import java.util.List;
+
+public interface WorkingMemoryEventManager {
+
+ /**
+ * Add an event listener.
+ *
+ * @param listener
+ * The listener to add.
+ */
+ public void addEventListener(WorkingMemoryEventListener listener);
+
+ /**
+ * Remove an event listener.
+ *
+ * @param listener
+ * The listener to remove.
+ */
+ public void removeEventListener(WorkingMemoryEventListener listener);
+
+ /**
+ * Returns all event listeners.
+ *
+ * @return listeners The listeners.
+ */
+ public Collection<WorkingMemoryEventListener> getWorkingMemoryEventListeners();
+
+ /**
+ * Add an event listener.
+ *
+ * @param listener
+ * The listener to add.
+ */
+ public void addEventListener(AgendaEventListener listener);
+
+ /**
+ * Remove an event listener.
+ *
+ * @param listener
+ * The listener to remove.
+ */
+ public void removeEventListener(AgendaEventListener listener);
+
+ /**
+ * Returns all event listeners.
+ *
+ * @return listeners The listeners.
+ */
+ public Collection<AgendaEventListener> getAgendaEventListeners();
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/event/rule/WorkingMemoryEventManager.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/ClassObjectFilter.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ClassObjectFilter.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/ClassObjectFilter.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/ClassObjectFilter.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,29 @@
+package org.drools.runtime;
+
+
+/**
+ * Filters Objects by Class, only accepting Classes of the specified type
+ * @author mproctor
+ *
+ */
+public class ClassObjectFilter implements ObjectFilter {
+ private Class clazz;
+
+ /**
+ * The Allowed Class type
+ * @param clazz
+ */
+ public ClassObjectFilter(Class clazz) {
+ this.clazz = clazz;
+ }
+
+ /**
+ * Returning true means the Iterator accepts, and thus returns, the current Object's Class type.
+ * @param object
+ * @return
+ */
+ public boolean accept(Object object) {
+ return this.clazz.isAssignableFrom( object.getClass() );
+ }
+
+}
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/ObjectFilter.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ObjectFilter.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/ObjectFilter.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/ObjectFilter.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,16 @@
+package org.drools.runtime;
+
+/**
+ * ObjectFilter is used with WorkingMemories to filter out instances during Iteration
+ * @author mproctor
+ *
+ */
+public interface ObjectFilter {
+
+ /**
+ * Returning true means the Iterator accepts, and thus returns, the current Object.
+ * @param object
+ * @return
+ */
+ boolean accept(Object object);
+}
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatefulKnowledgeSession.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulKnowledgeSession.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatefulKnowledgeSession.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatefulKnowledgeSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,16 @@
+package org.drools.runtime;
+
+import org.drools.KnowledgeBase;
+import org.drools.runtime.process.StatefulProcessSession;
+import org.drools.runtime.rule.StatefulRuleSession;
+
+public interface StatefulKnowledgeSession extends StatefulRuleSession, StatefulProcessSession {
+
+ void setGlobal(String identifier,
+ Object object);
+
+ KnowledgeBase getKnowledgeBase();
+
+ void setFocus(String string);
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatefulKnowledgeSession.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatelessKnowledgeSession.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessKnowledgeSession.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatelessKnowledgeSession.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatelessKnowledgeSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,8 @@
+package org.drools.runtime;
+
+import org.drools.runtime.process.StatelessProcessSession;
+import org.drools.runtime.rule.StatelessRuleSession;
+
+public interface StatelessKnowledgeSession extends StatelessRuleSession, StatelessProcessSession {
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/StatelessKnowledgeSession.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/ProcessRuntime.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/ProcessRuntime.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/ProcessRuntime.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/ProcessRuntime.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,5 @@
+package org.drools.runtime.process;
+
+public interface ProcessRuntime {
+
+}
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatefulProcessSession.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulProcessSession.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatefulProcessSession.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatefulProcessSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,21 @@
+package org.drools.runtime.process;
+
+import java.util.Collection;
+import java.util.Map;
+
+import org.drools.process.instance.ProcessInstance;
+import org.drools.process.instance.WorkItemManager;
+
+public interface StatefulProcessSession extends ProcessRuntime {
+
+ ProcessInstance startProcess(String processId);
+
+ ProcessInstance startProcess(String processId, Map<String, Object> parameters);
+
+ Collection<ProcessInstance> getProcessInstances();
+
+ ProcessInstance getProcessInstance(long id);
+
+ WorkItemManager getWorkItemManager();
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatefulProcessSession.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatelessProcessSession.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessProcessSession.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatelessProcessSession.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatelessProcessSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,5 @@
+package org.drools.runtime.process;
+
+public interface StatelessProcessSession {
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/process/StatelessProcessSession.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: 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 (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/Activation.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,28 @@
+package org.drools.runtime.rule;
+
+import java.util.Collection;
+
+import org.drools.knowledge.definitions.rule.Rule;
+
+public interface Activation {
+ /**
+ *
+ * @return
+ * The Rule that was activated.
+ */
+ Rule getRule();
+
+ /**
+ *
+ * @return
+ * The PropagationContext that created this Activation
+ */
+ PropagationContext getPropagationContext();
+
+ /**
+ *
+ * @return
+ * The matched FactHandles for this activation
+ */
+ Collection<FactHandle> getFactHandles();
+}
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/Agenda.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/Agenda.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/Agenda.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,5 @@
+package org.drools.runtime.rule;
+
+public interface Agenda {
+
+}
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/AgendaGroup.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/AgendaGroup.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/AgendaGroup.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,10 @@
+package org.drools.runtime.rule;
+
+
+public interface AgendaGroup {
+ /**
+ * @return
+ * The AgendaGroup name
+ */
+ public String getName();
+}
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/FactHandle.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/FactHandle.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/FactHandle.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/FactHandle.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,5 @@
+package org.drools.runtime.rule;
+
+public interface FactHandle {
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/FactHandle.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/PropagationContext.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,19 @@
+package org.drools.runtime.rule;
+
+import org.drools.knowledge.definitions.rule.Rule;
+
+public interface PropagationContext {
+ public static final int ASSERTION = 0;
+ public static final int RETRACTION = 1;
+ public static final int MODIFICATION = 2;
+ public static final int RULE_ADDITION = 3;
+ public static final int RULE_REMOVAL = 4;
+
+ public long getPropagationNumber();
+
+ public Rule getRule();
+
+ public FactHandle getFactHandle();
+
+ public int getType();
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/PropagationContext.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/StatefulRuleSession.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatefulRuleSession.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/StatefulRuleSession.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/StatefulRuleSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,18 @@
+package org.drools.runtime.rule;
+
+import java.util.concurrent.Future;
+
+
+public interface StatefulRuleSession extends WorkingMemory {
+
+ Future<Object> asyncInsert( Object object );
+
+ Future<Object> asyncInsert( Object[] array );
+
+ Future<Object> asyncInsert( Iterable<?> iterable );
+
+ void fireAllRules();
+
+ Future<?> asyncFireAllRules();
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/StatefulRuleSession.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/StatelessRuleSession.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/StatelessRuleSession.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/StatelessRuleSession.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/StatelessRuleSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,5 @@
+package org.drools.runtime.rule;
+
+public interface StatelessRuleSession {
+
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/StatelessRuleSession.java
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemory.java (from rev 23250, labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/RuleRuntime.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemory.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-api/src/main/java/org/drools/runtime/rule/WorkingMemory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,34 @@
+package org.drools.runtime.rule;
+
+import java.util.Collection;
+
+import org.drools.event.rule.WorkingMemoryEventManager;
+import org.drools.runtime.ObjectFilter;
+import org.drools.time.SessionClock;
+
+public interface WorkingMemory extends WorkingMemoryEventManager {
+ FactHandle insert(Object object);
+
+ void retract(FactHandle factHandle);
+
+ void update(FactHandle factHandle);
+
+ void update(FactHandle factHandle, Object object);
+
+ void halt();
+ /**
+ * Returns the session clock instance associated with this session
+ * @return
+ */
+ public SessionClock getSessionClock();
+
+ FactHandle getFactHandle(Object object);
+
+ Collection<?> getObjects();
+
+ Collection<?> getObjects(ObjectFilter filter);
+
+ Collection<? extends FactHandle> getFactHandles();
+
+ Collection<? extends FactHandle> getFactHandles(ObjectFilter filter);
+}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/RuleCoverageListener.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/RuleCoverageListener.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/RuleCoverageListener.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,7 +3,6 @@
import java.util.HashSet;
import java.util.Set;
-import org.drools.WorkingMemory;
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
import org.drools.event.AfterActivationFiredEvent;
@@ -11,6 +10,7 @@
import org.drools.event.AgendaGroupPoppedEvent;
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
+import org.drools.WorkingMemory;
/**
* Measure the rule coverage.
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,7 +9,6 @@
import java.util.Iterator;
import java.util.Map;
-import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.base.ClassTypeResolver;
import org.drools.base.TypeResolver;
@@ -28,6 +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;
/**
* This actually runs the test scenarios.
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/main/java/org/drools/testframework/TestingEventListener.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,7 +9,6 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.drools.WorkingMemory;
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
import org.drools.event.AfterActivationFiredEvent;
@@ -18,6 +17,7 @@
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
import org.drools.rule.Rule;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
import org.drools.spi.Consequence;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -20,20 +20,19 @@
import java.io.InputStreamReader;
import java.io.StringReader;
import java.lang.reflect.Field;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.drools.Cheese;
import org.drools.DroolsTestCase;
-import org.drools.FactHandle;
import org.drools.Primitives;
import org.drools.QueryResults;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.StockTick;
-import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.common.ActivationGroupNode;
@@ -88,6 +87,8 @@
import org.drools.rule.TypeDeclaration;
import org.drools.rule.builder.dialect.java.JavaDialect;
import org.drools.rule.builder.dialect.java.JavaDialectConfiguration;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.CompiledInvoker;
@@ -1571,6 +1572,11 @@
// TODO Auto-generated method stub
}
+
+ public Collection<FactHandle> getFactHandles() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
class MockTuple
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/AccumulateTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -11,20 +11,20 @@
import org.drools.Cheese;
import org.drools.Cheesery;
-import org.drools.FactHandle;
import org.drools.OuterClass;
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.RuntimeDroolsException;
-import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
public class AccumulateTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/DslTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -13,9 +13,9 @@
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
public class DslTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/DynamicRulesTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -13,7 +13,6 @@
import org.drools.Cheese;
import org.drools.FactA;
import org.drools.FactB;
-import org.drools.FactHandle;
import org.drools.Order;
import org.drools.OrderItem;
import org.drools.Person;
@@ -23,11 +22,12 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.rule.Package;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
public class DynamicRulesTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -6,7 +6,6 @@
import org.drools.Alarm;
import org.drools.Cell;
import org.drools.Cheese;
-import org.drools.FactHandle;
import org.drools.Message;
import org.drools.Neighbor;
import org.drools.Person;
@@ -15,7 +14,6 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.common.DefaultAgenda;
import org.drools.common.InternalWorkingMemoryActions;
@@ -32,6 +30,8 @@
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.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ActivationGroup;
import org.drools.spi.AgendaGroup;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -4,7 +4,6 @@
import junit.framework.TestCase;
import org.drools.Cheese;
import org.drools.Cheesery;
-import org.drools.FactHandle;
import org.drools.Order;
import org.drools.OrderItem;
import org.drools.Person;
@@ -15,13 +14,14 @@
import org.drools.SpecialString;
import org.drools.State;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.util.DroolsStreamUtils;
import java.io.ByteArrayInputStream;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -6,12 +6,12 @@
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import org.drools.util.DateUtils;
import org.mvel.MVEL;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -29,7 +29,6 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.common.BaseNode;
import org.drools.common.InternalFactHandle;
@@ -44,6 +43,7 @@
import org.drools.rule.MapBackedClassLoader;
import org.drools.rule.Package;
import org.drools.rule.Rule;
+import org.drools.WorkingMemory;
import org.drools.spi.GlobalResolver;
import org.drools.util.DroolsStreamUtils;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -42,12 +42,10 @@
import org.drools.CheeseEqual;
import org.drools.Cheesery;
import org.drools.Child;
-import org.drools.ClassObjectFilter;
import org.drools.DomainObjectHolder;
import org.drools.FactA;
import org.drools.FactB;
import org.drools.FactC;
-import org.drools.FactHandle;
import org.drools.FirstClass;
import org.drools.FromTestClass;
import org.drools.Guess;
@@ -78,7 +76,6 @@
import org.drools.StatefulSession;
import org.drools.StatelessSession;
import org.drools.TestParam;
-import org.drools.WorkingMemory;
import org.drools.Cheesery.Maturity;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.audit.WorkingMemoryInMemoryLogger;
@@ -115,6 +112,9 @@
import org.drools.rule.InvalidRulePackage;
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.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ConsequenceExceptionHandler;
import org.drools.spi.GlobalResolver;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -23,9 +23,9 @@
import org.drools.RuleBaseFactory;
import org.drools.SessionConfiguration;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import java.io.InputStreamReader;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessActionTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,10 +9,8 @@
import junit.framework.TestCase;
import org.drools.Message;
-import org.drools.ObjectFilter;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.compiler.DroolsError;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderErrors;
@@ -21,6 +19,8 @@
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
import org.drools.rule.Package;
+import org.drools.runtime.ObjectFilter;
+import org.drools.WorkingMemory;
public class ProcessActionTest extends TestCase {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessExceptionHandlerTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,12 +9,12 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.compiler.DroolsError;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderErrors;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
public class ProcessExceptionHandlerTest extends TestCase {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessHumanTaskTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,13 +9,13 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
public class ProcessHumanTaskTest extends TestCase {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/ProcessWorkItemTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -10,7 +10,6 @@
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
-import org.drools.StatefulKnowledgeSession;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.knowledge.definitions.KnowledgePackage;
@@ -21,6 +20,7 @@
import org.drools.process.instance.WorkItemHandler;
import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.context.variable.VariableScopeInstance;
+import org.drools.runtime.StatefulKnowledgeSession;
public class ProcessWorkItemTest extends TestCase {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StatefulSessionTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -10,14 +10,14 @@
import junit.framework.TestCase;
import org.drools.Cheese;
-import org.drools.FactHandle;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseFactory;
import org.drools.RuleBaseConfiguration;
-import org.drools.StatefulKnowledgeSession;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.knowledge.definitions.KnowledgePackage;
+import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.rule.FactHandle;
public class StatefulSessionTest extends TestCase {
final List list = new ArrayList();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/StreamsTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -27,13 +27,13 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StockTick;
-import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import java.io.IOException;
import java.io.InputStreamReader;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/SubProcessTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -10,13 +10,13 @@
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.process.core.context.variable.VariableScope;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
public class SubProcessTest extends TestCase {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,8 +3,6 @@
import junit.framework.TestCase;
import org.drools.Cheese;
import org.drools.CheeseEqual;
-import org.drools.ClassObjectFilter;
-import org.drools.FactHandle;
import org.drools.KnowledgeBase;
import org.drools.KnowledgeBaseConfiguration;
import org.drools.KnowledgeBaseFactory;
@@ -13,8 +11,6 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.Sensor;
-import org.drools.StatefulKnowledgeSession;
-import org.drools.WorkingMemory;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.common.InternalWorkingMemory;
@@ -27,6 +23,10 @@
import org.drools.event.WorkingMemoryEventListener;
import org.drools.knowledge.definitions.KnowledgePackage;
import org.drools.rule.Package;
+import org.drools.runtime.ClassObjectFilter;
+import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.util.ObjectHashMap;
import java.io.InputStreamReader;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGenerator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGenerator.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGenerator.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -15,7 +15,7 @@
import java.util.Map;
import java.util.Random;
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import org.drools.WorkingMemory;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -4,7 +4,6 @@
import junit.framework.TestCase;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
@@ -12,6 +11,7 @@
import org.drools.integrationtests.eventgenerator.Event.EventType;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import java.io.IOException;
import java.io.InputStreamReader;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/example/ExampleScenario.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/example/ExampleScenario.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/example/ExampleScenario.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,13 +16,13 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.integrationtests.eventgenerator.PseudoSessionClock;
import org.drools.integrationtests.eventgenerator.SimpleEventGenerator;
import org.drools.integrationtests.eventgenerator.SimpleEventListener;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
public class ExampleScenario {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -29,13 +29,13 @@
import org.drools.RuleBase;
import org.drools.RuleIntegrationException;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.InvalidPatternException;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
/**
* This is a sample file to launch a rule package from a rule source file.
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,7 +8,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.compiler.DialectCompiletimeRegistry;
import org.drools.compiler.PackageBuilder;
@@ -18,6 +17,7 @@
import org.drools.lang.descr.ProcessDescr;
import org.drools.rule.Package;
import org.drools.rule.builder.ProcessBuildContext;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.workflow.core.DroolsAction;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,7 +8,6 @@
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.mvel.MVELCompileable;
import org.drools.common.InternalFactHandle;
import org.drools.compiler.DialectCompiletimeRegistry;
@@ -24,6 +23,7 @@
import org.drools.rule.Accumulate;
import org.drools.rule.Package;
import org.drools.rule.builder.RuleBuildContext;
+import org.drools.WorkingMemory;
public class MVELAccumulateBuilderTest extends TestCase {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,7 +8,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.mvel.MVELAction;
import org.drools.compiler.DialectCompiletimeRegistry;
@@ -17,6 +16,7 @@
import org.drools.lang.descr.ActionDescr;
import org.drools.rule.Package;
import org.drools.rule.builder.PackageBuildContext;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.workflow.core.DroolsAction;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -12,7 +12,6 @@
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.mvel.MVELConsequence;
@@ -38,6 +37,7 @@
import org.drools.rule.Rule;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.RuleBuilder;
+import org.drools.WorkingMemory;
import org.drools.spi.ObjectType;
import org.drools.spi.PatternExtractor;
import org.mvel.ParserContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELDecisionBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,7 +8,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.mvel.MVELAction;
import org.drools.compiler.PackageBuilder;
@@ -17,6 +16,7 @@
import org.drools.lang.descr.ActionDescr;
import org.drools.rule.Package;
import org.drools.rule.builder.PackageBuildContext;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.workflow.core.DroolsAction;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,7 +8,6 @@
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassObjectType;
@@ -25,6 +24,7 @@
import org.drools.rule.EvalCondition;
import org.drools.rule.Package;
import org.drools.rule.Pattern;
+import org.drools.WorkingMemory;
import org.drools.spi.InternalReadAccessor;
public class MVELEvalBuilderTest extends TestCase {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,7 +8,6 @@
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.base.mvel.MVELSalienceExpression;
import org.drools.common.InternalFactHandle;
@@ -21,6 +20,7 @@
import org.drools.rule.Package;
import org.drools.rule.Pattern;
import org.drools.rule.builder.SalienceBuilder;
+import org.drools.WorkingMemory;
import org.drools.spi.ObjectType;
import org.drools.spi.PatternExtractor;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,6 +1,6 @@
package org.drools.testframework;
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import java.io.IOException;
import java.io.ObjectInput;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/MockWorkingMemory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -14,8 +14,6 @@
import org.drools.Agenda;
import org.drools.WorkingMemoryEntryPoint;
import org.drools.FactException;
-import org.drools.FactHandle;
-import org.drools.ObjectFilter;
import org.drools.QueryResults;
import org.drools.RuleBase;
import org.drools.common.*;
@@ -39,6 +37,8 @@
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
import org.drools.rule.TimeMachine;
+import org.drools.runtime.ObjectFilter;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AgendaGroup;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,5 +1,6 @@
package org.drools.testframework;
+import java.util.Collection;
import java.util.HashSet;
import org.drools.common.ActivationGroupNode;
@@ -8,6 +9,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.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
@@ -18,112 +20,128 @@
public class RuleCoverageListenerTest extends TestCase {
- public void testCoverage() throws Exception {
- HashSet<String> rules = new HashSet<String>();
- rules.add("rule1");
- rules.add("rule2");
- rules.add("rule3");
+ public void testCoverage() throws Exception {
+ HashSet<String> rules = new HashSet<String>();
+ rules.add( "rule1" );
+ rules.add( "rule2" );
+ rules.add( "rule3" );
- RuleCoverageListener ls = new RuleCoverageListener(rules);
- assertEquals(3, ls.rules.size());
- assertEquals(0, ls.getPercentCovered());
+ RuleCoverageListener ls = new RuleCoverageListener( rules );
+ assertEquals( 3,
+ ls.rules.size() );
+ assertEquals( 0,
+ ls.getPercentCovered() );
- ls.afterActivationFired(new AfterActivationFiredEvent(new MockActivation("rule1")), null);
- assertEquals(2, ls.rules.size());
- assertTrue(ls.rules.contains("rule2"));
- assertTrue(ls.rules.contains("rule3"));
- assertFalse(ls.rules.contains("rule1"));
- assertEquals(33, ls.getPercentCovered());
+ ls.afterActivationFired( new AfterActivationFiredEvent( new MockActivation( "rule1" ) ),
+ null );
+ assertEquals( 2,
+ ls.rules.size() );
+ assertTrue( ls.rules.contains( "rule2" ) );
+ assertTrue( ls.rules.contains( "rule3" ) );
+ assertFalse( ls.rules.contains( "rule1" ) );
+ assertEquals( 33,
+ ls.getPercentCovered() );
- ls.afterActivationFired(new AfterActivationFiredEvent(new MockActivation("rule2")), null);
- assertEquals(1, ls.rules.size());
- assertFalse(ls.rules.contains("rule2"));
- assertFalse(ls.rules.contains("rule1"));
- assertTrue(ls.rules.contains("rule3"));
+ ls.afterActivationFired( new AfterActivationFiredEvent( new MockActivation( "rule2" ) ),
+ null );
+ assertEquals( 1,
+ ls.rules.size() );
+ assertFalse( ls.rules.contains( "rule2" ) );
+ assertFalse( ls.rules.contains( "rule1" ) );
+ assertTrue( ls.rules.contains( "rule3" ) );
- assertEquals(66, ls.getPercentCovered());
+ assertEquals( 66,
+ ls.getPercentCovered() );
+ ls.afterActivationFired( new AfterActivationFiredEvent( new MockActivation( "rule3" ) ),
+ null );
+ assertEquals( 0,
+ ls.rules.size() );
+ assertFalse( ls.rules.contains( "rule2" ) );
+ assertFalse( ls.rules.contains( "rule1" ) );
+ assertFalse( ls.rules.contains( "rule3" ) );
- ls.afterActivationFired(new AfterActivationFiredEvent(new MockActivation("rule3")), null);
- assertEquals(0, ls.rules.size());
- assertFalse(ls.rules.contains("rule2"));
- assertFalse(ls.rules.contains("rule1"));
- assertFalse(ls.rules.contains("rule3"));
+ assertEquals( 100,
+ ls.getPercentCovered() );
- assertEquals(100, ls.getPercentCovered());
+ }
+}
- }
+class MockActivation
+ implements
+ Activation {
+ private String ruleName;
-}
+ public MockActivation(String ruleName) {
+ this.ruleName = ruleName;
+ }
-class MockActivation implements Activation {
- private String ruleName;
+ public void addLogicalDependency(LogicalDependency node) {
+ }
- public MockActivation(String ruleName) {
- this.ruleName = ruleName;
- }
+ public ActivationGroupNode getActivationGroupNode() {
+ return null;
+ }
- public void addLogicalDependency(LogicalDependency node) {
- }
+ public long getActivationNumber() {
+ return 0;
+ }
- public ActivationGroupNode getActivationGroupNode() {
- return null;
- }
+ public AgendaGroup getAgendaGroup() {
+ return null;
+ }
- public long getActivationNumber() {
- return 0;
- }
+ public LinkedList getLogicalDependencies() {
+ return null;
+ }
- public AgendaGroup getAgendaGroup() {
- return null;
- }
+ public PropagationContext getPropagationContext() {
+ return null;
+ }
- public LinkedList getLogicalDependencies() {
- return null;
- }
+ public Rule getRule() {
+ return new Rule( ruleName );
+ }
- public PropagationContext getPropagationContext() {
- return null;
- }
+ public RuleFlowGroupNode getRuleFlowGroupNode() {
+ return null;
+ }
- public Rule getRule() {
- return new Rule(ruleName);
- }
+ public int getSalience() {
+ return 0;
+ }
- public RuleFlowGroupNode getRuleFlowGroupNode() {
- return null;
- }
+ public GroupElement getSubRule() {
+ return null;
+ }
- public int getSalience() {
- return 0;
- }
+ public Tuple getTuple() {
+ return null;
+ }
- public GroupElement getSubRule() {
- return null;
- }
+ public boolean isActivated() {
+ return false;
+ }
- public Tuple getTuple() {
- return null;
- }
+ public void remove() {
+ }
- public boolean isActivated() {
- return false;
- }
+ public void setActivated(boolean activated) {
+ }
- public void remove() {
- }
+ public void setActivationGroupNode(ActivationGroupNode activationGroupNode) {
+ }
- public void setActivated(boolean activated) {
- }
+ public void setLogicalDependencies(LinkedList justified) {
+ }
- public void setActivationGroupNode(ActivationGroupNode activationGroupNode) {
- }
+ public void setRuleFlowGroupNode(RuleFlowGroupNode ruleFlowGroupNode) {
+ }
- public void setLogicalDependencies(LinkedList justified) {
- }
+ public Collection<FactHandle> getFactHandles() {
+ // TODO Auto-generated method stub
+ return null;
+ }
- public void setRuleFlowGroupNode(RuleFlowGroupNode ruleFlowGroupNode) {
- }
-
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -11,7 +11,6 @@
import org.drools.Cheese;
import org.drools.OuterFact;
import org.drools.Person;
-import org.drools.WorkingMemory;
import org.drools.base.ClassTypeResolver;
import org.drools.base.TypeResolver;
import org.drools.base.mvel.DroolsMVELFactory;
@@ -28,6 +27,7 @@
import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
import org.drools.guvnor.server.util.ScenarioXMLPersistence;
import org.drools.rule.TimeMachine;
+import org.drools.WorkingMemory;
public class ScenarioRunnerTest extends RuleUnit {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/Agenda.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/Agenda.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/Agenda.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -15,6 +15,7 @@
* limitations under the License.
*/
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ActivationGroup;
import org.drools.spi.AgendaGroup;
@@ -24,7 +25,7 @@
* Agenda interface for the WorkingMemory
*
*/
-public interface Agenda {
+public interface Agenda extends org.drools.runtime.rule.Agenda {
/**
* Returns the WorkignMemory for this Agenda
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/FactHandle.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/FactHandle.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/FactHandle.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,7 @@
+package org.drools;
+
+public interface FactHandle
+ extends
+ org.drools.runtime.rule.FactHandle {
+
+}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/QueryResult.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/QueryResult.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/QueryResult.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -21,6 +21,8 @@
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.rule.Declaration;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Tuple;
public class QueryResult {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/QueryResults.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/QueryResults.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/QueryResults.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -23,6 +23,7 @@
import org.drools.rule.Declaration;
import org.drools.rule.Query;
+import org.drools.WorkingMemory;
import org.drools.spi.Tuple;
/**
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/RuleBase.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/RuleBase.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/RuleBase.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -24,6 +24,7 @@
import org.drools.marshalling.Marshaller;
import org.drools.rule.FactType;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
/**
* Active collection of <code>Rule</code>s.
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/StatefulSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/StatefulSession.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/StatefulSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -4,6 +4,8 @@
import java.util.List;
import org.drools.concurrent.Future;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.AgendaFilter;
/**
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/StatelessSessionResult.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/StatelessSessionResult.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/StatelessSessionResult.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -2,6 +2,7 @@
import java.util.Iterator;
+import org.drools.runtime.ObjectFilter;
import org.drools.spi.GlobalResolver;
/**
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/WorkingMemory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/WorkingMemory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/WorkingMemory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -23,6 +23,8 @@
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.WorkItemManager;
import org.drools.process.instance.timer.TimerManager;
+import org.drools.runtime.ObjectFilter;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AsyncExceptionHandler;
import org.drools.spi.GlobalResolver;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -19,6 +19,8 @@
import java.io.Serializable;
+import org.drools.runtime.rule.FactHandle;
+
/**
* An interface for instances that allow handling of entry-point-scoped
* facts
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/ThreadedWorkingMemoryFileLogger.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/ThreadedWorkingMemoryFileLogger.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/ThreadedWorkingMemoryFileLogger.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,8 +1,8 @@
package org.drools.audit;
-import org.drools.WorkingMemory;
import org.drools.WorkingMemoryEventManager;
import org.drools.audit.event.LogEvent;
+import org.drools.WorkingMemory;
public class ThreadedWorkingMemoryFileLogger extends WorkingMemoryFileLogger {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,8 +1,8 @@
package org.drools.audit;
-import org.drools.WorkingMemory;
import org.drools.WorkingMemoryEventManager;
import org.drools.audit.event.LogEvent;
+import org.drools.WorkingMemory;
import java.io.ObjectOutput;
import java.io.IOException;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -17,9 +17,9 @@
*/
import com.thoughtworks.xstream.XStream;
-import org.drools.WorkingMemory;
import org.drools.WorkingMemoryEventManager;
import org.drools.audit.event.LogEvent;
+import org.drools.WorkingMemory;
import java.io.IOException;
import java.io.ObjectInput;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/audit/WorkingMemoryLogger.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -24,8 +24,6 @@
import java.util.List;
import java.util.Map;
-import org.drools.FactHandle;
-import org.drools.WorkingMemory;
import org.drools.WorkingMemoryEventManager;
import org.drools.audit.event.ActivationLogEvent;
import org.drools.audit.event.ILogEventFilter;
@@ -70,6 +68,8 @@
import org.drools.event.RuleFlowStartedEvent;
import org.drools.event.WorkingMemoryEventListener;
import org.drools.rule.Declaration;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/CopyIdentifiersGlobalExporter.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/CopyIdentifiersGlobalExporter.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/CopyIdentifiersGlobalExporter.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,8 +9,8 @@
import java.io.IOException;
import java.io.ObjectOutput;
+import org.drools.common.InternalRuleBase;
import org.drools.WorkingMemory;
-import org.drools.common.InternalRuleBase;
import org.drools.spi.GlobalExporter;
import org.drools.spi.GlobalResolver;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -17,12 +17,12 @@
*/
import org.drools.FactException;
-import org.drools.FactHandle;
-import org.drools.WorkingMemory;
import org.drools.common.InternalWorkingMemoryActions;
import org.drools.rule.Declaration;
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/DelegateJavaFactHandler.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/DelegateJavaFactHandler.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/DelegateJavaFactHandler.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,6 +1,6 @@
package org.drools.base;
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.JavaFact;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/JavaFactRegistryEntry.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/JavaFactRegistryEntry.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/JavaFactRegistryEntry.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,7 +3,7 @@
*/
package org.drools.base;
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import org.drools.WorkingMemory;
public class JavaFactRegistryEntry {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -19,13 +19,13 @@
import java.util.List;
import org.drools.FactException;
-import org.drools.FactHandle;
import org.drools.QueryResults;
-import org.drools.WorkingMemory;
import org.drools.common.InternalWorkingMemoryActions;
import org.drools.rule.Declaration;
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/accumulators/JavaAccumulatorFunctionExecutor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/accumulators/JavaAccumulatorFunctionExecutor.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/accumulators/JavaAccumulatorFunctionExecutor.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -25,9 +25,9 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.rule.Declaration;
+import org.drools.WorkingMemory;
import org.drools.spi.Accumulator;
import org.drools.spi.CompiledInvoker;
import org.drools.spi.ReturnValueExpression;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -25,12 +25,12 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.WorkingMemory;
import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELCompilationUnit;
import org.drools.base.mvel.MVELCompileable;
import org.drools.common.InternalFactHandle;
import org.drools.rule.Declaration;
+import org.drools.WorkingMemory;
import org.drools.spi.Accumulator;
import org.drools.spi.Tuple;
import org.mvel.MVEL;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,11 +9,11 @@
import java.util.Collections;
import java.util.Iterator;
-import org.drools.WorkingMemory;
import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELCompileable;
import org.drools.base.mvel.MVELCompilationUnit;
import org.drools.rule.Declaration;
+import org.drools.WorkingMemory;
import org.drools.spi.DataProvider;
import org.drools.spi.PropagationContext;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -12,9 +12,9 @@
import java.util.List;
import java.util.Map;
-import org.drools.WorkingMemory;
import org.drools.reteoo.LeftTuple;
import org.drools.rule.Declaration;
+import org.drools.WorkingMemory;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.Tuple;
import org.mvel.DataConversion;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -12,9 +12,9 @@
import java.util.List;
import java.util.Map;
-import org.drools.WorkingMemory;
import org.drools.reteoo.LeftTuple;
import org.drools.rule.Declaration;
+import org.drools.WorkingMemory;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.Tuple;
import org.mvel.DataConversion;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -25,11 +25,11 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.rule.Declaration;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import org.drools.spi.Accumulator;
import org.drools.spi.Tuple;
import org.mvel.MVEL;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -7,9 +7,9 @@
import java.io.Serializable;
import java.util.List;
-import org.drools.WorkingMemory;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,9 +1,9 @@
package org.drools.base.mvel;
-import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
import org.mvel.MVEL;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -6,10 +6,10 @@
import java.io.IOException;
import java.io.ObjectInput;
-import org.drools.WorkingMemory;
import org.drools.rule.Declaration;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import org.drools.spi.EvalExpression;
import org.drools.spi.Tuple;
import org.mvel.MVEL;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,9 +1,9 @@
package org.drools.base.mvel;
-import org.drools.WorkingMemory;
import org.drools.rule.Declaration;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import org.drools.spi.PredicateExpression;
import org.drools.spi.Tuple;
import org.mvel.MVEL;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -7,9 +7,9 @@
import java.io.Serializable;
import java.util.List;
-import org.drools.WorkingMemory;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import org.drools.spi.ProcessContext;
import org.drools.spi.ReturnValueEvaluator;
import org.mvel.MVEL;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,9 +1,9 @@
package org.drools.base.mvel;
-import org.drools.WorkingMemory;
import org.drools.rule.Declaration;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import org.drools.spi.FieldValue;
import org.drools.spi.ReturnValueExpression;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -6,9 +6,9 @@
import java.io.ObjectOutput;
import java.io.ObjectInput;
-import org.drools.WorkingMemory;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Package;
+import org.drools.WorkingMemory;
import org.drools.spi.Salience;
import org.drools.spi.Tuple;
import org.mvel.MVEL;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractFactHandleFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractFactHandleFactory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractFactHandleFactory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -23,10 +23,10 @@
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-import org.drools.WorkingMemory;
import org.drools.marshalling.MarshallerReaderContext;
import org.drools.marshalling.MarshallerWriteContext;
import org.drools.reteoo.ObjectTypeConf;
+import org.drools.WorkingMemory;
import org.drools.spi.FactHandleFactory;
public abstract class AbstractFactHandleFactory
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AbstractWorkingMemory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -38,14 +38,11 @@
import org.drools.Agenda;
import org.drools.FactException;
-import org.drools.FactHandle;
-import org.drools.ObjectFilter;
import org.drools.QueryResults;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuntimeDroolsException;
import org.drools.SessionConfiguration;
-import org.drools.WorkingMemory;
import org.drools.WorkingMemoryEntryPoint;
import org.drools.RuleBaseConfiguration.AssertBehaviour;
import org.drools.RuleBaseConfiguration.LogicalOverride;
@@ -81,6 +78,9 @@
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
import org.drools.rule.TimeMachine;
+import org.drools.runtime.ObjectFilter;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.AgendaFilter;
import org.drools.spi.AsyncExceptionHandler;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AgendaItem.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AgendaItem.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/AgendaItem.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -20,9 +20,14 @@
import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
@@ -299,4 +304,13 @@
public GroupElement getSubRule() {
return this.subrule;
}
+
+ public Collection<FactHandle> getFactHandles() {
+ FactHandle[] factHandles = this.tuple.getFactHandles();
+ List<FactHandle> list = new ArrayList<FactHandle>( factHandles.length );
+ for ( FactHandle factHandle : factHandles ) {
+ list.add( factHandle );
+ }
+ return Collections.unmodifiableCollection( list );
+ }
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/BinaryHeapQueueAgendaGroup.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/BinaryHeapQueueAgendaGroup.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/BinaryHeapQueueAgendaGroup.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -28,6 +28,7 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.util.Collection;
/**
* <code>AgendaGroup</code> implementation that uses a <code>PriorityQueue</code> to prioritise the evaluation of added
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/DefaultAgenda.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/DefaultAgenda.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/DefaultAgenda.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -29,11 +29,11 @@
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.SequentialKnowledgeHelper;
import org.drools.common.RuleFlowGroupImpl.DeactivateCallback;
import org.drools.reteoo.LeftTuple;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ActivationGroup;
import org.drools.spi.AgendaFilter;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.RightTuple;
+import org.drools.runtime.rule.FactHandle;
import java.io.ObjectOutput;
import java.io.IOException;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
import org.drools.base.ShadowProxy;
+import org.drools.runtime.rule.FactHandle;
import org.drools.util.AbstractHashTable.ObjectComparator;
import java.io.IOException;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/EventFactHandle.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/EventFactHandle.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/EventFactHandle.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,6 +1,6 @@
package org.drools.common;
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
public class EventFactHandle extends DefaultFactHandle {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,8 +16,8 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
import org.drools.base.ShadowProxy;
+import org.drools.runtime.rule.FactHandle;
import org.drools.util.AbstractHashTable.ObjectComparator;
import java.io.IOException;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalFactHandle.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalFactHandle.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalFactHandle.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.RightTuple;
+import org.drools.FactHandle;
public interface InternalFactHandle
extends
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalRuleBase.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalRuleBase.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -21,7 +21,6 @@
import java.util.List;
import org.drools.FactException;
-import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.StatefulSession;
@@ -32,6 +31,7 @@
import org.drools.rule.MapBackedClassLoader;
import org.drools.rule.Package;
import org.drools.rule.TypeDeclaration;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,8 +3,6 @@
import java.util.concurrent.locks.Lock;
import org.drools.FactException;
-import org.drools.FactHandle;
-import org.drools.WorkingMemory;
import org.drools.concurrent.ExecutorService;
import org.drools.event.AgendaEventSupport;
import org.drools.event.RuleFlowEventSupport;
@@ -16,6 +14,8 @@
import org.drools.reteoo.PartitionTaskManager;
import org.drools.rule.Rule;
import org.drools.rule.TimeMachine;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemoryActions.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemoryActions.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/InternalWorkingMemoryActions.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -17,8 +17,8 @@
*/
import org.drools.FactException;
-import org.drools.FactHandle;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.Activation;
public interface InternalWorkingMemoryActions
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/LogicalDependency.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/LogicalDependency.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/LogicalDependency.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.Activation;
import org.drools.util.AbstractBaseLinkedListNode;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -10,9 +10,7 @@
import org.drools.WorkingMemoryEntryPoint;
import org.drools.FactException;
-import org.drools.FactHandle;
import org.drools.RuntimeDroolsException;
-import org.drools.WorkingMemory;
import org.drools.RuleBaseConfiguration.AssertBehaviour;
import org.drools.base.ShadowProxy;
import org.drools.event.WorkingMemoryEventSupport;
@@ -21,6 +19,8 @@
import org.drools.reteoo.ObjectTypeConf;
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/ObjectStore.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/ObjectStore.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/ObjectStore.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -2,7 +2,7 @@
import java.util.Iterator;
-import org.drools.ObjectFilter;
+import org.drools.runtime.ObjectFilter;
public interface ObjectStore {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
import org.drools.reteoo.LeftTuple;
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.Activation;
import org.drools.spi.PropagationContext;
import org.drools.util.ObjectHashMap;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -10,10 +10,10 @@
import java.util.Iterator;
import java.util.concurrent.locks.Lock;
-import org.drools.ObjectFilter;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseConfiguration.AssertBehaviour;
import org.drools.base.ShadowProxy;
+import org.drools.runtime.ObjectFilter;
import org.drools.util.JavaIteratorAdapter;
import org.drools.util.ObjectHashMap;
import org.drools.util.AbstractHashTable.HashTableIterator;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/RetractObject.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/RetractObject.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/RetractObject.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,7 +3,7 @@
*/
package org.drools.concurrent;
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import org.drools.WorkingMemory;
import java.io.IOException;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/UpdateObject.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/UpdateObject.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/concurrent/UpdateObject.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,7 +3,7 @@
*/
package org.drools.concurrent;
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import org.drools.WorkingMemory;
import java.io.ObjectOutput;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/AgendaEventSupport.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/AgendaEventSupport.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/AgendaEventSupport.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -24,8 +24,8 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.drools.common.InternalWorkingMemory;
import org.drools.WorkingMemory;
-import org.drools.common.InternalWorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectInsertedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectInsertedEvent.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectInsertedEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectRetractedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectRetractedEvent.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectRetractedEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectUpdatedEvent.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectUpdatedEvent.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/ObjectUpdatedEvent.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.drools.FactHandle;
+import org.drools.runtime.rule.FactHandle;
import org.drools.WorkingMemory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -24,8 +24,8 @@
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.drools.FactHandle;
import org.drools.common.InternalWorkingMemory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.PropagationContext;
/**
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationCancelledEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationCancelledEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationCancelledEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,29 @@
+package org.drools.event.rule.impl;
+
+import org.drools.event.rule.ActivationCancelledEvent;
+import org.drools.runtime.rule.Activation;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+public class ActivationCancelledEventImpl extends ActivationEventImpl implements ActivationCancelledEvent {
+
+ public ActivationCancelledEventImpl(Activation activation) {
+ super( activation );
+ }
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationCreatedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationCreatedEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationCreatedEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,28 @@
+package org.drools.event.rule.impl;
+
+import org.drools.event.rule.ActivationCreatedEvent;
+import org.drools.runtime.rule.Activation;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class ActivationCreatedEventImpl extends ActivationEventImpl implements ActivationCreatedEvent {
+
+ public ActivationCreatedEventImpl(Activation activation) {
+ super( activation );
+ }
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ActivationEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,34 @@
+package org.drools.event.rule.impl;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.drools.event.rule.ActivationEvent;
+import org.drools.runtime.rule.Activation;
+
+
+public class ActivationEventImpl implements ActivationEvent {
+ private Activation activation;
+
+ public ActivationEventImpl(Activation activation) {
+ this.activation = activation;
+ }
+
+ public Activation getActivation() {
+ return this.activation;
+ }
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AfterActivationFiredEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AfterActivationFiredEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AfterActivationFiredEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,28 @@
+package org.drools.event.rule.impl;
+
+import org.drools.event.rule.AfterActivationFiredEvent;
+import org.drools.runtime.rule.Activation;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class AfterActivationFiredEventImpl extends ActivationEventImpl implements AfterActivationFiredEvent {
+
+ public AfterActivationFiredEventImpl(Activation activation) {
+ super( activation );
+ }
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,34 @@
+package org.drools.event.rule.impl;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.util.EventObject;
+
+import org.drools.event.rule.AgendaGroupEvent;
+import org.drools.runtime.rule.AgendaGroup;
+
+public class AgendaGroupEventImpl implements AgendaGroupEvent {
+ private AgendaGroup agendaGroup;
+
+ public AgendaGroupEventImpl(AgendaGroup agendaGroup) {
+ this.agendaGroup = agendaGroup;
+ }
+
+ public AgendaGroup getAgendaGroup() {
+ return agendaGroup;
+ }
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupPoppedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupPoppedEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupPoppedEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,28 @@
+package org.drools.event.rule.impl;
+
+import org.drools.event.rule.AgendaGroupPoppedEvent;
+import org.drools.runtime.rule.AgendaGroup;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class AgendaGroupPoppedEventImpl extends AgendaGroupEventImpl implements AgendaGroupPoppedEvent {
+
+ public AgendaGroupPoppedEventImpl(AgendaGroup agendaGroup) {
+ super( agendaGroup );
+ }
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupPushedEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupPushedEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/AgendaGroupPushedEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,28 @@
+package org.drools.event.rule.impl;
+
+import org.drools.event.rule.AgendaGroupPushedEvent;
+import org.drools.runtime.rule.AgendaGroup;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+public class AgendaGroupPushedEventImpl extends AgendaGroupEventImpl implements AgendaGroupPushedEvent {
+
+ public AgendaGroupPushedEventImpl(AgendaGroup agendaGroup) {
+ super( agendaGroup );
+ }
+
+}
\ No newline at end of file
Added: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/BeforeActivationFiredEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/BeforeActivationFiredEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/BeforeActivationFiredEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,29 @@
+package org.drools.event.rule.impl;
+
+import org.drools.event.rule.BeforeActivationFiredEvent;
+import org.drools.runtime.rule.Activation;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+public class BeforeActivationFiredEventImpl extends ActivationEventImpl implements BeforeActivationFiredEvent {
+
+ public BeforeActivationFiredEventImpl(Activation activation) {
+ super( activation );
+ }
+
+}
\ No newline at end of file
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-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectInsertedEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -4,20 +4,20 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.FactHandle;
-import org.drools.RuleRuntime;
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.runtime.rule.WorkingMemory;
-public class ObjectInsertedEventImpl extends RuleRuntimeEventImpl
+public class ObjectInsertedEventImpl extends WorkingMemoryEventImpl
implements
ObjectInsertedEvent {
private FactHandle factHandle;
private Object object;
public ObjectInsertedEventImpl(org.drools.event.ObjectInsertedEvent event) {
- super( (RuleRuntime) new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) event.getWorkingMemory() ), event.getPropagationContext() );
+ super( (WorkingMemory) new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) event.getWorkingMemory() ), event.getPropagationContext() );
factHandle = event.getFactHandle();
object = event.getObject();
}
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-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectRetractedEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -4,18 +4,18 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.FactHandle;
-import org.drools.RuleRuntime;
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.runtime.rule.WorkingMemory;
-public class ObjectRetractedEventImpl extends RuleRuntimeEventImpl implements ObjectRetractedEvent {
+public class ObjectRetractedEventImpl extends WorkingMemoryEventImpl implements ObjectRetractedEvent {
private FactHandle factHandle;
private Object oldbOject;
public ObjectRetractedEventImpl( org.drools.event.ObjectRetractedEvent event) {
- super( (RuleRuntime) new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) event.getWorkingMemory() ), event.getPropagationContext() );
+ super( (WorkingMemory) new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) event.getWorkingMemory() ), event.getPropagationContext() );
factHandle = event.getFactHandle();
oldbOject = event.getOldObject();
}
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-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/ObjectUpdatedEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -4,19 +4,19 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.FactHandle;
-import org.drools.RuleRuntime;
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.runtime.rule.WorkingMemory;
-public class ObjectUpdatedEventImpl extends RuleRuntimeEventImpl implements ObjectUpdatedEvent {
+public class ObjectUpdatedEventImpl extends WorkingMemoryEventImpl implements ObjectUpdatedEvent {
private FactHandle factHandle;
private Object object;
private Object oldObject;
public ObjectUpdatedEventImpl(org.drools.event.ObjectUpdatedEvent event) {
- super( (RuleRuntime) new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) event.getWorkingMemory() ), event.getPropagationContext() );
+ super( (WorkingMemory) new StatefulKnowledgeSessionImpl( (ReteooStatefulSession) event.getWorkingMemory() ), event.getPropagationContext() );
factHandle = event.getFactHandle();
object = event.getObject();
object = event.getOldObject();
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/RuleRuntimeEventImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/RuleRuntimeEventImpl.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/RuleRuntimeEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,40 +0,0 @@
-package org.drools.event.rule.impl;
-
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import org.drools.PropagationContext;
-import org.drools.RuleRuntime;
-import org.drools.event.rule.RuleRuntimeEvent;
-
-public class RuleRuntimeEventImpl implements RuleRuntimeEvent, Externalizable {
- private RuleRuntime ruleRuntime;
-
- private PropagationContext propagationContext;
-
- public void writeExternal(ObjectOutput out) throws IOException {
- new SerializablePropagationContext( propagationContext ).writeExternal( out );
- }
-
- public void readExternal(ObjectInput in) throws IOException,
- ClassNotFoundException {
- this.ruleRuntime = null; // null because we don't serialise this
- this.propagationContext = new SerializablePropagationContext();
- ((SerializablePropagationContext)this.propagationContext).readExternal( in );
- }
-
- public RuleRuntimeEventImpl(RuleRuntime ruleRuntime, PropagationContext propagationContext) {
- this.ruleRuntime = ruleRuntime;
- this.propagationContext = propagationContext;
- }
-
- public RuleRuntime getRuleRuntime() {
- return this.ruleRuntime;
- }
-
- public PropagationContext getPropagationContext() {
- return this.propagationContext;
- }
-}
Added: 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 (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializableActivation.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,46 @@
+package org.drools.event.rule.impl;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Collection;
+
+import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.runtime.rule.Activation;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.runtime.rule.PropagationContext;
+
+public class SerializableActivation
+ implements
+ Activation,
+ Externalizable {
+ private Rule rule;
+ private Collection<FactHandle> factHandles;
+ private PropagationContext propgationContext;
+
+ public SerializableActivation(Activation activation) {
+ this.rule = activation.getRule();
+ this.factHandles = activation.getFactHandles();
+ this.propgationContext = activation.getPropagationContext();
+ }
+
+ public void readExternal(ObjectInput in) throws IOException,
+ ClassNotFoundException {
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ }
+
+ public Rule getRule() {
+ return this.rule;
+ }
+
+ public Collection<FactHandle> getFactHandles() {
+ return this.factHandles;
+ }
+
+ public PropagationContext getPropagationContext() {
+ return this.propgationContext;
+ }
+}
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-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/SerializablePropagationContext.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -5,10 +5,10 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.FactHandle;
-import org.drools.PropagationContext;
import org.drools.impl.SerializedRule;
import org.drools.knowledge.definitions.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.runtime.rule.PropagationContext;
public class SerializablePropagationContext
implements
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/WorkingMemoryEventImpl.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/RuleRuntimeEventImpl.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/WorkingMemoryEventImpl.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/WorkingMemoryEventImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,40 @@
+package org.drools.event.rule.impl;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import org.drools.event.rule.WorkingMemoryEvent;
+import org.drools.runtime.rule.PropagationContext;
+import org.drools.runtime.rule.WorkingMemory;
+
+public class WorkingMemoryEventImpl implements WorkingMemoryEvent, Externalizable {
+ private WorkingMemory ruleRuntime;
+
+ private PropagationContext propagationContext;
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ new SerializablePropagationContext( propagationContext ).writeExternal( out );
+ }
+
+ public void readExternal(ObjectInput in) throws IOException,
+ ClassNotFoundException {
+ this.ruleRuntime = null; // null because we don't serialise this
+ this.propagationContext = new SerializablePropagationContext();
+ ((SerializablePropagationContext)this.propagationContext).readExternal( in );
+ }
+
+ public WorkingMemoryEventImpl(WorkingMemory ruleRuntime, PropagationContext propagationContext) {
+ this.ruleRuntime = ruleRuntime;
+ this.propagationContext = propagationContext;
+ }
+
+ public WorkingMemory getWorkingMemory() {
+ return this.ruleRuntime;
+ }
+
+ public PropagationContext getPropagationContext() {
+ return this.propagationContext;
+ }
+}
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/event/rule/impl/WorkingMemoryEventImpl.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/KnowledgeBaseImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -10,12 +10,12 @@
import org.drools.KnowledgeBase;
import org.drools.RuleBase;
-import org.drools.StatefulKnowledgeSession;
import org.drools.knowledge.definitions.KnowledgePackage;
import org.drools.knowledge.definitions.impl.KnowledgePackageImp;
import org.drools.reteoo.ReteooRuleBase;
import org.drools.reteoo.ReteooStatefulSession;
import org.drools.rule.Package;
+import org.drools.runtime.StatefulKnowledgeSession;
public class KnowledgeBaseImpl
implements
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/impl/StatefulKnowledgeSessionImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,24 +8,38 @@
import java.util.Map;
import java.util.concurrent.Future;
-import org.drools.FactHandle;
+
+import org.drools.event.rule.AgendaEventListener;
+import org.drools.event.rule.WorkingMemoryEventListener;
import org.drools.KnowledgeBase;
-import org.drools.ObjectFilter;
-import org.drools.StatefulKnowledgeSession;
+import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.common.ObjectStore;
import org.drools.concurrent.FutureAdapter;
+import org.drools.event.ActivationCancelledEvent;
+import org.drools.event.ActivationCreatedEvent;
+import org.drools.event.AfterActivationFiredEvent;
+import org.drools.event.AgendaGroupPoppedEvent;
+import org.drools.event.AgendaGroupPushedEvent;
+import org.drools.event.BeforeActivationFiredEvent;
import org.drools.event.ObjectInsertedEvent;
import org.drools.event.ObjectRetractedEvent;
import org.drools.event.ObjectUpdatedEvent;
-import org.drools.event.WorkingMemoryEventListener;
-import org.drools.event.rule.RuleRuntimeEventListener;
+import org.drools.event.rule.impl.ActivationCancelledEventImpl;
+import org.drools.event.rule.impl.ActivationCreatedEventImpl;
+import org.drools.event.rule.impl.AfterActivationFiredEventImpl;
+import org.drools.event.rule.impl.AgendaGroupPoppedEventImpl;
+import org.drools.event.rule.impl.AgendaGroupPushedEventImpl;
+import org.drools.event.rule.impl.BeforeActivationFiredEventImpl;
import org.drools.event.rule.impl.ObjectInsertedEventImpl;
import org.drools.event.rule.impl.ObjectRetractedEventImpl;
import org.drools.event.rule.impl.ObjectUpdatedEventImpl;
import org.drools.process.instance.ProcessInstance;
import org.drools.process.instance.WorkItemManager;
import org.drools.reteoo.ReteooStatefulSession;
+import org.drools.runtime.ObjectFilter;
+import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.rule.FactHandle;
import org.drools.time.SessionClock;
public class StatefulKnowledgeSessionImpl
@@ -34,7 +48,8 @@
public ReteooStatefulSession session;
public KnowledgeBaseImpl kbase;
- public Map<RuleRuntimeEventListener, WorkingMemoryEventListenerWrapper> mappedListeners;
+ public Map<WorkingMemoryEventListener, WorkingMemoryEventListenerWrapper> mappedWorkingMemoryListeners;
+ public Map<AgendaEventListener, AgendaEventListenerWrapper> mappedAgendaListeners;
public StatefulKnowledgeSessionImpl(ReteooStatefulSession session) {
this( session, null );
@@ -43,24 +58,40 @@
public StatefulKnowledgeSessionImpl(ReteooStatefulSession session, KnowledgeBaseImpl kbase) {
this.session = session;
this.kbase = kbase;
- this.mappedListeners = new IdentityHashMap<RuleRuntimeEventListener, WorkingMemoryEventListenerWrapper>();
+ this.mappedWorkingMemoryListeners = new IdentityHashMap<WorkingMemoryEventListener, WorkingMemoryEventListenerWrapper>();
+ this.mappedAgendaListeners = new IdentityHashMap<AgendaEventListener, AgendaEventListenerWrapper>();
}
- public void addEventListener(RuleRuntimeEventListener listener) {
+ public void addEventListener(WorkingMemoryEventListener listener) {
WorkingMemoryEventListenerWrapper wrapper = new WorkingMemoryEventListenerWrapper( listener );
- this.mappedListeners.put( listener, wrapper );
- session.addEventListener( wrapper );
+ this.mappedWorkingMemoryListeners.put( listener, wrapper );
+ this.session.addEventListener( wrapper );
}
- public void removeEventListener(RuleRuntimeEventListener listener) {
- WorkingMemoryEventListenerWrapper wrapper = this.mappedListeners.get( listener );
- session.removeEventListener( wrapper );
+ public void removeEventListener(WorkingMemoryEventListener listener) {
+ WorkingMemoryEventListenerWrapper wrapper = this.mappedWorkingMemoryListeners.get( listener );
+ this.session.removeEventListener( wrapper );
}
- public Collection<RuleRuntimeEventListener> getRuleRuntimeEventListeners() {
- return Collections.unmodifiableCollection( mappedListeners.keySet() );
+ public Collection<WorkingMemoryEventListener> getWorkingMemoryEventListeners() {
+ return Collections.unmodifiableCollection( this.mappedWorkingMemoryListeners.keySet() );
}
+ public void addEventListener(AgendaEventListener listener) {
+ AgendaEventListenerWrapper wrapper = new AgendaEventListenerWrapper( listener );
+ this.mappedAgendaListeners.put( listener, wrapper );
+ this.session.addEventListener( wrapper );
+ }
+
+ public Collection<AgendaEventListener> getAgendaEventListeners() {
+ return Collections.unmodifiableCollection( this.mappedAgendaListeners.keySet() );
+ }
+
+ public void removeEventListener(AgendaEventListener listener) {
+ AgendaEventListenerWrapper wrapper = this.mappedAgendaListeners.get( listener );
+ this.session.removeEventListener( wrapper );
+ }
+
public KnowledgeBase getKnowledgeBase() {
if ( this.kbase == null ) {
this.kbase = new KnowledgeBaseImpl( session.getRuleBase() );
@@ -79,6 +110,10 @@
public void halt() {
this.session.halt();
}
+
+ public void setFocus(String agendaGroup) {
+ this.session.setFocus( agendaGroup );
+ }
public FactHandle insert(Object object) {
return this.session.insert( object );
@@ -291,10 +326,10 @@
}
}
- public static class WorkingMemoryEventListenerWrapper implements WorkingMemoryEventListener {
- RuleRuntimeEventListener listener;
+ public static class WorkingMemoryEventListenerWrapper implements org.drools.event.WorkingMemoryEventListener {
+ private WorkingMemoryEventListener listener;
- public WorkingMemoryEventListenerWrapper(RuleRuntimeEventListener listener) {
+ public WorkingMemoryEventListenerWrapper(WorkingMemoryEventListener listener) {
this.listener = listener;
}
@@ -310,4 +345,46 @@
listener.objectUpdated( new ObjectUpdatedEventImpl( event ) );
}
}
+
+ public static class AgendaEventListenerWrapper implements org.drools.event.AgendaEventListener {
+ private AgendaEventListener listener;
+
+ public AgendaEventListenerWrapper(AgendaEventListener listener) {
+ this.listener = listener;
+ }
+
+ public void activationCancelled(ActivationCancelledEvent event,
+ WorkingMemory workingMemory) {
+
+ listener.activationCancelled( new ActivationCancelledEventImpl( event.getActivation() ), null );
+
+ }
+
+ public void activationCreated(ActivationCreatedEvent event,
+ WorkingMemory workingMemory) {
+ listener.activationCreated( new ActivationCreatedEventImpl( event.getActivation() ), null );
+ }
+
+ public void beforeActivationFired(BeforeActivationFiredEvent event,
+ WorkingMemory workingMemory) {
+ listener.beforeActivationFired( new BeforeActivationFiredEventImpl( event.getActivation() ), null );
+ }
+
+ public void afterActivationFired(AfterActivationFiredEvent event,
+ WorkingMemory workingMemory) {
+ listener.afterActivationFired( new AfterActivationFiredEventImpl( event.getActivation() ), null );
+ }
+
+ public void agendaGroupPopped(AgendaGroupPoppedEvent event,
+ WorkingMemory workingMemory) {
+ listener.agendaGroupPopped( new AgendaGroupPoppedEventImpl( event.getAgendaGroup() ), null );
+ }
+
+ public void agendaGroupPushed(AgendaGroupPushedEvent event,
+ WorkingMemory workingMemory) {
+ listener.agendaGroupPushed( new AgendaGroupPushedEventImpl( event.getAgendaGroup() ), null );
+ }
+
+ }
+
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/SignalEventCommand.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,7 +1,7 @@
package org.drools.process.command;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.WorkingMemory;
-import org.drools.process.instance.InternalProcessInstance;
public class SignalEventCommand implements Command {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/StartProcessCommand.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -4,8 +4,8 @@
import java.util.List;
import java.util.Map;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.WorkingMemory;
-import org.drools.process.instance.InternalProcessInstance;
public class StartProcessCommand implements Command {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/impl/AsynchronousCommandService.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/impl/AsynchronousCommandService.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/impl/AsynchronousCommandService.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,8 +1,8 @@
package org.drools.process.command.impl;
-import org.drools.WorkingMemory;
import org.drools.process.command.Command;
import org.drools.process.command.CommandService;
+import org.drools.WorkingMemory;
public class AsynchronousCommandService implements CommandService {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/impl/DefaultCommandService.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/impl/DefaultCommandService.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/command/impl/DefaultCommandService.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,8 +1,8 @@
package org.drools.process.command.impl;
-import org.drools.WorkingMemory;
import org.drools.process.command.Command;
import org.drools.process.command.CommandService;
+import org.drools.WorkingMemory;
public class DefaultCommandService implements CommandService {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/InternalProcessInstance.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -17,9 +17,9 @@
*/
import org.drools.Agenda;
-import org.drools.WorkingMemory;
import org.drools.common.InternalWorkingMemory;
import org.drools.knowledge.definitions.process.Process;
+import org.drools.WorkingMemory;
/**
* A process instance is the representation of a process during its execution.
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/context/exception/DefaultExceptionScopeInstance.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,6 +1,5 @@
package org.drools.process.instance.context.exception;
-import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.SequentialKnowledgeHelper;
import org.drools.common.InternalRuleBase;
@@ -8,6 +7,7 @@
import org.drools.process.core.context.exception.ExceptionHandler;
import org.drools.process.instance.ContextInstanceContainer;
import org.drools.process.instance.InternalProcessInstance;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManagerFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManagerFactory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultProcessInstanceManagerFactory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,8 +1,8 @@
package org.drools.process.instance.impl;
-import org.drools.WorkingMemory;
import org.drools.process.instance.ProcessInstanceManager;
import org.drools.process.instance.ProcessInstanceManagerFactory;
+import org.drools.WorkingMemory;
public class DefaultProcessInstanceManagerFactory implements ProcessInstanceManagerFactory {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManager.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,12 +9,12 @@
import java.util.Map;
import java.util.Set;
-import org.drools.WorkingMemory;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.InternalWorkItem;
import org.drools.process.instance.InternalWorkItemManager;
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.WorkItemHandler;
+import org.drools.WorkingMemory;
/**
*
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/DefaultWorkItemManagerFactory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -5,9 +5,9 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.WorkingMemory;
import org.drools.process.instance.InternalWorkItemManager;
import org.drools.process.instance.WorkItemManagerFactory;
+import org.drools.WorkingMemory;
public class DefaultWorkItemManagerFactory implements WorkItemManagerFactory, Externalizable {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/impl/ProcessInstanceImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -22,7 +22,6 @@
import java.util.List;
import java.util.Map;
-import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
import org.drools.process.core.Context;
@@ -30,6 +29,7 @@
import org.drools.process.core.InternalProcess;
import org.drools.process.instance.ContextInstance;
import org.drools.process.instance.InternalProcessInstance;
+import org.drools.WorkingMemory;
import org.drools.knowledge.definitions.process.Process;
/**
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,8 +8,8 @@
import java.util.HashMap;
import java.util.Map;
+import org.drools.process.instance.InternalProcessInstance;
import org.drools.WorkingMemory;
-import org.drools.process.instance.InternalProcessInstance;
import org.drools.time.Job;
import org.drools.time.JobContext;
import org.drools.time.JobHandle;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteStatelessSessionResult.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteStatelessSessionResult.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteStatelessSessionResult.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -6,11 +6,11 @@
import java.io.ObjectInput;
import java.io.IOException;
-import org.drools.ObjectFilter;
import org.drools.QueryResults;
import org.drools.StatelessSessionResult;
import org.drools.common.InternalWorkingMemory;
import org.drools.common.ObjectStore;
+import org.drools.runtime.ObjectFilter;
import org.drools.spi.GlobalResolver;
import org.drools.util.JavaIteratorAdapter;
import org.drools.util.ObjectHashMap;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -24,7 +24,6 @@
import java.util.Iterator;
import org.drools.FactException;
-import org.drools.FactHandle;
import org.drools.RuleBaseConfiguration;
import org.drools.SessionConfiguration;
import org.drools.StatefulSession;
@@ -39,6 +38,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.spi.ExecutorServiceFactory;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -5,7 +5,6 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.FactHandle;
import org.drools.SessionConfiguration;
import org.drools.StatefulSession;
import org.drools.common.InternalAgenda;
@@ -18,6 +17,7 @@
import org.drools.concurrent.RetractObject;
import org.drools.concurrent.UpdateObject;
import org.drools.event.RuleBaseEventListener;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.AgendaFilter;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.RuleBaseUpdateListener;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/rule/Accumulate.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/rule/Accumulate.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/rule/Accumulate.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -26,8 +26,8 @@
import java.io.Serializable;
import org.drools.RuntimeDroolsException;
+import org.drools.common.InternalFactHandle;
import org.drools.WorkingMemory;
-import org.drools.common.InternalFactHandle;
import org.drools.spi.Accumulator;
import org.drools.spi.CompiledInvoker;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -26,10 +26,10 @@
import java.io.IOException;
import org.drools.RuntimeDroolsException;
-import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.reteoo.LeftTuple;
+import org.drools.WorkingMemory;
import org.drools.spi.AcceptsReadAccessor;
import org.drools.spi.CompiledInvoker;
import org.drools.spi.Evaluator;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/Accumulator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/Accumulator.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/Accumulator.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -18,9 +18,9 @@
import java.io.Serializable;
-import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.rule.Declaration;
+import org.drools.WorkingMemory;
/**
* Accumulator
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/Activation.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/Activation.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/Activation.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -36,14 +36,17 @@
*/
public interface Activation
extends
- Serializable {
+ Serializable,
+ org.drools.runtime.rule.Activation {
+
/**
- * Retrieve the <code>Rule</code> that was activated.
*
- * @return The rule.
+ * @return
+ * The rule that was activated.
*/
Rule getRule();
+
int getSalience();
/**
@@ -51,7 +54,17 @@
*
* @return
*/
- GroupElement getSubRule();
+ GroupElement getSubRule();
+
+ /**
+ * Each PropgationContext is assigned an id from a counter for the WorkingMemory action it
+ * represents. All Activations return this id as the ActivationNumber, thus all Activations
+ * created from the same PropgationContext will return the same long for this method.
+ *
+ * @return
+ * The activation number
+ */
+ long getActivationNumber();
/**
* Retrieve the <code>Tuple</code> that was activated.
@@ -68,13 +81,6 @@
PropagationContext getPropagationContext();
/**
- * Retrieve the activation number.
- *
- * @return The activation number
- */
- long getActivationNumber();
-
- /**
* Cancel the <code>Activation</code> by removing it from the <code>Agenda</code>.
*/
void remove();
@@ -85,10 +91,10 @@
public void setLogicalDependencies(LinkedList justified);
+ public void setActivated(boolean activated);
+
public boolean isActivated();
- public void setActivated(boolean activated);
-
public AgendaGroup getAgendaGroup();
public ActivationGroupNode getActivationGroupNode();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/AgendaGroup.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/AgendaGroup.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/AgendaGroup.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -2,8 +2,10 @@
import java.io.Serializable;
import java.io.Externalizable;
+import java.util.Collection;
import org.drools.common.DefaultAgenda;
+import org.drools.runtime.rule.Activation;
/*
* Copyright 2005 JBoss Inc
@@ -33,33 +35,37 @@
*/
public interface AgendaGroup
extends
- Externalizable {
-
+ Externalizable,
+ org.drools.runtime.rule.AgendaGroup {
+
/**
* Static reference to determine the default <code>AgendaGroup</code> name.
*/
public static String MAIN = "MAIN";
/**
+ * @return
+ * An immutable Collection of all the activations in the AgendaGroup
+ */
+ Activation[] getActivations();
+
+ /**
* @return
- * The <code>AgendaGroup</code> name
+ * The int total number of activations
*/
- public String getName();
+ public int size();
/**
- * @return An array of all the activations in the AgendaGroup
+ * @return
+ * boolean value indicating if this AgendaGroup is empty or not
*/
- Activation[] getActivations();
+ public boolean isEmpty();
/**
- * The total number of activations in this group
+ *
* @return
- * int value for the total number of activations
+ * boolean value indicating if the AgendaGroup is active and thus being evaluated.
*/
- public int size();
-
- public boolean isEmpty();
-
public boolean isActive();
-
+
}
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/DataProvider.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/DataProvider.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/DataProvider.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,8 +3,8 @@
import java.io.Serializable;
import java.util.Iterator;
+import org.drools.rule.Declaration;
import org.drools.WorkingMemory;
-import org.drools.rule.Declaration;
public interface DataProvider extends Serializable {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/EvalExpression.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/EvalExpression.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/EvalExpression.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,8 +16,8 @@
* limitations under the License.
*/
+import org.drools.rule.Declaration;
import org.drools.WorkingMemory;
-import org.drools.rule.Declaration;
public interface EvalExpression
extends
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -19,12 +19,12 @@
import java.io.IOException;
import java.io.Serializable;
-import org.drools.FactHandle;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.marshalling.MarshallerReaderContext;
import org.drools.marshalling.MarshallerWriteContext;
import org.drools.reteoo.ObjectTypeConf;
+import org.drools.runtime.rule.FactHandle;
/**
* Factory Interface to return new <code>FactHandle</code>s
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/JavaFact.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/JavaFact.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/JavaFact.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,7 +1,7 @@
package org.drools.spi;
+import org.drools.base.JavaFactRegistryEntry;
import org.drools.WorkingMemory;
-import org.drools.base.JavaFactRegistryEntry;
public interface JavaFact {
public JavaFactRegistryEntry[] listWorkingMemories();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/KnowledgeHelper.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -19,10 +19,10 @@
import java.io.Serializable;
import org.drools.FactException;
-import org.drools.FactHandle;
-import org.drools.WorkingMemory;
import org.drools.rule.Declaration;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
/**
* KnowledgeHelper implementation types are injected into consequenses
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/PredicateExpression.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/PredicateExpression.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/PredicateExpression.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,8 +16,8 @@
* limitations under the License.
*/
+import org.drools.rule.Declaration;
import org.drools.WorkingMemory;
-import org.drools.rule.Declaration;
import java.io.Externalizable;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/PropagationContext.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/PropagationContext.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/PropagationContext.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -18,15 +18,15 @@
import java.io.Externalizable;
-import org.drools.FactHandle;
import org.drools.reteoo.LeftTuple;
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
public interface PropagationContext
extends
Externalizable,
- org.drools.PropagationContext {
+ org.drools.runtime.rule.PropagationContext {
public Rule getRuleOrigin();
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ReturnValueExpression.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ReturnValueExpression.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/spi/ReturnValueExpression.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,8 +16,8 @@
* limitations under the License.
*/
+import org.drools.rule.Declaration;
import org.drools.WorkingMemory;
-import org.drools.rule.Declaration;
public interface ReturnValueExpression
extends
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/util/JavaIteratorAdapter.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/util/JavaIteratorAdapter.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/util/JavaIteratorAdapter.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -2,10 +2,10 @@
import java.util.NoSuchElementException;
-import org.drools.FactHandle;
-import org.drools.ObjectFilter;
import org.drools.base.ShadowProxy;
import org.drools.common.InternalFactHandle;
+import org.drools.runtime.ObjectFilter;
+import org.drools.runtime.rule.FactHandle;
import org.drools.util.ObjectHashMap.ObjectEntry;
public class JavaIteratorAdapter
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/WorkflowProcessInstanceUpgrader.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -2,9 +2,9 @@
import java.util.Map;
-import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
+import org.drools.WorkingMemory;
import org.drools.workflow.core.WorkflowProcess;
import org.drools.workflow.instance.impl.NodeInstanceImpl;
import org.drools.workflow.instance.impl.WorkflowProcessInstanceImpl;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/ExtendedNodeInstanceImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -2,12 +2,12 @@
import java.util.List;
-import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.SequentialKnowledgeHelper;
import org.drools.common.InternalRuleBase;
import org.drools.process.core.context.exception.ExceptionScope;
import org.drools.process.instance.context.exception.ExceptionScopeInstance;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/impl/WorkflowProcessInstanceImpl.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -26,7 +26,6 @@
import java.util.concurrent.CopyOnWriteArrayList;
import org.drools.Agenda;
-import org.drools.WorkingMemory;
import org.drools.common.EventSupport;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
@@ -36,6 +35,7 @@
import org.drools.process.instance.EventListener;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.impl.ProcessInstanceImpl;
+import org.drools.WorkingMemory;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.NodeContainer;
import org.drools.workflow.core.WorkflowProcess;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/ActionNodeInstance.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import org.drools.WorkingMemory;
import org.drools.base.DefaultKnowledgeHelper;
import org.drools.base.SequentialKnowledgeHelper;
import org.drools.common.InternalRuleBase;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.ProcessContext;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/MilestoneNodeInstance.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import org.drools.WorkingMemory;
import org.drools.common.InternalAgenda;
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
@@ -25,6 +24,7 @@
import org.drools.event.AgendaGroupPoppedEvent;
import org.drools.event.AgendaGroupPushedEvent;
import org.drools.event.BeforeActivationFiredEvent;
+import org.drools.WorkingMemory;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.node.MilestoneNode;
import org.drools.workflow.instance.NodeInstance;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/main/java/org/drools/workflow/instance/node/WorkItemNodeInstance.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -22,7 +22,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.drools.WorkingMemory;
import org.drools.common.InternalRuleBase;
import org.drools.process.core.Work;
import org.drools.process.core.context.variable.VariableScope;
@@ -32,6 +31,7 @@
import org.drools.process.instance.WorkItem;
import org.drools.process.instance.context.variable.VariableScopeInstance;
import org.drools.process.instance.impl.WorkItemImpl;
+import org.drools.WorkingMemory;
import org.drools.workflow.core.node.WorkItemNode;
import org.drools.workflow.instance.NodeInstance;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/MockFactHandle.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/MockFactHandle.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/MockFactHandle.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -4,6 +4,8 @@
import java.io.IOException;
import java.io.ObjectInput;
+import org.drools.runtime.rule.FactHandle;
+
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -26,10 +26,8 @@
import junit.framework.TestCase;
import org.drools.Cheese;
-import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldReader;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassObjectType;
@@ -47,6 +45,8 @@
import org.drools.rule.Package;
import org.drools.rule.Pattern;
import org.drools.rule.Rule;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.Evaluator;
import org.drools.spi.FieldValue;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/RuleBaseEventListenerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/RuleBaseEventListenerTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/RuleBaseEventListenerTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -22,7 +22,6 @@
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassFieldReader;
import org.drools.base.ClassFieldAccessorCache;
@@ -35,6 +34,7 @@
import org.drools.rule.Package;
import org.drools.rule.Pattern;
import org.drools.rule.Rule;
+import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.Evaluator;
import org.drools.spi.FieldValue;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -21,9 +21,9 @@
import java.util.List;
import org.drools.Cheese;
-import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
+import org.drools.runtime.rule.FactHandle;
import org.drools.WorkingMemory;
import junit.framework.TestCase;
Added: 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 (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/AgendaEventSupportTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,224 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.Serializable;
+import java.io.ObjectOutput;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+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.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;
+import org.drools.base.evaluators.EvaluatorRegistry;
+import org.drools.base.evaluators.MatchesEvaluatorsDefinition;
+import org.drools.base.evaluators.Operator;
+import org.drools.base.evaluators.SetEvaluatorsDefinition;
+import org.drools.base.evaluators.SoundslikeEvaluatorsDefinition;
+import org.drools.common.InternalFactHandle;
+import org.drools.knowledge.definitions.impl.KnowledgePackageImp;
+import org.drools.rule.LiteralConstraint;
+import org.drools.rule.Package;
+import org.drools.rule.Pattern;
+import org.drools.rule.Rule;
+import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.runtime.rule.WorkingMemory;
+import org.drools.spi.Consequence;
+import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
+import org.drools.spi.KnowledgeHelper;
+
+public class AgendaEventSupportTest extends TestCase {
+
+ public static EvaluatorRegistry registry = new EvaluatorRegistry();
+ static {
+ registry.addEvaluatorDefinition( new EqualityEvaluatorsDefinition() );
+ registry.addEvaluatorDefinition( new ComparableEvaluatorsDefinition() );
+ registry.addEvaluatorDefinition( new SetEvaluatorsDefinition() );
+ registry.addEvaluatorDefinition( new MatchesEvaluatorsDefinition() );
+ registry.addEvaluatorDefinition( new SoundslikeEvaluatorsDefinition() );
+ }
+
+// public void testIsSerializable() {
+// assertTrue( Serializable.class.isAssignableFrom( AgendaEventSupport.class ) );
+// }
+
+ public void testAgendaEventListener() throws Exception {
+ KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
+
+ // create a simple package with one rule to test the events
+ final Package pkg = new Package( "org.drools.test" );
+ final Rule rule = new Rule( "test1" );
+ rule.setAgendaGroup( "test group" );
+ final ClassObjectType cheeseObjectType = new ClassObjectType( Cheese.class );
+ final Pattern pattern = new Pattern( 0,
+ cheeseObjectType );
+
+ pkg.setClassFieldAccessorCache( new ClassFieldAccessorCache( Thread.currentThread().getContextClassLoader() ) );
+ pkg.getClassFieldAccessorStore().setEagerWire( true );
+ final ClassFieldReader extractor = pkg.getClassFieldAccessorStore().getReader( Cheese.class,
+ "type",
+ getClass().getClassLoader() );
+
+ final FieldValue field = FieldFactory.getFieldValue( "cheddar" );
+
+ final Evaluator evaluator = registry.getEvaluator( ValueType.STRING_TYPE,
+ Operator.EQUAL,
+ null );
+
+ final LiteralConstraint constraint = new LiteralConstraint( extractor,
+ evaluator,
+ field );
+ pattern.addConstraint( constraint );
+ rule.addPattern( pattern );
+
+ rule.setConsequence( new Consequence() {
+ public void evaluate(final KnowledgeHelper knowledgeHelper,
+ final org.drools.WorkingMemory workingMemory) throws Exception {
+ }
+
+ public void readExternal(ObjectInput in) throws IOException,
+ ClassNotFoundException {
+
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+
+ }
+ } );
+ pkg.addRule( rule );
+
+
+ kbase.addKnowledgePackage( new KnowledgePackageImp( pkg ) );
+
+ // create a new working memory and add an AgendaEventListener
+ StatefulKnowledgeSession session = kbase.newStatefulKnowledgeSession();
+ final List agendaList = new ArrayList();
+ final AgendaEventListener agendaEventListener = new AgendaEventListener() {
+
+ public void activationCancelled(ActivationCancelledEvent event,
+ WorkingMemory workingMemory) {
+ agendaList.add( event );
+
+ }
+
+ public void activationCreated(ActivationCreatedEvent event,
+ WorkingMemory workingMemory) {
+ agendaList.add( event );
+ }
+
+ public void afterActivationFired(AfterActivationFiredEvent event,
+ WorkingMemory workingMemory) {
+ agendaList.add( event );
+ }
+
+ public void agendaGroupPopped(AgendaGroupPoppedEvent event,
+ WorkingMemory workingMemory) {
+ agendaList.add( event );
+ }
+
+ public void agendaGroupPushed(AgendaGroupPushedEvent event,
+ WorkingMemory workingMemory) {
+ agendaList.add( event );
+ }
+
+ public void beforeActivationFired(BeforeActivationFiredEvent event,
+ WorkingMemory workingMemory) {
+ agendaList.add( event );
+ }
+ };
+ session.addEventListener( agendaEventListener );
+
+ // assert the cheese fact
+ final Cheese cheddar = new Cheese( "cheddar",
+ 15 );
+ FactHandle cheddarHandle = session.insert( cheddar );
+
+ // should be one ActivationCreatedEvent
+ assertEquals( 1,
+ agendaList.size() );
+ ActivationCreatedEvent createdEvent = (ActivationCreatedEvent) agendaList.get( 0 );
+ assertSame( cheddarHandle,
+ createdEvent.getActivation().getFactHandles().toArray()[0] );
+ agendaList.clear();
+
+ // update results in a ActivationCancelledEvent and an ActivationCreatedEvent, note the object is always resolvable
+ cheddar.setPrice( 14 );
+ session.update( cheddarHandle,
+ cheddar );
+ assertEquals( 2,
+ agendaList.size() );
+ ActivationCancelledEvent cancelledEvent = (ActivationCancelledEvent) agendaList.get( 0 );
+ assertSame( cheddarHandle,
+ cancelledEvent.getActivation().getFactHandles().toArray()[0] );
+ createdEvent = (ActivationCreatedEvent) agendaList.get( 1 );
+ assertSame( cheddarHandle,
+ createdEvent.getActivation().getFactHandles().toArray()[0]);
+ agendaList.clear();
+
+ // retract results in a ActivationCancelledEvent, note the object is not resolveable now as it no longer exists
+ session.retract( cheddarHandle );
+ assertEquals( 1,
+ agendaList.size() );
+ cancelledEvent = (ActivationCancelledEvent) agendaList.get( 0 );
+ assertNull( ((InternalFactHandle)cancelledEvent.getActivation().getFactHandles().toArray()[0]).getObject() );
+
+ // re-assert the fact so we can test the agenda group events
+ cheddarHandle = session.insert( cheddar );
+ agendaList.clear();
+
+ // setFocus results in an AgendaGroupPushedEvent
+ session.setFocus( "test group" );
+ assertEquals( 1,
+ agendaList.size() );
+ final AgendaGroupPushedEvent pushedEvent = (AgendaGroupPushedEvent) agendaList.get( 0 );
+ assertEquals( "test group",
+ pushedEvent.getAgendaGroup().getName() );
+ agendaList.clear();
+
+ // fireAllRules results in a BeforeActivationFiredEvent and an AfterActivationFiredEvent
+ // the AgendaGroup becomes empty, which results in a popped event.
+ session.fireAllRules();
+ assertEquals( 3,
+ agendaList.size() );
+ final BeforeActivationFiredEvent beforeEvent = (BeforeActivationFiredEvent) agendaList.get( 0 );
+ assertSame( cheddarHandle,
+ beforeEvent.getActivation().getFactHandles().toArray()[0] );
+ final AfterActivationFiredEvent afterEvent = (AfterActivationFiredEvent) agendaList.get( 1 );
+ assertSame( cheddarHandle,
+ afterEvent.getActivation().getFactHandles().toArray()[0] );
+ final AgendaGroupPoppedEvent poppedEvent = (AgendaGroupPoppedEvent) agendaList.get( 2 );
+ assertEquals( "test group",
+ poppedEvent.getAgendaGroup().getName() );
+ }
+
+}
\ No newline at end of file
Deleted: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/RuleRuntimeEventSupportTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/RuleRuntimeEventSupportTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/RuleRuntimeEventSupportTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,129 +0,0 @@
-package org.drools.event.rule;
-
-/*
- * Copyright 2005 JBoss Inc
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.drools.Cheese;
-import org.drools.FactHandle;
-import org.drools.KnowledgeBase;
-import org.drools.KnowledgeBaseFactory;
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.StatefulKnowledgeSession;
-import org.drools.WorkingMemory;
-
-import junit.framework.TestCase;
-
-/**
- * @author <a href="mailto:simon at redhillconsulting.com.au">Simon Harris</a>
- */
-public class RuleRuntimeEventSupportTest extends TestCase {
-
- public void testAddRuleRuntimeEventListener() {
- KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
- StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
-
- final List wmList = new ArrayList();
- final RuleRuntimeEventListener eventListener = new RuleRuntimeEventListener() {
-
- public void objectInserted(ObjectInsertedEvent event) {
- wmList.add( event );
- }
-
- public void objectUpdated(ObjectUpdatedEvent event) {
- wmList.add( event );
- }
-
- public void objectRetracted(ObjectRetractedEvent event) {
- wmList.add( event );
- }
-
- };
-
- ksession.addEventListener( eventListener );
-
- final Cheese stilton = new Cheese( "stilton",
- 15 );
- final Cheese cheddar = new Cheese( "cheddar",
- 17 );
-
- final FactHandle stiltonHandle = ksession.insert( stilton );
-
- final ObjectInsertedEvent oae = (ObjectInsertedEvent) wmList.get( 0 );
- assertSame( stiltonHandle,
- oae.getFactHandle() );
-
- ksession.update( stiltonHandle,
- stilton );
- final ObjectUpdatedEvent ome = (ObjectUpdatedEvent) wmList.get( 1 );
- assertSame( stiltonHandle,
- ome.getFactHandle() );
-
- ksession.retract( stiltonHandle );
- final ObjectRetractedEvent ore = (ObjectRetractedEvent) wmList.get( 2 );
- assertSame( stiltonHandle,
- ore.getFactHandle() );
-
- ksession.insert( cheddar );
- }
-
- public void testRemoveRuleRuntimeEventListener() {
- KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
- StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
-
- final List wmList = new ArrayList();
- final RuleRuntimeEventListener eventListener = new RuleRuntimeEventListener() {
-
- public void objectInserted(ObjectInsertedEvent event) {
- wmList.add( event );
- }
-
- public void objectUpdated(ObjectUpdatedEvent event) {
- wmList.add( event );
- }
-
- public void objectRetracted(ObjectRetractedEvent event) {
- wmList.add( event );
- }
-
- };
-
- ksession.addEventListener( eventListener );
- ksession.removeEventListener( eventListener );
-
- final Cheese stilton = new Cheese( "stilton",
- 15 );
- final Cheese cheddar = new Cheese( "cheddar",
- 17 );
-
- final FactHandle stiltonHandle = ksession.insert( stilton );
- assertTrue( wmList.isEmpty() );
-
- ksession.update( stiltonHandle,
- stilton );
- assertTrue( wmList.isEmpty() );
-
- ksession.retract( stiltonHandle );
- assertTrue( wmList.isEmpty() );
-
- ksession.insert( cheddar );
- assertTrue( wmList.isEmpty() );
- }
-}
\ No newline at end of file
Copied: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/WorkingMemoryEventSupportTest.java (from rev 23274, labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/RuleRuntimeEventSupportTest.java)
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/WorkingMemoryEventSupportTest.java (rev 0)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/WorkingMemoryEventSupportTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -0,0 +1,129 @@
+package org.drools.event.rule;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.drools.Cheese;
+import org.drools.KnowledgeBase;
+import org.drools.KnowledgeBaseFactory;
+import org.drools.RuleBase;
+import org.drools.RuleBaseFactory;
+import org.drools.runtime.StatefulKnowledgeSession;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
+
+import junit.framework.TestCase;
+
+/**
+ * @author <a href="mailto:simon at redhillconsulting.com.au">Simon Harris</a>
+ */
+public class WorkingMemoryEventSupportTest extends TestCase {
+
+ public void testAddRuleRuntimeEventListener() {
+ KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
+ StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+
+ final List wmList = new ArrayList();
+ final WorkingMemoryEventListener eventListener = new WorkingMemoryEventListener() {
+
+ public void objectInserted(ObjectInsertedEvent event) {
+ wmList.add( event );
+ }
+
+ public void objectUpdated(ObjectUpdatedEvent event) {
+ wmList.add( event );
+ }
+
+ public void objectRetracted(ObjectRetractedEvent event) {
+ wmList.add( event );
+ }
+
+ };
+
+ ksession.addEventListener( eventListener );
+
+ final Cheese stilton = new Cheese( "stilton",
+ 15 );
+ final Cheese cheddar = new Cheese( "cheddar",
+ 17 );
+
+ final FactHandle stiltonHandle = ksession.insert( stilton );
+
+ final ObjectInsertedEvent oae = (ObjectInsertedEvent) wmList.get( 0 );
+ assertSame( stiltonHandle,
+ oae.getFactHandle() );
+
+ ksession.update( stiltonHandle,
+ stilton );
+ final ObjectUpdatedEvent ome = (ObjectUpdatedEvent) wmList.get( 1 );
+ assertSame( stiltonHandle,
+ ome.getFactHandle() );
+
+ ksession.retract( stiltonHandle );
+ final ObjectRetractedEvent ore = (ObjectRetractedEvent) wmList.get( 2 );
+ assertSame( stiltonHandle,
+ ore.getFactHandle() );
+
+ ksession.insert( cheddar );
+ }
+
+ public void testRemoveRuleRuntimeEventListener() {
+ KnowledgeBase kbase = KnowledgeBaseFactory.newKnowledgeBase();
+ StatefulKnowledgeSession ksession = kbase.newStatefulKnowledgeSession();
+
+ final List wmList = new ArrayList();
+ final WorkingMemoryEventListener eventListener = new WorkingMemoryEventListener() {
+
+ public void objectInserted(ObjectInsertedEvent event) {
+ wmList.add( event );
+ }
+
+ public void objectUpdated(ObjectUpdatedEvent event) {
+ wmList.add( event );
+ }
+
+ public void objectRetracted(ObjectRetractedEvent event) {
+ wmList.add( event );
+ }
+
+ };
+
+ ksession.addEventListener( eventListener );
+ ksession.removeEventListener( eventListener );
+
+ final Cheese stilton = new Cheese( "stilton",
+ 15 );
+ final Cheese cheddar = new Cheese( "cheddar",
+ 17 );
+
+ final FactHandle stiltonHandle = ksession.insert( stilton );
+ assertTrue( wmList.isEmpty() );
+
+ ksession.update( stiltonHandle,
+ stilton );
+ assertTrue( wmList.isEmpty() );
+
+ ksession.retract( stiltonHandle );
+ assertTrue( wmList.isEmpty() );
+
+ ksession.insert( cheddar );
+ assertTrue( wmList.isEmpty() );
+ }
+}
\ No newline at end of file
Property changes on: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/event/rule/WorkingMemoryEventSupportTest.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -34,7 +34,6 @@
import junit.framework.TestCase;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassObjectType;
@@ -53,6 +52,7 @@
import org.drools.rule.Pattern;
import org.drools.rule.Rule;
import org.drools.rule.VariableConstraint;
+import org.drools.WorkingMemory;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.BetaNodeFieldConstraint;
import org.drools.spi.Consequence;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -22,9 +22,9 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.event.AfterActivationFiredEvent;
import org.drools.event.DefaultAgendaEventListener;
+import org.drools.WorkingMemory;
public class ReteooMannersTest extends BaseMannersTest {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersistenceManagerTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,7 +8,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.persistence.Persister;
import org.drools.persistence.session.MemoryPersisterManager;
import org.drools.process.core.Work;
@@ -19,6 +18,7 @@
import org.drools.process.instance.WorkItemManager;
import org.drools.rule.Package;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterProcessTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -5,7 +5,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.persistence.Transaction;
import org.drools.persistence.session.StatefulSessionSnapshotter;
import org.drools.process.core.Work;
@@ -16,6 +15,7 @@
import org.drools.process.instance.WorkItemManager;
import org.drools.rule.Package;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterSessionTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterSessionTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/persistence/memory/MemoryPersisterSessionTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -13,7 +13,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassObjectType;
@@ -29,6 +28,7 @@
import org.drools.rule.Pattern;
import org.drools.rule.Rule;
import org.drools.rule.VariableConstraint;
+import org.drools.WorkingMemory;
import org.drools.spi.BetaNodeFieldConstraint;
import org.drools.spi.Consequence;
import org.drools.spi.ConsequenceException;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/EventTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/EventTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/EventTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -7,7 +7,6 @@
import org.drools.Person;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.common.AbstractRuleBase;
import org.drools.common.InternalWorkingMemory;
import org.drools.process.core.context.variable.Variable;
@@ -17,6 +16,7 @@
import org.drools.process.instance.ProcessInstance;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.ProcessContext;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/ForEachTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/ForEachTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/ForEachTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,7 +9,6 @@
import org.drools.Person;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.common.AbstractRuleBase;
import org.drools.common.InternalWorkingMemory;
import org.drools.process.core.context.variable.Variable;
@@ -17,6 +16,7 @@
import org.drools.process.core.datatype.impl.type.ObjectDataType;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/SubProcessTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/SubProcessTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/process/SubProcessTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,7 +3,6 @@
import junit.framework.TestCase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.common.AbstractRuleBase;
import org.drools.common.InternalWorkingMemory;
import org.drools.process.core.Work;
@@ -13,6 +12,7 @@
import org.drools.process.instance.WorkItemManager;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.ruleflow.core.RuleFlowProcess;
+import org.drools.WorkingMemory;
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/AgendaTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/AgendaTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/AgendaTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -28,7 +28,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.SalienceInteger;
import org.drools.common.ArrayAgendaGroup;
import org.drools.common.BinaryHeapQueueAgendaGroup;
@@ -43,6 +42,7 @@
import org.drools.reteoo.ReteooBuilder.IdGenerator;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Rule;
+import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ActivationGroup;
import org.drools.spi.AgendaFilter;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/CrossProductTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/CrossProductTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/CrossProductTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -26,12 +26,12 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.rule.Pattern;
import org.drools.rule.Declaration;
import org.drools.rule.Package;
import org.drools.rule.Rule;
+import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ObjectType;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -8,10 +8,8 @@
import junit.framework.TestCase;
import org.drools.Cheese;
-import org.drools.FactHandle;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassFieldReader;
import org.drools.base.ClassFieldAccessorCache;
@@ -31,6 +29,8 @@
import org.drools.rule.LiteralConstraint;
import org.drools.rule.Pattern;
import org.drools.rule.VariableConstraint;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.DataProvider;
import org.drools.spi.FieldValue;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -20,10 +20,8 @@
import org.drools.Cheese;
import org.drools.DroolsTestCase;
import org.drools.FactException;
-import org.drools.FactHandle;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.RuleBaseConfiguration.LogicalOverride;
import org.drools.base.ClassObjectType;
import org.drools.base.ShadowProxy;
@@ -34,6 +32,8 @@
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.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/MockAccumulator.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/MockAccumulator.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/MockAccumulator.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -23,9 +23,9 @@
import java.util.Collections;
import java.util.List;
-import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.rule.Declaration;
+import org.drools.WorkingMemory;
import org.drools.spi.Accumulator;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,9 +16,9 @@
* limitations under the License.
*/
-import org.drools.WorkingMemory;
import org.drools.rule.Declaration;
import org.drools.rule.EvalCondition;
+import org.drools.WorkingMemory;
import org.drools.spi.EvalExpression;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/OtherwiseTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/OtherwiseTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/OtherwiseTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -3,13 +3,13 @@
import org.drools.Otherwise;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassObjectType;
import org.drools.base.TestBean;
import org.drools.rule.Pattern;
import org.drools.rule.Package;
import org.drools.rule.Rule;
+import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -23,11 +23,9 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.drools.FactHandle;
import org.drools.QueryResult;
import org.drools.QueryResults;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassFieldReader;
import org.drools.base.ClassFieldAccessorCache;
@@ -42,6 +40,8 @@
import org.drools.rule.Behavior;
import org.drools.rule.LiteralConstraint;
import org.drools.rule.Query;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.WorkingMemory;
import org.drools.spi.Evaluator;
import org.drools.spi.FieldValue;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -27,7 +27,6 @@
import org.drools.Cheese;
import org.drools.DroolsTestCase;
import org.drools.FactException;
-import org.drools.FactHandle;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.base.ClassObjectType;
@@ -38,6 +37,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.spi.PropagationContext;
/**
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,9 +1,9 @@
package org.drools.reteoo;
import org.drools.RuleBaseConfiguration;
-import org.drools.WorkingMemory;
import org.drools.base.SalienceInteger;
import org.drools.rule.Rule;
+import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooRuleBaseTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooRuleBaseTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooRuleBaseTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -20,8 +20,8 @@
import org.drools.RuleBaseFactory;
import org.drools.SessionConfiguration;
import org.drools.StatefulSession;
+import org.drools.base.ClassFieldAccessorCache;
import org.drools.WorkingMemory;
-import org.drools.base.ClassFieldAccessorCache;
public class ReteooRuleBaseTest extends DroolsTestCase {
ReteooRuleBase ruleBase;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -7,7 +7,6 @@
import junit.framework.TestCase;
import org.drools.Cheese;
-import org.drools.FactHandle;
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
@@ -17,6 +16,7 @@
import org.drools.common.InternalWorkingMemory;
import org.drools.common.TruthMaintenanceSystem;
import org.drools.examples.manners.Guest;
+import org.drools.runtime.rule.FactHandle;
import org.drools.spi.GlobalResolver;
public class ReteooWorkingMemoryTest extends TestCase {
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -24,7 +24,6 @@
import org.drools.DroolsTestCase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.SalienceInteger;
import org.drools.common.DefaultAgenda;
import org.drools.common.DefaultFactHandle;
@@ -36,6 +35,7 @@
import org.drools.rule.Rule;
import org.drools.ruleflow.core.RuleFlowProcess;
import org.drools.ruleflow.instance.RuleFlowProcessInstance;
+import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/SchedulerTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/SchedulerTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/SchedulerTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -26,13 +26,13 @@
import org.drools.DroolsTestCase;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.common.DefaultFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.common.PropagationContextImpl;
import org.drools.reteoo.ReteooBuilder.IdGenerator;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Rule;
+import org.drools.WorkingMemory;
import org.drools.spi.Duration;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/builder/ReteooRuleBuilderTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/builder/ReteooRuleBuilderTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/reteoo/builder/ReteooRuleBuilderTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -24,7 +24,6 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.drools.WorkingMemory;
import org.drools.base.ClassObjectType;
import org.drools.reteoo.ReteooBuilder;
import org.drools.reteoo.ReteooRuleBase;
@@ -35,6 +34,7 @@
import org.drools.rule.GroupElement;
import org.drools.rule.GroupElementFactory;
import org.drools.rule.Rule;
+import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -25,7 +25,6 @@
import org.drools.Cheese;
import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassFieldReader;
@@ -43,6 +42,7 @@
import org.drools.reteoo.RightTuple;
import org.drools.rule.PredicateConstraint.PredicateContextEntry;
import org.drools.rule.ReturnValueRestriction.ReturnValueContextEntry;
+import org.drools.WorkingMemory;
import org.drools.spi.Evaluator;
import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -9,10 +9,10 @@
import junit.framework.TestCase;
-import org.drools.WorkingMemory;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.common.InternalRuleBase;
import org.drools.reteoo.ReteooRuleBase;
+import org.drools.WorkingMemory;
import org.drools.spi.EvalExpression;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/spi/MockConstraint.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/spi/MockConstraint.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/spi/MockConstraint.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.reteoo.LeftTuple;
import org.drools.rule.ContextEntry;
import org.drools.rule.Declaration;
+import org.drools.WorkingMemory;
import java.io.ObjectOutput;
import java.io.IOException;
Modified: labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/util/BaseQueueable.java
===================================================================
--- labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/util/BaseQueueable.java 2008-10-06 20:49:02 UTC (rev 23330)
+++ labs/jbossrules/branches/drools-api-refactor-20080929/drools-core/src/test/java/org/drools/util/BaseQueueable.java 2008-10-06 21:10:17 UTC (rev 23331)
@@ -1,10 +1,13 @@
package org.drools.util;
+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.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
import org.drools.spi.Tuple;
@@ -125,4 +128,9 @@
// TODO Auto-generated method stub
}
+
+ public Collection<FactHandle> getFactHandles() {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list