[jboss-svn-commits] JBL Code SVN: r23650 - in labs/jbossrules/trunk: drools-compiler/src/main/java/org/drools/commons/jci/compilers and 77 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 31 10:28:14 EDT 2008
Author: tirelli
Date: 2008-10-31 10:28:13 -0400 (Fri, 31 Oct 2008)
New Revision: 23650
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/commons/jci/compilers/EclipseJavaCompiler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/commons/jci/readers/MemoryResourceReader.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DialectCompiletimeRegistry.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageRegistry.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AbstractDSLMappingEntry.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapLexer.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapParser.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapWalker.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLTokenizedMappingFile.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/QueryBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaRuleBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExtensibleXmlParser.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FunctionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QualifiedIdentifierRestrictionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RuleHandler.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Message.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/CompilerPerfProfileTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/DrlParserTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRDRLPersistenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRLPersitenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ScenarioXMLPersistenceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBaseSerializationTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/RulebasePartitioningTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessStressTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/sequential/SequentialTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestDRL.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/Tree2TestDRL.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/MockRightTupleSink.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderPerformanceTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AccumulateTemplateTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/InstrumentedBuildContent.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactDataTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactPopulatorTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleUnit.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/TestXmlDsl.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_dsl_multiline.dsl
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_enabledExpression.drl
labs/jbossrules/trunk/drools-core/pom.xml
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/InitialFact.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ProcessIntegrationException.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/QueryResult.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBase.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseEventManager.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/StatelessSession.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEventManager.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/DirectoryScanner.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/PackageProvider.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryFileLogger.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/event/ActivationLogEvent.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/event/LogEvent.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/AsyncFireAllRulesRuleBaseUpdateListener.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseClassFieldReader.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorCache.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorStore.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldReader.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldWriter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassObjectType.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/CopyIdentifiersGlobalExporter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultConsequenceExceptionHandler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/EnabledBoolean.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/FireAllRulesRuleBaseUpdateListener.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/MapGlobalResolver.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ModifyInterceptor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ReferenceOriginalGlobalExporter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SalienceInteger.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ValueType.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/AverageAccumulateFunction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/CountAccumulateFunction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/MinAccumulateFunction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/SumAccumulateFunction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BeforeEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ComparableEvaluatorsDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DuringEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorCache.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorRegistry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FinishedByEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FinishesEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/IncludesEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MatchesEvaluatorsDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MeetsEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MetByEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/OverlappedByEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/OverlapsEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/SetEvaluatorsDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/SoundslikeEvaluatorsDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StartedByEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StartsEvaluatorDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/extractors/ArrayElementReader.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/extractors/MVELClassFieldReader.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/BooleanFieldImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/DoubleFieldImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/LongFieldImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELGlobalVariable.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELKnowledgeHelper.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELLocalDeclarationVariable.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELPreviousDeclarationVariable.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELShadowFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/LocalVariableResolver.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCalendarCoercion.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDateCoercion.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDebugHandler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractFactHandleFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ArrayAgendaGroup.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/BetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/BinaryHeapQueueAgendaGroup.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ConcurrentNodeMemories.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectInputStream.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectOutputStream.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKey.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKeyComparator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NodeMemories.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ObjectTypeConfigurationRegistry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PriorityQueueAgendaGroupFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SequentialAgendaGroupImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedTemporalWorkingMemoryContext.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedWorkingMemoryContext.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TruthMaintenanceSystem.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/AssertObject.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/AssertObjects.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/Command.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/CommandExecutor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/DefaultExecutorService.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/FireAllRules.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/RetractObject.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/UpdateObject.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/conflict/DepthConflictResolver.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/AgendaEventSupport.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/DefaultRuleBaseEventListener.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleBaseEventListener.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleBaseEventSupport.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/ClassDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/FieldDefinition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/Jenerator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateObjectType.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FieldTemplateImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/Marshaller.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PersisterHelper.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PlaceholderResolverStrategy.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PlaceholderResolverStrategyFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/Placeholders.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/RuleBaseNodes.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/persistence/memory/MemoryXaResource.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/Work.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/WorkEditor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/BooleanDataType.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/FloatDataType.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/IntegerDataType.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/StringDataType.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/UndefinedDataType.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/impl/WorkImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AbstractLeftTupleSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AbstractObjectSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNetworkCompiler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncCompositeLeftTupleSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncCompositeObjectSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncSingleLeftTupleSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncSingleObjectSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ClassObjectTypeConf.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeLeftTupleSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EmptyLeftTupleSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EmptyObjectSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EntryPointNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FactTemplateTypeConf.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/InitialFactHandle.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/InitialFactImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LIANodePropagation.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTuple.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSink.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSinkNodeList.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSinkPropagator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSource.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/MemoryVisitor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkNodeList.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkPropagator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeConf.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/PropagationQueuingNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteStatelessSessionResult.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatelessSession.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightTuple.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightTupleMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleRemovalContext.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/SingleLeftTupleSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/SingleObjectSinkAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/CollectBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ForallBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/FromBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/PatternBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Accumulate.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Collect.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Declaration.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DialectRuntimeData.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DialectRuntimeRegistry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DroolsClassLoader.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/EntryPoint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/EvalCondition.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Forall.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/From.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ImportDeclaration.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/JavaDialectRuntimeData.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LineMappings.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/MVELDialectRuntimeData.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/MutableTypeConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/SlidingTimeWindow.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TimeMachine.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TypeDeclaration.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/AgendaGroup.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Enabled.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ExecutorServiceFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/GlobalExtractor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PatternExtractor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PredicateExpression.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ReadAccessor.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Restriction.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/RuleBaseUpdateListenerFactory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/JobHandle.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/Trigger.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/impl/PseudoClockScheduler.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/BinaryHeapQueue.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ChainedProperties.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/DroolsStreamUtils.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/Entry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/JavaIteratorAdapter.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LeftTupleIndexHashTable.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LeftTupleList.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedList.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedListEntry.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashMap.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashSet.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/PrimitiveLongMap.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/PrimitiveLongStack.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/RightTupleIndexHashTable.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/RightTupleList.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/StringUtils.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/DroolsAction.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/CheeseEqual.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/MockFactHandle.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/TestWorkingMemoryEventListener.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/DirectoryScannerTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/FileScannerTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/MockProvider.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/MockRuleAgent.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleAgentTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleBaseAssemblerTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/URLScannerTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/ClassTypeResolverTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/FieldValueTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/DroolsObjectIOTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/EqualityKeyTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/SequentialAgendaTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Chosen.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Guest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/LastSeat.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Seating.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/factmodel/InstancesHashcodedTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/facttemplates/FactTemplateFieldExtractorTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/integrationtests/SerializationHelper.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/EventTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/BetaNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/CrossProductTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ExistsNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/JoinNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LeftInputAdapterNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockObjectSink.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockObjectSource.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockRightTupleSink.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ObjectTypeNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/OtherwiseTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/PartitionTaskManagerTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooBuilderTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/SchedulerTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/builder/ReteooRuleBuilderTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/EnumSerialiationTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/GroupElementTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/LogicTransformerTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/RuleTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/spi/MockObjectType.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/FieldIndexEntryTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/ObjectHashMapTest2.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/RightTupleListTest.java
labs/jbossrules/trunk/pom.xml
Log:
Upgrading to mvel2. Fixing Enabled expression
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/commons/jci/compilers/EclipseJavaCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/commons/jci/compilers/EclipseJavaCompiler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/commons/jci/compilers/EclipseJavaCompiler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -25,10 +25,10 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.drools.util.ClassUtils;
import org.drools.commons.jci.problems.CompilationProblem;
import org.drools.commons.jci.readers.ResourceReader;
import org.drools.commons.jci.stores.ResourceStore;
+import org.drools.util.ClassUtils;
import org.eclipse.jdt.core.compiler.IProblem;
import org.eclipse.jdt.internal.compiler.ClassFile;
import org.eclipse.jdt.internal.compiler.CompilationResult;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/commons/jci/readers/MemoryResourceReader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/commons/jci/readers/MemoryResourceReader.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/commons/jci/readers/MemoryResourceReader.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,8 +17,8 @@
package org.drools.commons.jci.readers;
+import java.util.HashMap;
import java.util.Map;
-import java.util.HashMap;
/**
* A memory based reader to compile from memory
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DialectCompiletimeRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DialectCompiletimeRegistry.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DialectCompiletimeRegistry.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -6,7 +6,6 @@
import java.util.List;
import java.util.Map;
-import org.drools.base.TypeResolver;
import org.drools.rule.Package;
import org.drools.rule.builder.ProcessBuildContext;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/DrlParser.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -29,6 +29,8 @@
import org.antlr.runtime.TokenStream;
import org.antlr.runtime.tree.CommonTreeNodeStream;
import org.antlr.runtime.tree.Tree;
+import org.drools.lang.DRLLexer;
+import org.drools.lang.DRLParser;
import org.drools.lang.DescrBuilderTree;
import org.drools.lang.DroolsSentence;
import org.drools.lang.DroolsTree;
@@ -36,8 +38,6 @@
import org.drools.lang.Expander;
import org.drools.lang.ExpanderException;
import org.drools.lang.Location;
-import org.drools.lang.DRLLexer;
-import org.drools.lang.DRLParser;
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.dsl.DefaultExpanderResolver;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilderConfiguration.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -44,7 +44,7 @@
import org.drools.xml.RulesSemanticModule;
import org.drools.xml.SemanticModule;
import org.drools.xml.SemanticModules;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
/**
* This class configures the package compiler.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageRegistry.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageRegistry.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,6 @@
package org.drools.compiler;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
import org.drools.base.ClassTypeResolver;
import org.drools.base.TypeResolver;
@@ -10,7 +8,6 @@
import org.drools.rule.ImportDeclaration;
import org.drools.rule.Package;
import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.rule.builder.ProcessClassBuilder;
public class PackageRegistry {
private Package pkg;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/server/util/DataEnumLoader.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -8,7 +8,7 @@
import java.util.Map;
import java.util.StringTokenizer;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
/**
* Use mvel to load up map/list of valid items for fields - used by the Guided rule editor.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLLexer.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,12 +3,17 @@
package org.drools.lang;
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
import java.util.HashMap;
+
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.Lexer;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
public class DRLLexer extends Lexer {
public static final int VT_ACCESSOR_ELEMENT=37;
public static final int ACCUMULATE=102;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DRLParser.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,19 +2,33 @@
package org.drools.lang;
- import java.util.List;
- import java.util.LinkedList;
- import org.drools.compiler.DroolsParserException;
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
+ import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
import java.util.List;
-import java.util.ArrayList;
import java.util.Map;
-import java.util.HashMap;
+import java.util.Stack;
-import org.antlr.runtime.tree.*;
+import org.antlr.runtime.BaseRecognizer;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.DFA;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.IntStream;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.ParserRuleReturnScope;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.tree.CommonTreeAdaptor;
+import org.antlr.runtime.tree.RewriteEarlyExitException;
+import org.antlr.runtime.tree.RewriteEmptyStreamException;
+import org.antlr.runtime.tree.RewriteRuleSubtreeStream;
+import org.antlr.runtime.tree.RewriteRuleTokenStream;
+import org.antlr.runtime.tree.TreeAdaptor;
+import org.drools.compiler.DroolsParserException;
public class DRLParser extends Parser {
public static final String[] tokenNames = new String[] {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/DescrBuilderTree.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,38 +2,44 @@
package org.drools.lang;
- import java.util.HashMap;
- import java.util.Map;
- import java.util.LinkedList;
- import org.drools.lang.descr.AccessorDescr;
- import org.drools.lang.descr.AccumulateDescr;
- import org.drools.lang.descr.AndDescr;
- import org.drools.lang.descr.AttributeDescr;
- import org.drools.lang.descr.BaseDescr;
- import org.drools.lang.descr.BehaviorDescr;
- import org.drools.lang.descr.DeclarativeInvokerDescr;
- import org.drools.lang.descr.DescrFactory;
- import org.drools.lang.descr.FactTemplateDescr;
- import org.drools.lang.descr.FieldConstraintDescr;
- import org.drools.lang.descr.FieldTemplateDescr;
- import org.drools.lang.descr.FromDescr;
- import org.drools.lang.descr.FunctionDescr;
- import org.drools.lang.descr.FunctionImportDescr;
- import org.drools.lang.descr.GlobalDescr;
- import org.drools.lang.descr.ImportDescr;
- import org.drools.lang.descr.PackageDescr;
- import org.drools.lang.descr.PatternSourceDescr;
- import org.drools.lang.descr.QueryDescr;
- import org.drools.lang.descr.RuleDescr;
- import org.drools.lang.descr.TypeDeclarationDescr;
- import org.drools.lang.descr.TypeFieldDescr;
+ import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.tree.TreeNodeStream;
+import org.antlr.runtime.tree.TreeParser;
+import org.antlr.runtime.tree.TreeRuleReturnScope;
+import org.drools.lang.descr.AccessorDescr;
+import org.drools.lang.descr.AccumulateDescr;
+import org.drools.lang.descr.AndDescr;
+import org.drools.lang.descr.AttributeDescr;
+import org.drools.lang.descr.BaseDescr;
+import org.drools.lang.descr.BehaviorDescr;
+import org.drools.lang.descr.DeclarativeInvokerDescr;
+import org.drools.lang.descr.DescrFactory;
+import org.drools.lang.descr.FactTemplateDescr;
+import org.drools.lang.descr.FieldConstraintDescr;
+import org.drools.lang.descr.FieldTemplateDescr;
+import org.drools.lang.descr.FromDescr;
+import org.drools.lang.descr.FunctionDescr;
+import org.drools.lang.descr.FunctionImportDescr;
+import org.drools.lang.descr.GlobalDescr;
+import org.drools.lang.descr.ImportDescr;
+import org.drools.lang.descr.PackageDescr;
+import org.drools.lang.descr.PatternSourceDescr;
+import org.drools.lang.descr.QueryDescr;
+import org.drools.lang.descr.RuleDescr;
+import org.drools.lang.descr.TypeDeclarationDescr;
+import org.drools.lang.descr.TypeFieldDescr;
-import org.antlr.runtime.*;
-import org.antlr.runtime.tree.*;import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
public class DescrBuilderTree extends TreeParser {
public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "VT_COMPILATION_UNIT", "VT_FUNCTION_IMPORT", "VT_FACT", "VT_CONSTRAINTS", "VT_LABEL", "VT_QUERY_ID", "VT_TEMPLATE_ID", "VT_TYPE_DECLARE_ID", "VT_RULE_ID", "VT_ENTRYPOINT_ID", "VT_SLOT_ID", "VT_SLOT", "VT_RULE_ATTRIBUTES", "VT_RHS_CHUNK", "VT_CURLY_CHUNK", "VT_SQUARE_CHUNK", "VT_PAREN_CHUNK", "VT_BEHAVIOR", "VT_AND_IMPLICIT", "VT_AND_PREFIX", "VT_OR_PREFIX", "VT_AND_INFIX", "VT_OR_INFIX", "VT_ACCUMULATE_INIT_CLAUSE", "VT_ACCUMULATE_ID_CLAUSE", "VT_FROM_SOURCE", "VT_EXPRESSION_CHAIN", "VT_PATTERN", "VT_FACT_BINDING", "VT_FACT_OR", "VT_BIND_FIELD", "VT_FIELD", "VT_ACCESSOR_PATH", "VT_ACCESSOR_ELEMENT", "VT_DATA_TYPE", "VT_PATTERN_TYPE", "VT_PACKAGE_ID", "VT_IMPORT_ID", "VT_GLOBAL_ID", "VT_FUNCTION_ID", "VT_PARAM_LIST", "VK_DATE_EFFECTIVE", "VK_DATE_EXPIRES", "VK_LOCK_ON_ACTIVE", "VK_NO_LOOP", "VK_AUTO_FOCUS", "VK_ACTIVATION_GROUP", "VK_AGENDA_GROUP", "VK_RULEFLOW_GROUP", "VK_DURATION", "VK_DIALECT", "VK_SALIENCE", "VK_ENABLED", "!
VK_ATTRIBUTES", "VK_RULE", "VK_EXTEND", "VK_IMPORT", "VK_PACKAGE", "VK_TEMPLATE", "VK_QUERY", "VK_DECLARE", "VK_FUNCTION", "VK_GLOBAL", "VK_EVAL", "VK_CONTAINS", "VK_MATCHES", "VK_EXCLUDES", "VK_SOUNDSLIKE", "VK_MEMBEROF", "VK_ENTRY_POINT", "VK_NOT", "VK_IN", "VK_OR", "VK_AND", "VK_EXISTS", "VK_FORALL", "VK_ACTION", "VK_REVERSE", "VK_RESULT", "SEMICOLON", "ID", "DOT", "DOT_STAR", "END", "STRING", "LEFT_PAREN", "COMMA", "RIGHT_PAREN", "AT", "COLON", "EQUALS", "WHEN", "BOOL", "INT", "DOUBLE_PIPE", "DOUBLE_AMPER", "FROM", "OVER", "ACCUMULATE", "INIT", "COLLECT", "ARROW", "EQUAL", "GREATER", "GREATER_EQUAL", "LESS", "LESS_EQUAL", "NOT_EQUAL", "GRAVE_ACCENT", "FLOAT", "NULL", "LEFT_SQUARE", "RIGHT_SQUARE", "THEN", "LEFT_CURLY", "RIGHT_CURLY", "MISC", "EOL", "WS", "EscapeSequence", "HexDigit", "UnicodeEscape", "OctalEscape", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT"
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/descr/PackageDescr.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -24,7 +24,6 @@
import java.util.Iterator;
import java.util.List;
-import org.drools.rule.Dialectable;
import org.drools.rule.Namespaceable;
public class PackageDescr extends BaseDescr implements Namespaceable {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AbstractDSLMappingEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AbstractDSLMappingEntry.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/AbstractDSLMappingEntry.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -7,21 +7,6 @@
import org.drools.lang.dsl.DSLMappingEntry.MetaData;
import org.drools.lang.dsl.DSLMappingEntry.Section;
-/*
- * Copyright 2006 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 abstract class AbstractDSLMappingEntry {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapLexer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapLexer.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapLexer.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,17 +1,14 @@
// $ANTLR 3.0 src/main/resources/org/drools/lang/dsl/DSLMap.g 2008-10-22 23:57:51
package org.drools.lang.dsl;
- import java.util.List;
- import java.util.ArrayList;
-// import org.drools.lang.dsl.DSLMappingParseException;
+ import java.util.HashMap;
-
-import org.antlr.runtime.*;
-import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.Lexer;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
public class DSLMapLexer extends Lexer {
public static final int COMMA=27;
public static final int RIGHT_CURLY=30;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapParser.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapParser.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,19 +1,27 @@
// $ANTLR 3.0 src/main/resources/org/drools/lang/dsl/DSLMap.g 2008-10-22 23:57:51
package org.drools.lang.dsl;
- import java.util.List;
import java.util.ArrayList;
-// import org.drools.lang.dsl.DSLMappingParseException;
-
-
-import org.antlr.runtime.*;
-import java.util.Stack;
+import java.util.HashMap;
import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import org.antlr.runtime.tree.*;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.CommonToken;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.FailedPredicateException;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.Parser;
+import org.antlr.runtime.ParserRuleReturnScope;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.TokenStream;
+import org.antlr.runtime.tree.CommonTreeAdaptor;
+import org.antlr.runtime.tree.RewriteEarlyExitException;
+import org.antlr.runtime.tree.RewriteEmptyStreamException;
+import org.antlr.runtime.tree.RewriteRuleSubtreeStream;
+import org.antlr.runtime.tree.RewriteRuleTokenStream;
+import org.antlr.runtime.tree.TreeAdaptor;
public class DSLMapParser extends Parser {
public static final String[] tokenNames = new String[] {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapWalker.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapWalker.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLMapWalker.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,16 +2,19 @@
package org.drools.lang.dsl;
- import java.util.Map;
import java.util.HashMap;
-
+import java.util.Map;
+import java.util.Stack;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.tree.CommonTree;
+import org.antlr.runtime.tree.TreeNodeStream;
+import org.antlr.runtime.tree.TreeParser;
-import org.antlr.runtime.*;
-import org.antlr.runtime.tree.*;import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
-
public class DSLMapWalker extends TreeParser {
public static final String[] tokenNames = new String[] {
"<invalid>", "<EOR>", "<DOWN>", "<UP>", "VT_DSL_GRAMMAR", "VT_COMMENT", "VT_ENTRY", "VT_SCOPE", "VT_CONDITION", "VT_CONSEQUENCE", "VT_KEYWORD", "VT_ANY", "VT_META", "VT_ENTRY_KEY", "VT_ENTRY_VAL", "VT_VAR_DEF", "VT_VAR_REF", "VT_LITERAL", "VT_PATTERN", "VT_QUAL", "VT_SPACE", "EOL", "LINE_COMMENT", "EQUALS", "LEFT_SQUARE", "RIGHT_SQUARE", "LITERAL", "COMMA", "COLON", "LEFT_CURLY", "RIGHT_CURLY", "WS", "EscapeSequence", "DOT", "POUND", "MISC"
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLTokenizedMappingFile.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLTokenizedMappingFile.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/DSLTokenizedMappingFile.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.io.Reader;
import java.util.LinkedList;
+
import org.antlr.runtime.ANTLRReaderStream;
import org.antlr.runtime.CharStream;
import org.antlr.runtime.CommonTokenStream;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/PatternBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -22,8 +22,6 @@
import java.util.List;
import java.util.Set;
-import org.drools.RuntimeDroolsException;
-import org.drools.base.ClassFieldReader;
import org.drools.base.ClassObjectType;
import org.drools.base.FieldFactory;
import org.drools.base.ValueType;
@@ -73,7 +71,6 @@
import org.drools.rule.VariableConstraint;
import org.drools.rule.VariableRestriction;
import org.drools.rule.builder.dialect.mvel.MVELDialect;
-import org.drools.spi.Acceptor;
import org.drools.spi.AcceptsReadAccessor;
import org.drools.spi.Constraint;
import org.drools.spi.Evaluator;
@@ -83,8 +80,8 @@
import org.drools.spi.PatternExtractor;
import org.drools.spi.Restriction;
import org.drools.spi.Constraint.ConstraintType;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
/**
* A builder for patterns
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/QueryBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/QueryBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/QueryBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,5 @@
package org.drools.rule.builder;
-import org.drools.RuntimeDroolsException;
import org.drools.base.ClassObjectType;
import org.drools.base.DroolsQuery;
import org.drools.base.FieldFactory;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/RuleBuildContext.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,19 +17,15 @@
package org.drools.rule.builder;
import java.util.Calendar;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Stack;
-import java.util.Map.Entry;
-import org.drools.RuntimeDroolsException;
import org.drools.base.EnabledBoolean;
import org.drools.compiler.Dialect;
import org.drools.compiler.DialectCompiletimeRegistry;
import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.AttributeDescr;
import org.drools.lang.descr.QueryDescr;
import org.drools.lang.descr.RuleDescr;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaProcessBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,19 +1,19 @@
package org.drools.rule.builder.dialect.java;
-import org.drools.lang.descr.BaseDescr;
-import org.drools.rule.builder.ProcessBuildContext;
-import org.drools.util.StringUtils;
-import org.mvel.templates.SimpleTemplateRegistry;
-import org.mvel.templates.TemplateRegistry;
-import org.mvel.templates.TemplateCompiler;
-import org.mvel.templates.TemplateRuntime;
-import org.mvel.integration.impl.MapVariableResolverFactory;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import org.drools.lang.descr.BaseDescr;
+import org.drools.rule.builder.ProcessBuildContext;
+import org.drools.util.StringUtils;
+import org.mvel2.integration.impl.MapVariableResolverFactory;
+import org.mvel2.templates.SimpleTemplateRegistry;
+import org.mvel2.templates.TemplateCompiler;
+import org.mvel2.templates.TemplateRegistry;
+import org.mvel2.templates.TemplateRuntime;
+
public class AbstractJavaProcessBuilder {
protected static final TemplateRegistry RULE_REGISTRY = new SimpleTemplateRegistry();
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaRuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaRuleBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/AbstractJavaRuleBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -10,13 +10,13 @@
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.dialect.mvel.MVELDialect;
import org.drools.util.StringUtils;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.integration.impl.MapVariableResolverFactory;
-import org.mvel.optimizers.OptimizerFactory;
-import org.mvel.templates.SimpleTemplateRegistry;
-import org.mvel.templates.TemplateCompiler;
-import org.mvel.templates.TemplateRegistry;
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.compiler.AbstractParser;
+import org.mvel2.integration.impl.MapVariableResolverFactory;
+import org.mvel2.optimizers.OptimizerFactory;
+import org.mvel2.templates.SimpleTemplateRegistry;
+import org.mvel2.templates.TemplateCompiler;
+import org.mvel2.templates.TemplateRegistry;
+import org.mvel2.templates.TemplateRuntime;
public class AbstractJavaRuleBuilder {
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -30,14 +30,13 @@
import org.drools.compiler.Dialect;
import org.drools.lang.descr.RuleDescr;
import org.drools.rule.Declaration;
-import org.drools.rule.Rule;
import org.drools.rule.builder.ConsequenceBuilder;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.dialect.java.parser.JavaModifyBlockDescr;
import org.drools.rule.builder.dialect.mvel.MVELDialect;
import org.drools.spi.PatternExtractor;
import org.drools.util.ClassUtils;
-import org.mvel.compiler.ExecutableStatement;
+import org.mvel2.compiler.ExecutableStatement;
/**
* @author etirelli
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaEvalBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -26,7 +26,6 @@
import org.drools.rule.Declaration;
import org.drools.rule.EvalCondition;
import org.drools.rule.Pattern;
-import org.drools.rule.Rule;
import org.drools.rule.RuleConditionElement;
import org.drools.rule.builder.RuleBuildContext;
import org.drools.rule.builder.RuleConditionBuilder;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/JavaFunctionBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,8 +18,8 @@
import org.drools.rule.Package;
import org.drools.rule.builder.FunctionBuilder;
import org.drools.util.StringUtils;
-import org.mvel.templates.TemplateRuntime;
-import org.mvel.integration.impl.MapVariableResolverFactory;
+import org.mvel2.integration.impl.MapVariableResolverFactory;
+import org.mvel2.templates.TemplateRuntime;
public class JavaFunctionBuilder
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/java/KnowledgeHelperFixer.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -19,8 +19,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.mvel.Macro;
-import org.mvel.MacroProcessor;
+import org.mvel2.Macro;
+import org.mvel2.MacroProcessor;
public class KnowledgeHelperFixer {
private static final Map macros;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,22 +16,14 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
import java.util.Set;
import org.drools.base.accumulators.AccumulateFunction;
import org.drools.base.accumulators.MVELAccumulatorFunctionExecutor;
-import org.drools.base.mvel.DroolsMVELFactory;
-import org.drools.base.mvel.DroolsMVELShadowFactory;
import org.drools.base.mvel.MVELAccumulator;
import org.drools.base.mvel.MVELCompilationUnit;
import org.drools.base.mvel.MVELCompileable;
-import org.drools.base.mvel.MVELConsequence;
import org.drools.compiler.DescrBuildError;
import org.drools.compiler.Dialect;
import org.drools.lang.descr.AccumulateDescr;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELActionBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,5 @@
package org.drools.rule.builder.dialect.mvel;
-import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -16,8 +15,8 @@
import org.drools.rule.builder.PackageBuildContext;
import org.drools.spi.ProcessContext;
import org.drools.workflow.core.DroolsAction;
-import org.mvel.Macro;
-import org.mvel.MacroProcessor;
+import org.mvel2.Macro;
+import org.mvel2.MacroProcessor;
public class MVELActionBuilder
implements
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,11 +1,9 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
-import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELCompilationUnit;
import org.drools.base.mvel.MVELConsequence;
import org.drools.compiler.DescrBuildError;
@@ -13,11 +11,9 @@
import org.drools.rule.Declaration;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.builder.ConsequenceBuilder;
-import org.drools.rule.builder.PackageBuildContext;
import org.drools.rule.builder.RuleBuildContext;
-import org.mvel.Macro;
-import org.mvel.MacroProcessor;
-import org.mvel.compiler.CompiledExpression;
+import org.mvel2.Macro;
+import org.mvel2.MacroProcessor;
public class MVELConsequenceBuilder
implements
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELDialect.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -70,13 +70,10 @@
import org.drools.spi.DeclarationScopeResolver;
import org.drools.spi.KnowledgeHelper;
import org.drools.util.StringUtils;
-import org.mvel.MVEL;
-import org.mvel.ParserContext;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.CompiledExpression;
-import org.mvel.compiler.ExpressionCompiler;
-import org.mvel.util.CompilerTools;
-import org.mvel.util.ParseTools;
+import org.mvel2.MVEL;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.AbstractParser;
+import org.mvel2.compiler.ExpressionCompiler;
public class MVELDialect
implements
@@ -341,9 +338,9 @@
null,
null,
null );
- Map<String, org.mvel.ast.Function> map = CompilerTools.extractAllDeclaredFunctions( (CompiledExpression) s1 );
+ Map<String, org.mvel2.ast.Function> map = org.mvel2.util.CompilerTools.extractAllDeclaredFunctions( (org.mvel2.compiler.CompiledExpression) s1 );
MVELDialectRuntimeData data = (MVELDialectRuntimeData) this.packageRegistry.getDialectRuntimeRegistry().getDialectData( getId() );
- for ( org.mvel.ast.Function function : map.values() ) {
+ for ( org.mvel2.ast.Function function : map.values() ) {
data.addFunction( function );
}
}
@@ -367,7 +364,7 @@
} else {
try {
Class cls = this.packageRegistry.getTypeResolver().resolveType( importEntry );
- this.imports.put( ParseTools.getSimpleClassName( cls ),
+ this.imports.put( cls.getSimpleName(),
cls );
} catch ( ClassNotFoundException e ) {
this.results.add( new ImportError( importEntry,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEnabledBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -10,10 +10,8 @@
import org.drools.compiler.Dialect;
import org.drools.rule.Declaration;
import org.drools.rule.MVELDialectRuntimeData;
-import org.drools.rule.Rule;
import org.drools.rule.builder.EnabledBuilder;
import org.drools.rule.builder.RuleBuildContext;
-import org.drools.spi.KnowledgeHelper;
public class MVELEnabledBuilder
implements
@@ -27,19 +25,25 @@
// This builder is re-usable in other dialects, so specify by name
MVELDialect dialect = (MVELDialect) context.getDialect( "mvel" );
+ Map<String,Class> otherVars = new HashMap<String, Class>();
+ otherVars.put( "rule", org.drools.rule.Rule.class );
+
Map<String, Declaration> declarations = context.getDeclarationResolver().getDeclarations(context.getRule());
Dialect.AnalysisResult analysis = dialect.analyzeExpression( context,
context.getRuleDescr(),
(String) context.getRuleDescr().getEnabled(),
- new Set[]{declarations.keySet(), context.getPkg().getGlobals().keySet()} );
+ new Set[]{declarations.keySet(), context.getPkg().getGlobals().keySet()},
+ otherVars );
Declaration[] previousDeclarations = (Declaration[]) declarations.values().toArray( new Declaration[declarations.size()] );
- MVELCompilationUnit unit = dialect.getMVELCompilationUnit( (String) context.getRuleDescr().getEnabled(),
+ String exprStr = (String) context.getRuleDescr().getEnabled();
+ exprStr = exprStr.substring( 1, exprStr.length()-1 )+" ";
+ MVELCompilationUnit unit = dialect.getMVELCompilationUnit( exprStr,
analysis,
previousDeclarations,
null,
- null,
+ otherVars,
context );
MVELEnabledExpression expr = new MVELEnabledExpression( unit,
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,11 +16,8 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.Serializable;
-import java.util.List;
import java.util.Set;
-import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELCompilationUnit;
import org.drools.base.mvel.MVELEvalExpression;
import org.drools.compiler.DescrBuildError;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELExprAnalyzer.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -27,8 +27,8 @@
import org.antlr.runtime.RecognitionException;
import org.drools.rule.builder.PackageBuildContext;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
/**
* Expression analyzer.
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELFromBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,11 +16,9 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.Serializable;
import java.util.Set;
import org.drools.base.dataproviders.MVELDataProvider;
-import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELCompilationUnit;
import org.drools.compiler.DescrBuildError;
import org.drools.compiler.Dialect;
@@ -34,7 +32,6 @@
import org.drools.rule.RuleConditionElement;
import org.drools.rule.builder.FromBuilder;
import org.drools.rule.builder.RuleBuildContext;
-import org.drools.spi.DataProvider;
/**
* A builder for "from" conditional element
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,13 +16,9 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.Serializable;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELCompilationUnit;
import org.drools.base.mvel.MVELPredicateExpression;
import org.drools.compiler.DescrBuildError;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,15 +16,10 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.Serializable;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
import java.util.Set;
-import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELCompilationUnit;
-import org.drools.base.mvel.MVELPredicateExpression;
import org.drools.base.mvel.MVELReturnValueExpression;
import org.drools.compiler.DescrBuildError;
import org.drools.compiler.Dialect;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueEvaluatorBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,13 +1,10 @@
package org.drools.rule.builder.dialect.mvel;
-import java.io.Serializable;
import java.util.Collections;
import java.util.Set;
-import org.drools.base.mvel.DroolsMVELFactory;
import org.drools.base.mvel.MVELCompilationUnit;
import org.drools.base.mvel.MVELReturnValueEvaluator;
-import org.drools.base.mvel.MVELReturnValueExpression;
import org.drools.compiler.DescrBuildError;
import org.drools.compiler.Dialect;
import org.drools.compiler.ReturnValueDescr;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/testframework/ScenarioRunner.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,6 @@
package org.drools.testframework;
-import static org.mvel.MVEL.eval;
+import static org.mvel2.MVEL.eval;
import java.util.Calendar;
import java.util.Date;
@@ -28,8 +28,9 @@
import org.drools.rule.Package;
import org.drools.rule.TimeMachine;
import org.drools.runtime.rule.FactHandle;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
+
/**
* This actually runs the test scenarios.
*
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExtensibleXmlParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExtensibleXmlParser.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/ExtensibleXmlParser.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -31,7 +31,6 @@
import java.util.Map;
import java.util.Set;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/AccumulateHelperHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -24,9 +24,7 @@
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.mvel.templates.res.TextNode;
import org.w3c.dom.Element;
-import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/EvalHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -29,9 +29,7 @@
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.mvel.templates.res.TextNode;
import org.w3c.dom.Element;
-import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ExpressionHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -25,19 +25,17 @@
import org.antlr.runtime.TokenStream;
import org.antlr.runtime.tree.CommonTreeNodeStream;
import org.antlr.runtime.tree.Tree;
-import org.drools.lang.DescrBuilderTree;
-import org.drools.lang.DroolsTreeAdaptor;
import org.drools.lang.DRLLexer;
import org.drools.lang.DRLParser;
+import org.drools.lang.DescrBuilderTree;
+import org.drools.lang.DroolsTreeAdaptor;
import org.drools.lang.DescrBuilderTree.from_source_clause_return;
import org.drools.lang.descr.BaseDescr;
import org.drools.lang.descr.FromDescr;
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.mvel.templates.res.TextNode;
import org.w3c.dom.Element;
-import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FunctionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FunctionHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/FunctionHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -25,10 +25,8 @@
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.mvel.templates.res.TextNode;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/PredicateHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -25,9 +25,7 @@
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.mvel.templates.res.TextNode;
import org.w3c.dom.Element;
-import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QualifiedIdentifierRestrictionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QualifiedIdentifierRestrictionHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/QualifiedIdentifierRestrictionHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -27,9 +27,7 @@
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.mvel.templates.res.TextNode;
import org.w3c.dom.Element;
-import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/ReturnValueRestrictionHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -27,9 +27,7 @@
import org.drools.xml.BaseAbstractHandler;
import org.drools.xml.ExtensibleXmlParser;
import org.drools.xml.Handler;
-import org.mvel.templates.res.TextNode;
import org.w3c.dom.Element;
-import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RuleHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RuleHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/xml/rules/RuleHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -29,7 +29,6 @@
import org.drools.xml.Handler;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Message.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Message.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Message.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,10 +3,10 @@
*/
package org.drools;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
-import java.io.Serializable;
public class Message implements Serializable {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Order.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,11 +16,11 @@
package org.drools;
+import java.io.Serializable;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import java.io.Serializable;
/**
* @author etirelli
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/OrderItem.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,8 +17,8 @@
package org.drools;
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
-import java.io.IOException;
import java.io.ObjectOutput;
/**
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/Person.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,5 @@
package org.drools;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/CompilerPerfProfileTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/CompilerPerfProfileTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/CompilerPerfProfileTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,10 +3,10 @@
import java.io.IOException;
import java.io.InputStreamReader;
+import junit.framework.TestCase;
+
import org.drools.rule.Package;
-import junit.framework.TestCase;
-
public class CompilerPerfProfileTest extends TestCase {
public void testProfileRuns() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/DrlParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/DrlParserTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/DrlParserTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,6 +2,8 @@
import java.io.StringReader;
+import junit.framework.TestCase;
+
import org.drools.RuntimeDroolsException;
import org.drools.lang.Expander;
import org.drools.lang.dsl.DSLMappingFile;
@@ -9,8 +11,6 @@
import org.drools.lang.dsl.DefaultExpander;
import org.drools.lang.dsl.DefaultExpanderResolver;
-import junit.framework.TestCase;
-
public class DrlParserTest extends TestCase {
public void testExpandDRL() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderConfigurationTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -8,7 +8,6 @@
import junit.framework.TestCase;
-import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.TypeResolver;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.AttributeDescr;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -7,8 +7,6 @@
import junit.framework.TestCase;
-import org.drools.guvnor.client.modeldriven.DropDownData;
-import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
import org.drools.guvnor.client.modeldriven.brl.ActionFieldValue;
import org.drools.guvnor.client.modeldriven.brl.FactPattern;
import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/modeldriven/DataEnumLoaderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -10,8 +10,8 @@
import junit.framework.TestCase;
import org.drools.guvnor.server.util.DataEnumLoader;
-import org.mvel.MVEL;
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.MVEL;
+import org.mvel2.templates.TemplateRuntime;
public class DataEnumLoaderTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/rules/SuggestionCompletionLoaderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -5,7 +5,6 @@
import junit.framework.TestCase;
import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.guvnor.server.rules.SuggestionCompletionLoader;
public class SuggestionCompletionLoaderTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRDRLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRDRLPersistenceTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRDRLPersistenceTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -20,8 +20,6 @@
import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
import org.drools.guvnor.client.modeldriven.brl.RuleModel;
import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
-import org.drools.guvnor.server.util.BRDRLPersistence;
-import org.drools.guvnor.server.util.BRLPersistence;
public class BRDRLPersistenceTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRLPersitenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRLPersitenceTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/BRLPersitenceTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -23,8 +23,6 @@
import org.drools.guvnor.client.modeldriven.brl.RuleAttribute;
import org.drools.guvnor.client.modeldriven.brl.RuleModel;
import org.drools.guvnor.client.modeldriven.brl.SingleFieldConstraint;
-import org.drools.guvnor.server.util.BRLPersistence;
-import org.drools.guvnor.server.util.BRXMLPersistence;
public class BRLPersitenceTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ScenarioXMLPersistenceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ScenarioXMLPersistenceTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/ScenarioXMLPersistenceTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,6 +3,8 @@
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
+
import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
import org.drools.guvnor.client.modeldriven.testing.FactData;
import org.drools.guvnor.client.modeldriven.testing.FieldData;
@@ -10,10 +12,7 @@
import org.drools.guvnor.client.modeldriven.testing.VerifyFact;
import org.drools.guvnor.client.modeldriven.testing.VerifyField;
import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
-import org.drools.guvnor.server.util.ScenarioXMLPersistence;
-import junit.framework.TestCase;
-
public class ScenarioXMLPersistenceTest extends TestCase {
public void testToXML() {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/server/util/SuggestionCompletionEngineBuilderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,13 +1,8 @@
package org.drools.guvnor.server.util;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
import junit.framework.TestCase;
import org.drools.guvnor.client.modeldriven.SuggestionCompletionEngine;
-import org.drools.guvnor.server.util.SuggestionCompletionEngineBuilder;
import org.drools.lang.dsl.AbstractDSLMappingEntry;
import org.drools.lang.dsl.DSLMappingEntry;
import org.drools.lang.dsl.DSLMappingEntry.Section;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,7 +3,6 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.io.StringReader;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
@@ -399,7 +398,7 @@
conf.setClockType( ClockType.PSEUDO_CLOCK );
StatefulSession wm = ruleBase.newStatefulSession( conf );
- final List results = new ArrayList();
+ List results = new ArrayList();
wm.setGlobal( "results",
results );
@@ -417,7 +416,10 @@
assertEquals( 0,
handle1.getDuration() );
- // wm = SerializationHelper.serializeObject(wm);
+// wm = SerializationHelper.getSerialisedStatefulSession( wm );
+// results = (List) wm.getGlobal( "results" );
+// clock = (SessionPseudoClock) wm.getSessionClock();
+
wm.fireAllRules();
assertEquals( 1,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,5 +1,12 @@
package org.drools.integrationtests;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -14,7 +21,6 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.common.DefaultAgenda;
import org.drools.common.InternalWorkingMemoryActions;
import org.drools.common.RuleFlowGroupImpl;
@@ -36,13 +42,6 @@
import org.drools.spi.ActivationGroup;
import org.drools.spi.AgendaGroup;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.util.ArrayList;
-import java.util.List;
-
public class ExecutionFlowControlTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/FirstOrderLogicTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,15 @@
package org.drools.integrationtests;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
import junit.framework.Assert;
import junit.framework.TestCase;
+
import org.drools.Cheese;
import org.drools.Cheesery;
import org.drools.Order;
@@ -14,6 +22,7 @@
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;
@@ -21,17 +30,7 @@
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;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
public class FirstOrderLogicTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBaseSerializationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBaseSerializationTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LargeRuleBaseSerializationTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,18 +1,18 @@
package org.drools.integrationtests;
+import java.io.StringReader;
+
+import junit.framework.TestCase;
+
+import org.drools.RuleBase;
+import org.drools.RuleBaseFactory;
import org.drools.compiler.DrlParser;
+import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.DroolsParserException;
import org.drools.lang.descr.PackageDescr;
import org.drools.rule.Package;
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
import org.drools.util.DroolsStreamUtils;
-import java.io.StringReader;
-
-import junit.framework.TestCase;
-
/**
* Created by IntelliJ IDEA. User: SG0521861 Date: Mar 18, 2008 Time: 1:22:50 PM To change this template use File |
* Settings | File Templates.
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MVELTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,17 @@
package org.drools.integrationtests;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
import junit.framework.Assert;
import junit.framework.TestCase;
+
import org.drools.Cheese;
import org.drools.Person;
import org.drools.RuleBase;
@@ -13,17 +23,8 @@
import org.drools.rule.Package;
import org.drools.WorkingMemory;
import org.drools.util.DateUtils;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-
public class MVELTest extends TestCase {
public void testHelloWorld() throws Exception {
// read in the source
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MiscTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -247,7 +247,7 @@
}
- public void FIXME_testEnabledExpression() throws Exception {
+ public void testEnabledExpression() throws Exception {
final PackageBuilder builder = new PackageBuilder();
builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_enabledExpression.drl" ) ) );
final Package pkg = builder.getPackage();
@@ -264,8 +264,8 @@
session.insert( new Person("Michael") );
- session = SerializationHelper.getSerialisedStatefulSession( session,
- ruleBase );
+// session = SerializationHelper.getSerialisedStatefulSession( session,
+// ruleBase );
results = (List) session.getGlobal( "results" );
session.fireAllRules();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/MultithreadTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,7 +18,15 @@
package org.drools.integrationtests;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Queue;
+import java.util.Vector;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
import junit.framework.TestCase;
+
import org.drools.Child;
import org.drools.GrandParent;
import org.drools.Order;
@@ -28,13 +36,6 @@
import org.drools.StatefulSession;
import org.drools.compiler.PackageBuilder;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Queue;
-import java.util.Vector;
-import java.util.concurrent.ConcurrentLinkedQueue;
-
/**
* This is a test case for multi-thred issues
*
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/OutOfMemoryTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,7 +16,10 @@
* limitations under the License.
*/
+import java.io.InputStreamReader;
+
import junit.framework.TestCase;
+
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
@@ -27,9 +30,7 @@
import org.drools.rule.Package;
import org.drools.WorkingMemory;
-import java.io.InputStreamReader;
-
/** Run all the tests with the ReteOO engine implementation */
public class OutOfMemoryTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/RulebasePartitioningTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/RulebasePartitioningTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/RulebasePartitioningTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,15 +15,20 @@
*/
package org.drools.integrationtests;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
+
+import org.drools.Cheese;
+import org.drools.Person;
+import org.drools.RuleBase;
+import org.drools.RuleBaseConfiguration;
+import org.drools.RuleBaseFactory;
+import org.drools.StatefulSession;
import org.drools.compiler.PackageBuilder;
-import org.drools.rule.*;
-import org.drools.*;
-import java.io.InputStreamReader;
-import java.util.List;
-import java.util.ArrayList;
-
/**
* @author: <a href="mailto:tirelli at post.com">Edson Tirelli</a>
*/
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessSessionTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,11 @@
package org.drools.integrationtests;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
+
import org.drools.Cheese;
import org.drools.Cheesery;
import org.drools.RuleBase;
@@ -15,10 +20,6 @@
import org.drools.rule.Package;
import org.drools.spi.GlobalResolver;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
public class StatelessSessionTest extends TestCase {
final List list = new ArrayList();
final Cheesery cheesery = new Cheesery();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessStressTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessStressTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/StatelessStressTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,19 +1,20 @@
package org.drools.integrationtests;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
import junit.framework.TestCase;
+
import org.drools.Address;
import org.drools.Person;
-import org.drools.rule.Package;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatelessSession;
import org.drools.compiler.PackageBuilder;
+import org.drools.rule.Package;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* This is for testing possible PermSpace issues (leaking) when spawning lots of sessions in concurrent threads.
* Normally this test will be XXX'ed out, as when running it will not terminate.
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/TruthMaintenanceTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,12 @@
package org.drools.integrationtests;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
import junit.framework.TestCase;
+
import org.drools.Cheese;
import org.drools.CheeseEqual;
import org.drools.KnowledgeBase;
@@ -11,6 +17,7 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.Sensor;
+import org.drools.WorkingMemory;
import org.drools.builder.KnowledgeBuilder;
import org.drools.builder.KnowledgeBuilderFactory;
import org.drools.common.InternalWorkingMemory;
@@ -26,15 +33,8 @@
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;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
public class TruthMaintenanceTest extends TestCase {
protected RuleBase getRuleBase() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/eventgenerator/SimpleEventGeneratorTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,12 @@
package org.drools.integrationtests.eventgenerator;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.Reader;
+
import junit.framework.Assert;
import junit.framework.TestCase;
+
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.compiler.DrlParser;
@@ -13,11 +18,7 @@
import org.drools.rule.Package;
import org.drools.WorkingMemory;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.Reader;
-
public class SimpleEventGeneratorTest extends TestCase {
private final static String TEST_RULE_FILE = "test_eventGenerator.drl";
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/sequential/SequentialTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/sequential/SequentialTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/sequential/SequentialTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,24 +1,25 @@
package org.drools.integrationtests.sequential;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
import junit.framework.TestCase;
+
import org.drools.Cheese;
import org.drools.Person;
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatelessSession;
-import org.drools.integrationtests.SerializationHelper;
-import org.drools.integrationtests.DynamicRulesTest;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
+import org.drools.integrationtests.DynamicRulesTest;
+import org.drools.integrationtests.SerializationHelper;
import org.drools.rule.Package;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Properties;
-
public class SequentialTest extends TestCase {
public void testBasicOperation() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -67,7 +67,6 @@
import org.drools.lang.descr.TypeDeclarationDescr;
import org.drools.lang.descr.TypeFieldDescr;
import org.drools.lang.descr.VariableRestrictionDescr;
-import org.drools.rule.Behavior;
public class RuleParserTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestDRL.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestDRL.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestDRL.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,11 +1,20 @@
package org.drools.lang;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
import junit.framework.TestCase;
-import java.io.*;
-import java.lang.reflect.*;
-import org.antlr.runtime.*;
-import org.antlr.runtime.tree.*;
+import org.antlr.runtime.ANTLRFileStream;
+import org.antlr.runtime.ANTLRStringStream;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.tree.CommonTree;
+
public class TestDRL extends TestCase {
String stdout;
String stderr;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/TestTree2TestDRL.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,11 +1,21 @@
package org.drools.lang;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.io.PrintStream;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
import junit.framework.TestCase;
-import java.io.*;
-import java.lang.reflect.*;
-import org.antlr.runtime.*;
-import org.antlr.runtime.tree.*;
+import org.antlr.runtime.ANTLRFileStream;
+import org.antlr.runtime.ANTLRStringStream;
+import org.antlr.runtime.CharStream;
+import org.antlr.runtime.CommonTokenStream;
+import org.antlr.runtime.tree.CommonTree;
+import org.antlr.runtime.tree.CommonTreeNodeStream;
+
public class TestTree2TestDRL extends TestCase {
String stdout;
String stderr;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/Tree2TestDRL.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/Tree2TestDRL.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/Tree2TestDRL.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,10 +3,14 @@
package org.drools.lang;
-import org.antlr.runtime.*;
-import org.antlr.runtime.tree.*;import java.util.Stack;
-import java.util.List;
-import java.util.ArrayList;
+import org.antlr.runtime.BitSet;
+import org.antlr.runtime.EarlyExitException;
+import org.antlr.runtime.MismatchedSetException;
+import org.antlr.runtime.NoViableAltException;
+import org.antlr.runtime.RecognitionException;
+import org.antlr.runtime.Token;
+import org.antlr.runtime.tree.TreeNodeStream;
+import org.antlr.runtime.tree.TreeParser;
public class Tree2TestDRL extends TreeParser {
public static final String[] tokenNames = new String[] {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/MockRightTupleSink.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/MockRightTupleSink.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/MockRightTupleSink.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,10 @@
package org.drools.reteoo;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
import org.drools.common.InternalWorkingMemory;
import org.drools.common.RuleBasePartitionId;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderPerformanceTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderPerformanceTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderPerformanceTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,18 +1,18 @@
package org.drools.reteoo;
-import org.drools.integrationtests.LargeRuleBase;
+import java.io.StringReader;
+
+import junit.framework.TestCase;
+
+import org.drools.RuleBaseConfiguration;
import org.drools.compiler.DrlParser;
+import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilderConfiguration;
+import org.drools.integrationtests.LargeRuleBase;
import org.drools.lang.descr.PackageDescr;
-import org.drools.RuleBaseConfiguration;
-
-import java.io.StringReader;
-
import org.drools.rule.Package;
import org.drools.rule.Rule;
-import junit.framework.TestCase;
/**
* Created by IntelliJ IDEA. User: SG0521861 Date: Mar 20, 2008 Time: 2:36:47 PM To change this template use File |
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AccumulateTemplateTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AccumulateTemplateTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/AccumulateTemplateTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,12 +15,12 @@
import org.drools.rule.Declaration;
import org.drools.spi.PatternExtractor;
import org.drools.util.StringUtils;
-import org.mvel.integration.impl.MapVariableResolverFactory;
-import org.mvel.templates.CompiledTemplate;
-import org.mvel.templates.SimpleTemplateRegistry;
-import org.mvel.templates.TemplateCompiler;
-import org.mvel.templates.TemplateRegistry;
-import org.mvel.templates.TemplateRuntime;
+import org.mvel2.integration.impl.MapVariableResolverFactory;
+import org.mvel2.templates.CompiledTemplate;
+import org.mvel2.templates.SimpleTemplateRegistry;
+import org.mvel2.templates.TemplateCompiler;
+import org.mvel2.templates.TemplateRegistry;
+import org.mvel2.templates.TemplateRuntime;
public class AccumulateTemplateTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaActionBuilderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -12,7 +12,6 @@
import org.drools.compiler.DialectCompiletimeRegistry;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.compiler.PackageRegistry;
import org.drools.lang.descr.ActionDescr;
import org.drools.lang.descr.ProcessDescr;
import org.drools.rule.Package;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/JavaConsequenceBuilderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,9 @@
package org.drools.rule.builder.dialect.java;
+import java.util.Set;
+
import junit.framework.TestCase;
+
import org.antlr.runtime.RecognitionException;
import org.drools.Cheese;
import org.drools.base.ClassObjectType;
@@ -15,8 +18,6 @@
import org.drools.rule.Rule;
import org.drools.rule.builder.RuleBuildContext;
-import java.util.Set;
-
public class JavaConsequenceBuilderTest extends TestCase {
private JavaConsequenceBuilder builder;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/java/RuleBuilderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -33,7 +33,6 @@
import org.drools.compiler.DrlParser;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
-import org.drools.compiler.PackageRegistry;
import org.drools.lang.descr.AttributeDescr;
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.descr.RuleDescr;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/InstrumentedBuildContent.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/InstrumentedBuildContent.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/InstrumentedBuildContent.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -6,7 +6,6 @@
import org.drools.compiler.Dialect;
import org.drools.compiler.DialectCompiletimeRegistry;
import org.drools.compiler.PackageBuilder;
-import org.drools.compiler.PackageBuilderConfiguration;
import org.drools.lang.descr.RuleDescr;
import org.drools.rule.Package;
import org.drools.rule.builder.RuleBuildContext;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELAccumulateBuilderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,5 @@
package org.drools.rule.builder.dialect.mvel;
-import java.util.HashMap;
-import java.util.Map;
-
import junit.framework.TestCase;
import org.drools.Cheese;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -30,7 +30,6 @@
import org.drools.lang.descr.RuleDescr;
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.MockLeftTupleSink;
-import org.drools.reteoo.ReteooRuleBase;
import org.drools.rule.Declaration;
import org.drools.rule.GroupElement;
import org.drools.rule.Package;
@@ -41,8 +40,9 @@
import org.drools.WorkingMemory;
import org.drools.spi.ObjectType;
import org.drools.spi.PatternExtractor;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
+import org.mvel2.debug.DebugTools;
public class MVELConsequenceBuilderTest extends TestCase {
@@ -271,7 +271,7 @@
MVELConsequence mvelCons = (MVELConsequence) rule.getConsequence();
mvelCons.compile( Thread.currentThread().getContextClassLoader() );
- String s = org.mvel.debug.DebugTools.decompile( mvelCons.getCompExpr() );
+ String s = DebugTools.decompile( mvelCons.getCompExpr() );
int fromIndex = 0;
int count = 0;
@@ -303,7 +303,7 @@
Serializable compiledExpression = compiler.compile( context );
- String s = org.mvel.debug.DebugTools.decompile( compiledExpression );
+ String s = DebugTools.decompile( compiledExpression );
System.out.println( "s " + s );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactDataTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactDataTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactDataTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,11 +2,11 @@
import java.util.ArrayList;
+import junit.framework.TestCase;
+
import org.drools.guvnor.client.modeldriven.testing.FactData;
import org.drools.guvnor.client.modeldriven.testing.FieldData;
-import junit.framework.TestCase;
-
public class FactDataTest extends TestCase {
public void testAdd() {
FactData fd = new FactData("x", "y", new ArrayList(), false );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactPopulatorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactPopulatorTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/FactPopulatorTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -5,7 +5,7 @@
import junit.framework.TestCase;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
public class FactPopulatorTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/MockFactHandle.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,11 +1,12 @@
package org.drools.testframework;
-import org.drools.runtime.rule.FactHandle;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.runtime.rule.FactHandle;
+
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleCoverageListenerTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,6 +3,8 @@
import java.util.Collection;
import java.util.HashSet;
+import junit.framework.TestCase;
+
import org.drools.common.ActivationGroupNode;
import org.drools.common.LogicalDependency;
import org.drools.common.RuleFlowGroupNode;
@@ -16,8 +18,6 @@
import org.drools.spi.Tuple;
import org.drools.util.LinkedList;
-import junit.framework.TestCase;
-
public class RuleCoverageListenerTest extends TestCase {
public void testCoverage() throws Exception {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleUnit.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleUnit.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/RuleUnit.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,14 +3,14 @@
import java.io.IOException;
import java.io.InputStreamReader;
+import junit.framework.TestCase;
+
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.compiler.DroolsParserException;
import org.drools.compiler.PackageBuilder;
-import junit.framework.TestCase;
-
/**
* A class with some utilities for testing rules.
* @author Michael Neale
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/testframework/ScenarioRunnerTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,7 +2,6 @@
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -12,11 +11,10 @@
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;
-import org.drools.base.mvel.MVELCalendarCoercion;
-import org.drools.base.mvel.MVELDateCoercion;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
import org.drools.guvnor.client.modeldriven.testing.ExecutionTrace;
@@ -30,8 +28,6 @@
import org.drools.guvnor.client.modeldriven.testing.VerifyRuleFired;
import org.drools.guvnor.server.util.ScenarioXMLPersistence;
import org.drools.rule.TimeMachine;
-import org.drools.WorkingMemory;
-import org.mvel.DataConversion;
public class ScenarioRunnerTest extends RuleUnit {
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/TestXmlDsl.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/TestXmlDsl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/xml/TestXmlDsl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -4,15 +4,15 @@
import java.util.List;
import java.util.Properties;
+import junit.framework.TestCase;
+
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
import org.drools.compiler.PackageBuilder;
import org.drools.compiler.PackageBuilderConfiguration;
-import junit.framework.TestCase;
-
public class TestXmlDsl extends TestCase {
public void testSimpleDsl() throws Exception {
Properties properties = new Properties();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_dsl_multiline.dsl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_dsl_multiline.dsl 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_dsl_multiline.dsl 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,5 +1 @@
-#some description
-[keyword]Add {x} percent \nto all {c} cars=when Car(color=="{c}") then doSomething();
-
-
-
+[keyword][]Add {x} percent \nto all {c} cars=when Car(color=="{c}") then doSomething();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_enabledExpression.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_enabledExpression.drl 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_enabledExpression.drl 2008-10-31 14:28:13 UTC (rev 23650)
@@ -5,7 +5,7 @@
rule "Test enabled expression 1"
@ruleID(1234)
#arbitrary expression using a rule metadata
- enabled ( "1234".equals( this.getMetaAttribute("ruleID") ) )
+ enabled ( rule.metaAttributes["ruleID"] == "1234" )
when
Person(name == "Michael")
then
Modified: labs/jbossrules/trunk/drools-core/pom.xml
===================================================================
--- labs/jbossrules/trunk/drools-core/pom.xml 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/pom.xml 2008-10-31 14:28:13 UTC (rev 23650)
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.mvel</groupId>
- <artifactId>mvel</artifactId>
+ <artifactId>mvel2</artifactId>
</dependency>
<dependency>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/InitialFact.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/InitialFact.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/InitialFact.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,6 @@
package org.drools;
import java.io.Serializable;
-import java.io.Externalizable;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ProcessIntegrationException.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ProcessIntegrationException.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ProcessIntegrationException.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,7 +17,6 @@
*/
import org.drools.knowledge.definitions.process.Process;
-import org.drools.rule.Rule;
/**
* Indicates an error integrating a <code>Process</code> or <code>Package</code>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/QueryResult.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/QueryResult.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/QueryResult.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,7 +17,6 @@
import java.util.Map;
-import org.drools.base.ShadowProxy;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.rule.Declaration;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBase.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBase.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,9 +16,9 @@
* limitations under the License.
*/
+import java.io.Externalizable;
import java.io.IOException;
import java.io.InputStream;
-import java.io.Externalizable;
import java.io.OutputStream;
import org.drools.marshalling.Marshaller;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -53,7 +53,7 @@
import org.drools.workflow.core.Node;
import org.drools.workflow.instance.impl.NodeInstanceFactory;
import org.drools.workflow.instance.impl.NodeInstanceFactoryRegistry;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
/**
* RuleBaseConfiguration
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseEventManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseEventManager.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseEventManager.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.io.Externalizable;
import java.util.List;
import org.drools.event.RuleBaseEventListener;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/StatelessSession.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/StatelessSession.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/StatelessSession.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,11 +1,7 @@
package org.drools;
import java.util.Collection;
-import java.util.List;
-import org.drools.event.AgendaEventListener;
-import org.drools.event.RuleFlowEventListener;
-import org.drools.event.WorkingMemoryEventListener;
import org.drools.spi.AgendaFilter;
import org.drools.spi.GlobalExporter;
import org.drools.spi.GlobalResolver;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEntryPoint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,7 +17,6 @@
*/
package org.drools;
-import java.io.Serializable;
import org.drools.runtime.rule.FactHandle;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEventManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEventManager.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/WorkingMemoryEventManager.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.io.Externalizable;
import java.util.List;
import org.drools.event.AgendaEventListener;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/DirectoryScanner.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/DirectoryScanner.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/DirectoryScanner.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,15 +2,11 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
-import org.drools.RuleBase;
-import org.drools.rule.Package;
-
/**
* This will scan a directory for files to watch for a change. It will update
* the list of files only if they number of files in a directory changes.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/PackageProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/PackageProvider.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/PackageProvider.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,9 +1,7 @@
package org.drools.agent;
-import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
-import java.util.List;
import java.util.Properties;
import org.drools.RuleBase;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/agent/URLScanner.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,13 +3,11 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.io.UnsupportedEncodingException;
import java.io.ObjectOutput;
+import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLEncoder;
-import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryConsoleLogger.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,13 +1,13 @@
package org.drools.audit;
-import org.drools.WorkingMemoryEventManager;
-import org.drools.audit.event.LogEvent;
-import org.drools.WorkingMemory;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.drools.WorkingMemoryEventManager;
+import org.drools.audit.event.LogEvent;
+
public class WorkingMemoryConsoleLogger extends WorkingMemoryLogger {
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryFileLogger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryFileLogger.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryFileLogger.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-import com.thoughtworks.xstream.XStream;
-import org.drools.WorkingMemoryEventManager;
-import org.drools.audit.event.LogEvent;
-
import java.io.FileNotFoundException;
import java.io.FileWriter;
import java.io.IOException;
@@ -28,6 +24,11 @@
import java.util.ArrayList;
import java.util.List;
+import org.drools.WorkingMemoryEventManager;
+import org.drools.audit.event.LogEvent;
+
+import com.thoughtworks.xstream.XStream;
+
/**
* A logger of events generated by a working memory.
* It stores its information in a file that can be specified.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/WorkingMemoryInMemoryLogger.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-import com.thoughtworks.xstream.XStream;
-import org.drools.WorkingMemoryEventManager;
-import org.drools.audit.event.LogEvent;
-import org.drools.WorkingMemory;
import java.io.IOException;
import java.io.ObjectInput;
@@ -29,6 +25,11 @@
import java.util.ArrayList;
import java.util.List;
+import org.drools.WorkingMemoryEventManager;
+import org.drools.audit.event.LogEvent;
+
+import com.thoughtworks.xstream.XStream;
+
/**
* A logger of events generated by a working memory.
* It stores its information in memory, so it can be retrieved later.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/event/ActivationLogEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/event/ActivationLogEvent.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/event/ActivationLogEvent.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,7 @@
package org.drools.audit.event;
+import java.io.IOException;
import java.io.ObjectInput;
-import java.io.IOException;
import java.io.ObjectOutput;
/*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/event/LogEvent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/event/LogEvent.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/audit/event/LogEvent.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,7 @@
package org.drools.audit.event;
-import java.io.Externalizable;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
/*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/AsyncFireAllRulesRuleBaseUpdateListener.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/AsyncFireAllRulesRuleBaseUpdateListener.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/AsyncFireAllRulesRuleBaseUpdateListener.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -4,7 +4,6 @@
package org.drools.base;
import org.drools.StatefulSession;
-import org.drools.common.InternalWorkingMemory;
import org.drools.event.DefaultRuleBaseEventListener;
import org.drools.event.knowledgebase.BeforeKnowledgeBaseUnlockedEvent;
import org.drools.spi.RuleBaseUpdateListener;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseClassFieldReader.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseClassFieldReader.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseClassFieldReader.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,10 +16,6 @@
* limitations under the License.
*/
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
import org.drools.RuntimeDroolsException;
import org.drools.util.ClassUtils;
import org.drools.util.asm.ClassFieldInspector;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseEvaluator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/BaseEvaluator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,15 +16,15 @@
* limitations under the License.
*/
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.base.evaluators.Operator;
import org.drools.common.InternalFactHandle;
import org.drools.spi.Evaluator;
-import java.io.Externalizable;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-
/**
* BaseEvaluator is an Object Comparator that is operator aware
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorCache.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorCache.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorCache.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,24 +1,11 @@
package org.drools.base;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.security.ProtectionDomain;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import java.util.WeakHashMap;
-import java.util.Map.Entry;
import org.drools.RuntimeDroolsException;
-import org.drools.spi.AcceptsReadAccessor;
-import org.drools.spi.AcceptsWriteAccessor;
-import org.drools.spi.Constraint;
-import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.ReadAccessor;
import org.drools.util.asm.ClassFieldInspector;
public class ClassFieldAccessorCache {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -20,7 +20,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.security.ProtectionDomain;
-import java.util.HashMap;
import java.util.Map;
import org.drools.RuntimeDroolsException;
@@ -29,6 +28,8 @@
import org.drools.asm.MethodVisitor;
import org.drools.asm.Opcodes;
import org.drools.asm.Type;
+import org.drools.base.ClassFieldAccessorCache.ByteArrayClassLoader;
+import org.drools.base.ClassFieldAccessorCache.CacheEntry;
import org.drools.base.extractors.BaseBooleanClassFieldReader;
import org.drools.base.extractors.BaseBooleanClassFieldWriter;
import org.drools.base.extractors.BaseByteClassFieldReader;
@@ -50,8 +51,6 @@
import org.drools.base.extractors.MVELClassFieldReader;
import org.drools.base.extractors.SelfReferenceClassFieldReader;
import org.drools.common.InternalWorkingMemory;
-import org.drools.base.ClassFieldAccessorCache.ByteArrayClassLoader;
-import org.drools.base.ClassFieldAccessorCache.CacheEntry;
import org.drools.util.asm.ClassFieldInspector;
/**
@@ -149,7 +148,7 @@
} catch ( final RuntimeDroolsException e ) {
throw e;
} catch ( final Exception e ) {
- e.printStackTrace();
+// e.printStackTrace();
throw new RuntimeDroolsException( e );
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorStore.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorStore.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldAccessorStore.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -4,32 +4,19 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Serializable;
-import java.security.ProtectionDomain;
-import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.IdentityHashMap;
import java.util.Map;
import java.util.Set;
-import java.util.WeakHashMap;
import java.util.Map.Entry;
import org.drools.RuntimeDroolsException;
import org.drools.base.AccessorKey.AccessorType;
-import org.drools.rule.Declaration;
import org.drools.spi.Acceptor;
import org.drools.spi.AcceptsClassObjectType;
import org.drools.spi.AcceptsReadAccessor;
import org.drools.spi.AcceptsWriteAccessor;
-import org.drools.spi.Constraint;
-import org.drools.spi.GlobalExtractor;
-import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.ObjectType;
-import org.drools.spi.PatternExtractor;
-import org.drools.spi.ReadAccessor;
-import org.drools.util.asm.ClassFieldInspector;
public class ClassFieldAccessorStore
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldReader.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldReader.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldReader.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -22,11 +22,8 @@
import java.io.ObjectOutput;
import java.lang.reflect.Method;
-import org.drools.RuntimeDroolsException;
-import org.drools.common.DroolsObjectInput;
import org.drools.common.InternalWorkingMemory;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.ReadAccessor;
import org.drools.util.ClassUtils;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldWriter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldWriter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassFieldWriter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -21,9 +21,6 @@
import java.io.ObjectOutput;
import java.lang.reflect.Method;
-import org.drools.RuntimeDroolsException;
-import org.drools.common.DroolsObjectInput;
-import org.drools.spi.InternalReadAccessor;
import org.drools.spi.WriteAccessor;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassObjectType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassObjectType.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ClassObjectType.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-import org.drools.RuntimeDroolsException;
-import org.drools.common.DroolsObjectInputStream;
-import org.drools.spi.ObjectType;
-
-import java.io.ObjectInput;
+import java.io.Externalizable;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Externalizable;
+import org.drools.RuntimeDroolsException;
+import org.drools.spi.ObjectType;
+
/**
* Java class semantics <code>ObjectType</code>.
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/CopyIdentifiersGlobalExporter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/CopyIdentifiersGlobalExporter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/CopyIdentifiersGlobalExporter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,11 +3,11 @@
*/
package org.drools.base;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.common.InternalRuleBase;
import org.drools.WorkingMemory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultConsequenceExceptionHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultConsequenceExceptionHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultConsequenceExceptionHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,15 +1,15 @@
package org.drools.base;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.WorkingMemory;
import org.drools.spi.Activation;
import org.drools.spi.ConsequenceException;
import org.drools.spi.ConsequenceExceptionHandler;
-import java.io.Externalizable;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
public class DefaultConsequenceExceptionHandler implements ConsequenceExceptionHandler, Externalizable {
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/DefaultKnowledgeHelper.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,6 +16,11 @@
* limitations under the License.
*/
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.FactException;
import org.drools.common.InternalWorkingMemoryActions;
import org.drools.impl.StatefulKnowledgeSessionImpl;
@@ -30,11 +35,6 @@
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.Tuple;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-
public class DefaultKnowledgeHelper
implements
KnowledgeHelper, Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/EnabledBoolean.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/EnabledBoolean.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/EnabledBoolean.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -6,6 +6,7 @@
import java.io.ObjectOutput;
import org.drools.WorkingMemory;
+import org.drools.rule.Rule;
import org.drools.spi.Enabled;
import org.drools.spi.Tuple;
@@ -41,6 +42,7 @@
}
public boolean getValue(final Tuple tuple,
+ final Rule rule,
final WorkingMemory workingMemory) {
return this.value;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/FireAllRulesRuleBaseUpdateListener.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/FireAllRulesRuleBaseUpdateListener.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/FireAllRulesRuleBaseUpdateListener.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -4,9 +4,9 @@
package org.drools.base;
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.IOException;
import org.drools.StatefulSession;
import org.drools.event.BeforeRuleBaseUnlockedEvent;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/MapGlobalResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/MapGlobalResolver.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/MapGlobalResolver.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,11 +1,11 @@
package org.drools.base;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.spi.GlobalResolver;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ModifyInterceptor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ModifyInterceptor.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ModifyInterceptor.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,17 +1,16 @@
package org.drools.base;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import org.drools.base.mvel.DroolsMVELKnowledgeHelper;
import org.drools.spi.KnowledgeHelper;
-import org.mvel.ast.ASTNode;
-import org.mvel.ast.WithNode;
-import org.mvel.integration.Interceptor;
-import org.mvel.integration.VariableResolverFactory;
+import org.mvel2.ast.ASTNode;
+import org.mvel2.ast.WithNode;
+import org.mvel2.integration.Interceptor;
+import org.mvel2.integration.VariableResolverFactory;
public class ModifyInterceptor
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ReferenceOriginalGlobalExporter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ReferenceOriginalGlobalExporter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ReferenceOriginalGlobalExporter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,14 +3,14 @@
*/
package org.drools.base;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.WorkingMemory;
import org.drools.spi.GlobalExporter;
import org.drools.spi.GlobalResolver;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-
/**
* This implementation does nothing other than pass by reference the original GlobalResolver as used in the StatelessSession.
* Care should be taken if you use this strategy, as later executes may change those globals. The GlobalResolver of the StatelessSession
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SalienceInteger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SalienceInteger.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SalienceInteger.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,14 +1,14 @@
package org.drools.base;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.WorkingMemory;
import org.drools.spi.Salience;
import org.drools.spi.Tuple;
-import java.io.Externalizable;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-
public class SalienceInteger
implements
Salience, Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/SequentialKnowledgeHelper.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,10 +16,7 @@
* limitations under the License.
*/
-import java.util.List;
-
import org.drools.FactException;
-import org.drools.QueryResults;
import org.drools.common.InternalWorkingMemoryActions;
import org.drools.impl.StatefulKnowledgeSessionImpl;
import org.drools.reteoo.ReteooStatefulSession;
@@ -30,7 +27,6 @@
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;
import org.drools.spi.Tuple;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ValueType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ValueType.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/ValueType.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,9 +1,9 @@
package org.drools.base;
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.util.Date;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/AverageAccumulateFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/AverageAccumulateFunction.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/AverageAccumulateFunction.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,10 +17,10 @@
*/
package org.drools.base.accumulators;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.Externalizable;
import java.io.Serializable;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/CountAccumulateFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/CountAccumulateFunction.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/CountAccumulateFunction.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,10 +17,10 @@
*/
package org.drools.base.accumulators;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.Externalizable;
import java.io.Serializable;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/MVELAccumulatorFunctionExecutor.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -33,7 +33,7 @@
import org.drools.WorkingMemory;
import org.drools.spi.Accumulator;
import org.drools.spi.Tuple;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
/**
* An MVEL accumulator function executor implementation
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/MinAccumulateFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/MinAccumulateFunction.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/MinAccumulateFunction.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,9 +18,9 @@
package org.drools.base.accumulators;
import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import java.io.Serializable;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/SumAccumulateFunction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/SumAccumulateFunction.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/accumulators/SumAccumulateFunction.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,10 +17,10 @@
*/
package org.drools.base.accumulators;
-import java.io.ObjectOutput;
+import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
-import java.io.Externalizable;
+import java.io.ObjectOutput;
import java.io.Serializable;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/dataproviders/MVELDataProvider.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,24 +1,24 @@
package org.drools.base.dataproviders;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import org.drools.base.mvel.DroolsMVELFactory;
+import org.drools.base.mvel.MVELCompilationUnit;
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;
import org.drools.util.ArrayIterator;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
public class MVELDataProvider
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BeforeEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BeforeEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/BeforeEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'before' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'coincides' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ComparableEvaluatorsDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ComparableEvaluatorsDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/ComparableEvaluatorsDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -34,8 +34,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
import org.drools.util.DateUtils;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DuringEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DuringEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/DuringEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'during' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorCache.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorCache.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorCache.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,9 +17,6 @@
*/
package org.drools.base.evaluators;
-import org.drools.base.ValueType;
-import org.drools.spi.Evaluator;
-
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -27,6 +24,9 @@
import java.util.HashMap;
import java.util.Map;
+import org.drools.base.ValueType;
+import org.drools.spi.Evaluator;
+
/**
* A simple helper class to store Evaluators for a given set of
* value types and operators
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,11 +17,11 @@
*/
package org.drools.base.evaluators;
+import java.io.Externalizable;
+
import org.drools.base.ValueType;
import org.drools.spi.Evaluator;
-import java.io.Externalizable;
-
/**
* An evaluator definition interface that allows for pluggable
* evaluator implementation.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorRegistry.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/EvaluatorRegistry.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,15 +18,15 @@
package org.drools.base.evaluators;
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
-import java.io.IOException;
import java.io.ObjectOutput;
import java.util.HashMap;
import java.util.Map;
import org.drools.RuntimeDroolsException;
+import org.drools.base.ValueType;
import org.drools.common.DroolsObjectInput;
-import org.drools.base.ValueType;
import org.drools.spi.Evaluator;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FinishedByEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FinishedByEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FinishedByEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'finishedby' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FinishesEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FinishesEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/FinishesEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'finishes' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/IncludesEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/IncludesEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/IncludesEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'includes' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MatchesEvaluatorsDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MatchesEvaluatorsDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MatchesEvaluatorsDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,20 +17,19 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
import org.drools.common.InternalWorkingMemory;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
-import org.drools.spi.InternalReadAccessor;
import org.drools.spi.FieldValue;
+import org.drools.spi.InternalReadAccessor;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.util.Map;
-
/**
* This class defines the matches evaluator
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MeetsEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MeetsEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MeetsEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'meets' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MetByEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MetByEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/MetByEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'metby' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/OverlappedByEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/OverlappedByEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/OverlappedByEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'overlappedby' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/OverlapsEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/OverlapsEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/OverlapsEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'overlaps' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/SetEvaluatorsDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/SetEvaluatorsDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/SetEvaluatorsDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,10 @@
*/
package org.drools.base.evaluators;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
+import java.util.Collection;
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
@@ -30,8 +28,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
-import org.drools.spi.InternalReadAccessor;
import org.drools.spi.FieldValue;
+import org.drools.spi.InternalReadAccessor;
/**
* This class defines all the set built in
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/SoundslikeEvaluatorsDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/SoundslikeEvaluatorsDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/SoundslikeEvaluatorsDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,20 +17,20 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
import org.drools.common.InternalWorkingMemory;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
-import org.mvel.Soundex;
+import org.mvel2.util.Soundex;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-
/**
* This class defines the soundslike evaluator
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StartedByEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StartedByEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StartedByEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'startedby' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StartsEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StartsEvaluatorDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/evaluators/StartsEvaluatorDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,12 +17,12 @@
*/
package org.drools.base.evaluators;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
@@ -33,8 +33,8 @@
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
+import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.FieldValue;
/**
* The implementation of the 'starts' evaluator definition
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/extractors/ArrayElementReader.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/extractors/ArrayElementReader.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/extractors/ArrayElementReader.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,10 @@
package org.drools.base.extractors;
-import java.lang.reflect.Method;
import java.io.Externalizable;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
+import java.lang.reflect.Method;
import org.drools.base.ValueType;
import org.drools.common.InternalWorkingMemory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/extractors/MVELClassFieldReader.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/extractors/MVELClassFieldReader.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/extractors/MVELClassFieldReader.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,23 +17,19 @@
*/
package org.drools.base.extractors;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
import org.drools.base.AccessorKey;
-import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ValueType;
-import org.drools.common.InternalWorkingMemory;
import org.drools.base.ClassFieldAccessorCache.CacheEntry;
+import org.drools.common.InternalWorkingMemory;
import org.drools.spi.InternalReadAccessor;
-import org.mvel.MVEL;
-import org.mvel.compiler.CompiledExpression;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.MVEL;
+import org.mvel2.compiler.CompiledExpression;
+import org.mvel2.compiler.ExpressionCompiler;
/**
* A class field extractor that uses MVEL engine to extract the actual value for a given
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/BooleanFieldImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/BooleanFieldImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/BooleanFieldImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,18 +16,17 @@
package org.drools.base.field;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import org.drools.RuntimeDroolsException;
import org.drools.spi.FieldValue;
-import java.io.Externalizable;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-
/**
* @author etirelli
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/DoubleFieldImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/DoubleFieldImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/DoubleFieldImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,17 +1,16 @@
package org.drools.base.field;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import org.drools.RuntimeDroolsException;
import org.drools.spi.FieldValue;
-import java.io.Externalizable;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-
public class DoubleFieldImpl
implements
FieldValue, Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/LongFieldImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/LongFieldImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/field/LongFieldImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,17 +1,16 @@
package org.drools.base.field;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
import java.math.BigDecimal;
import java.math.BigInteger;
import org.drools.RuntimeDroolsException;
import org.drools.spi.FieldValue;
-import java.io.Externalizable;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-
public class LongFieldImpl
implements
FieldValue, Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,5 +1,5 @@
package org.drools.base.mvel;
-
+
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -7,18 +7,20 @@
import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-
+
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.CompileException;
-import org.mvel.integration.VariableResolver;
-import org.mvel.integration.impl.BaseVariableResolverFactory;
-import org.mvel.integration.impl.LocalVariableResolverFactory;
-import org.mvel.integration.impl.StaticMethodImportResolverFactory;
-
+import org.mvel2.CompileException;
+import org.mvel2.UnresolveablePropertyException;
+import org.mvel2.integration.VariableResolver;
+import org.mvel2.integration.impl.BaseVariableResolverFactory;
+import org.mvel2.integration.impl.LocalVariableResolverFactory;
+import org.mvel2.integration.impl.StaticMethodImportResolverFactory;
+import org.mvel2.integration.impl.MapVariableResolver;
+
public class DroolsMVELFactory extends BaseVariableResolverFactory
implements
DroolsGlobalVariableMVELFactory,
@@ -26,32 +28,32 @@
LocalVariableResolverFactory,
Externalizable,
Cloneable {
-
+
private static final long serialVersionUID = 400L;
-
+
/**
* Holds the instance of the variables.
*/
private Object[] tupleObjects;
-
+
private KnowledgeHelper knowledgeHelper;
-
+
private Object object;
-
+
private Map localDeclarations;
-
+
private Map previousDeclarations;
-
+
private Map globals;
-
+
private WorkingMemory workingMemory;
-
+
private Map localVariables;
-
+
public DroolsMVELFactory() {
-
+
}
-
+
public DroolsMVELFactory(final Map previousDeclarations,
final Map localDeclarations,
final Map globals) {
@@ -60,7 +62,7 @@
globals,
null);
}
-
+
public DroolsMVELFactory(final Map previousDeclarations,
final Map localDeclarations,
final Map globals,
@@ -68,14 +70,14 @@
this.previousDeclarations = previousDeclarations;
this.localDeclarations = localDeclarations;
this.globals = globals;
-
+
if (inputIdentifiers != null && MVELDebugHandler.isDebugMode()) {
for (int i = 0; i < inputIdentifiers.length; i++) {
isResolveable(inputIdentifiers[i]);
}
}
}
-
+
public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
tupleObjects = (Object[]) in.readObject();
@@ -87,7 +89,7 @@
workingMemory = (WorkingMemory) in.readObject();
localVariables = (Map) in.readObject();
}
-
+
public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(tupleObjects);
out.writeObject(knowledgeHelper);
@@ -98,7 +100,7 @@
out.writeObject(workingMemory);
out.writeObject(localVariables);
}
-
+
public static void addStaticImport(StaticMethodImportResolverFactory factory,
String staticImportEntry,
ClassLoader classLoader) {
@@ -106,7 +108,7 @@
String className = staticImportEntry.substring(0,
index);
String methodName = staticImportEntry.substring(index + 1);
-
+
try {
Class cls = classLoader.loadClass(className);
Method[] methods = cls.getDeclaredMethods();
@@ -121,21 +123,21 @@
catch (ClassNotFoundException e) {
throw new RuntimeException("Unable to dynamically load method '" + staticImportEntry + "'");
}
-
+
}
-
+
public Map getVariableResolvers() {
return this.variableResolvers;
}
-
+
public Object getObject() {
return this.object;
}
-
+
public WorkingMemory getWorkingMemory() {
return this.workingMemory;
}
-
+
public void setContext(final Tuple tuple,
final KnowledgeHelper knowledgeHelper,
final Object object,
@@ -159,24 +161,24 @@
this.localVariables = variables;
}
}
-
+
public KnowledgeHelper getKnowledgeHelper() {
return this.knowledgeHelper;
}
-
+
public Object getValue(final Declaration declaration) {
int i = declaration.getPattern().getOffset();
return this.tupleObjects[i];
}
-
+
public Object getValue(final String identifier) {
return this.workingMemory.getGlobal(identifier);
}
-
+
public Object getLocalValue(final String identifier) {
return this.localVariables.get(identifier);
}
-
+
public void setLocalValue(final String identifier,
final Object value) {
if (this.localVariables == null) {
@@ -185,38 +187,73 @@
this.localVariables.put(identifier,
value);
}
-
+
public VariableResolver createVariable(String name, Object value) {
+ VariableResolver vr;
+
try {
- VariableResolver vr = getVariableResolver(name);
- vr.setValue(value);
- return vr;
+ vr = getVariableResolver(name);
}
- catch (CompileException e) {
+ catch (UnresolveablePropertyException e) {
+ vr = null;
+ }
+
+ if (vr != null && vr.getType() != null) {
+ throw new CompileException("variable already defined within scope: " + vr.getType() + " " + name);
+ }
+ else {
return addResolver(name, new LocalVariableResolver(this, name), value);
}
}
-
+
public VariableResolver createVariable(String name,
Object value,
Class type) {
-
+
+
+ VariableResolver vr;
+
try {
- VariableResolver vr = getVariableResolver(name);
- vr.setValue(value);
- return vr;
+ vr = getVariableResolver(name);
}
- catch (CompileException e) {
+ catch (UnresolveablePropertyException e) {
+ vr = null;
+ }
+
+ if (vr != null && vr.getType() != null) {
+ throw new CompileException("variable already defined within scope: " + vr.getType() + " " + name);
+ }
+ else {
return addResolver(name, new LocalVariableResolver(this, name, type), value);
}
+
}
-
+
+ @Override
+ public VariableResolver createIndexedVariable(int index,
+ String name,
+ Object value) {
+ return super.createIndexedVariable(index,
+ name,
+ value);
+ }
+
+ @Override
+ public VariableResolver createIndexedVariable(int index,
+ String name,
+ Object value,
+ Class<?> type) {
+ return super.createIndexedVariable(index,
+ name,
+ value,
+ type);
+ }
+
public boolean isResolveable(String name) {
if (DroolsMVELKnowledgeHelper.DROOLS.equals(name)) {
addResolver(DroolsMVELKnowledgeHelper.DROOLS,
new DroolsMVELKnowledgeHelper(this));
return true;
-
}
else if (this.variableResolvers != null && this.variableResolvers.containsKey(name)) {
return true;
@@ -243,10 +280,10 @@
else if (nextFactory != null) {
return nextFactory.isResolveable(name);
}
-
+
return false;
}
-
+
public VariableResolver addResolver(String name,
VariableResolver vr,
Object value) {
@@ -257,7 +294,7 @@
vr.setValue(value);
return vr;
}
-
+
public VariableResolver addResolver(String name,
VariableResolver vr) {
if (this.variableResolvers == null) {
@@ -266,7 +303,7 @@
this.variableResolvers.put(name, vr);
return vr;
}
-
+
public boolean isTarget(String name) {
if (this.variableResolvers != null) {
return this.variableResolvers.containsKey(name);
@@ -275,34 +312,34 @@
return false;
}
}
-
+
public Object clone() {
return new DroolsMVELFactory(this.previousDeclarations,
this.localDeclarations,
this.globals);
}
-
+
/**
* @return the localDeclarations
*/
public Map getLocalDeclarations() {
return localDeclarations;
}
-
+
/**
* @return the previousDeclarations
*/
public Map getPreviousDeclarations() {
return previousDeclarations;
}
-
+
/**
* @return the globals
*/
protected Map getGlobals() {
return globals;
}
-
+
/**
* @return the localVariables
*/
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELGlobalVariable.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELGlobalVariable.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELGlobalVariable.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,12 +1,11 @@
package org.drools.base.mvel;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
-import org.mvel.integration.VariableResolver;
+import org.mvel2.integration.VariableResolver;
public class DroolsMVELGlobalVariable
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELKnowledgeHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELKnowledgeHelper.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELKnowledgeHelper.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,13 +1,12 @@
package org.drools.base.mvel;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import org.drools.spi.KnowledgeHelper;
-import org.mvel.integration.VariableResolver;
+import org.mvel2.integration.VariableResolver;
public class DroolsMVELKnowledgeHelper
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELLocalDeclarationVariable.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELLocalDeclarationVariable.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELLocalDeclarationVariable.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -7,7 +7,7 @@
import org.drools.common.InternalWorkingMemory;
import org.drools.rule.Declaration;
-import org.mvel.integration.VariableResolver;
+import org.mvel2.integration.VariableResolver;
public class DroolsMVELLocalDeclarationVariable
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELPreviousDeclarationVariable.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELPreviousDeclarationVariable.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELPreviousDeclarationVariable.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,13 +1,13 @@
package org.drools.base.mvel;
import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import org.drools.common.InternalWorkingMemory;
import org.drools.rule.Declaration;
-import org.mvel.integration.VariableResolver;
+import org.mvel2.integration.VariableResolver;
public class DroolsMVELPreviousDeclarationVariable
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELShadowFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELShadowFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsMVELShadowFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,13 +1,13 @@
package org.drools.base.mvel;
-import org.mvel.integration.VariableResolver;
-
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.util.Map;
import java.util.Set;
+import org.mvel2.integration.VariableResolver;
+
public class DroolsMVELShadowFactory extends DroolsMVELFactory {
private static final long serialVersionUID = 400L;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/DroolsProcessMVELFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -5,23 +5,16 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.lang.reflect.Method;
-import java.util.Calendar;
-import java.util.Date;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-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;
-import org.mvel.integration.VariableResolver;
-import org.mvel.integration.impl.BaseVariableResolverFactory;
-import org.mvel.integration.impl.LocalVariableResolverFactory;
-import org.mvel.integration.impl.StaticMethodImportResolverFactory;
+import org.mvel2.integration.VariableResolver;
+import org.mvel2.integration.impl.BaseVariableResolverFactory;
+import org.mvel2.integration.impl.LocalVariableResolverFactory;
+import org.mvel2.integration.impl.StaticMethodImportResolverFactory;
public class DroolsProcessMVELFactory extends BaseVariableResolverFactory
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/LocalVariableResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/LocalVariableResolver.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/LocalVariableResolver.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,12 +18,10 @@
*/
package org.drools.base.mvel;
-import org.mvel.CompileException;
-import org.mvel.DataConversion;
-import org.mvel.integration.VariableResolver;
+import org.mvel2.CompileException;
+import org.mvel2.DataConversion;
+import org.mvel2.integration.VariableResolver;
-import java.util.Map;
-
public class LocalVariableResolver implements VariableResolver {
private String name;
private Class knownType;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAccumulator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -32,7 +32,7 @@
import org.drools.WorkingMemory;
import org.drools.spi.Accumulator;
import org.drools.spi.Tuple;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
/**
* An MVEL accumulator implementation
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELAction.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -13,10 +13,10 @@
import org.drools.spi.Action;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.ProcessContext;
-import org.mvel.MVEL;
-import org.mvel.compiler.CompiledExpression;
-import org.mvel.debug.DebugTools;
-import org.mvel.integration.impl.SimpleValueResolver;
+import org.mvel2.MVEL;
+import org.mvel2.compiler.CompiledExpression;
+import org.mvel2.debug.DebugTools;
+import org.mvel2.integration.impl.SimpleValueResolver;
public class MVELAction
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCalendarCoercion.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCalendarCoercion.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCalendarCoercion.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,7 +3,7 @@
import java.util.Calendar;
import org.drools.util.DateUtils;
-import org.mvel.ConversionHandler;
+import org.mvel2.ConversionHandler;
public class MVELCalendarCoercion implements ConversionHandler {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELCompilationUnit.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,10 +18,10 @@
import org.drools.base.ModifyInterceptor;
import org.drools.rule.Declaration;
import org.drools.spi.KnowledgeHelper;
-import org.mvel.DataConversion;
-import org.mvel.ParserContext;
-import org.mvel.compiler.AbstractParser;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.DataConversion;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.AbstractParser;
+import org.mvel2.compiler.ExpressionCompiler;
public class MVELCompilationUnit
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELConsequence.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -12,9 +12,9 @@
import org.drools.rule.Package;
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
-import org.mvel.MVEL;
-import org.mvel.compiler.CompiledExpression;
-import org.mvel.debug.DebugTools;
+import org.mvel2.MVEL;
+import org.mvel2.compiler.CompiledExpression;
+import org.mvel2.debug.DebugTools;
public class MVELConsequence implements Consequence, MVELCompileable,
Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDateCoercion.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDateCoercion.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDateCoercion.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,7 +3,7 @@
import java.util.Date;
import org.drools.util.DateUtils;
-import org.mvel.ConversionHandler;
+import org.mvel2.ConversionHandler;
public class MVELDateCoercion implements ConversionHandler {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDebugHandler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDebugHandler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELDebugHandler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,8 @@
package org.drools.base.mvel;
-import org.mvel.MVELRuntime;
-import org.mvel.debug.Debugger;
-import org.mvel.debug.Frame;
+import org.mvel2.MVELRuntime;
+import org.mvel2.debug.Debugger;
+import org.mvel2.debug.Frame;
/**
* Debug Handler for MVEL dialect.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEnabledExpression.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -5,15 +5,16 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
import org.drools.WorkingMemory;
-import org.drools.base.DefaultKnowledgeHelper;
import org.drools.rule.MVELDialectRuntimeData;
import org.drools.rule.Package;
+import org.drools.rule.Rule;
import org.drools.spi.Enabled;
-import org.drools.spi.KnowledgeHelper;
import org.drools.spi.Tuple;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
public class MVELEnabledExpression
implements
@@ -55,15 +56,16 @@
}
public boolean getValue(final Tuple tuple,
+ final Rule rule,
final WorkingMemory workingMemory) {
// it must be cloned for multi-thread safety
DroolsMVELFactory factory = (DroolsMVELFactory) this.prototype.clone();
- KnowledgeHelper knowledgeHelper = new DefaultKnowledgeHelper(workingMemory);
factory.setContext( tuple,
- knowledgeHelper,
+ null,
null,
workingMemory,
null );
+ factory.createVariable( "rule", rule, rule.getClass() );
// do we have any functions for this namespace?
Package pkg = workingMemory.getRuleBase().getPackage( "MAIN" );
@@ -73,6 +75,7 @@
}
return ((Boolean) MVEL.executeExpression( this.expr,
+ null,
factory )).booleanValue();
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELEvalExpression.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,10 @@
package org.drools.base.mvel;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
import org.drools.rule.Declaration;
import org.drools.rule.MVELDialectRuntimeData;
@@ -12,7 +12,7 @@
import org.drools.WorkingMemory;
import org.drools.spi.EvalExpression;
import org.drools.spi.Tuple;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
public class MVELEvalExpression
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELPredicateExpression.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,12 +1,5 @@
package org.drools.base.mvel;
-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;
import java.io.Externalizable;
import java.io.IOException;
@@ -14,6 +7,14 @@
import java.io.ObjectOutput;
import java.io.Serializable;
+import org.drools.WorkingMemory;
+import org.drools.rule.Declaration;
+import org.drools.rule.MVELDialectRuntimeData;
+import org.drools.rule.Package;
+import org.drools.spi.PredicateExpression;
+import org.drools.spi.Tuple;
+import org.mvel2.MVEL;
+
public class MVELPredicateExpression implements PredicateExpression, MVELCompileable, Externalizable {
private static final long serialVersionUID = 400L;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueEvaluator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -12,10 +12,10 @@
import org.drools.WorkingMemory;
import org.drools.spi.ProcessContext;
import org.drools.spi.ReturnValueEvaluator;
-import org.mvel.MVEL;
-import org.mvel.compiler.CompiledExpression;
-import org.mvel.debug.DebugTools;
-import org.mvel.integration.impl.SimpleValueResolver;
+import org.mvel2.MVEL;
+import org.mvel2.compiler.CompiledExpression;
+import org.mvel2.debug.DebugTools;
+import org.mvel2.integration.impl.SimpleValueResolver;
public class MVELReturnValueEvaluator
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELReturnValueExpression.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,20 +1,21 @@
package org.drools.base.mvel;
+
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
+
+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;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.Serializable;
-
public class MVELReturnValueExpression
implements
ReturnValueExpression,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/base/mvel/MVELSalienceExpression.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -11,7 +11,7 @@
import org.drools.WorkingMemory;
import org.drools.spi.Salience;
import org.drools.spi.Tuple;
-import org.mvel.MVEL;
+import org.mvel2.MVEL;
public class MVELSalienceExpression
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractFactHandleFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractFactHandleFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractFactHandleFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,17 +16,10 @@
* limitations under the License.
*/
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-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/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AbstractRuleBase.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.Externalizable;
import java.io.IOException;
@@ -52,7 +51,6 @@
import org.drools.rule.Function;
import org.drools.rule.ImportDeclaration;
import org.drools.rule.InvalidPatternException;
-import org.drools.rule.MapBackedClassLoader;
import org.drools.rule.Package;
import org.drools.rule.Rule;
import org.drools.rule.TypeDeclaration;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,9 +17,9 @@
*/
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ArrayAgendaGroup.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ArrayAgendaGroup.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ArrayAgendaGroup.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,22 +16,16 @@
* limitations under the License.
*/
-import org.drools.conflict.DepthConflictResolver;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.PriorityQueue;
+
import org.drools.spi.Activation;
-import org.drools.spi.AgendaGroup;
-import org.drools.spi.ConflictResolver;
-import org.drools.util.BinaryHeapQueue;
import org.drools.util.Iterator;
import org.drools.util.LinkedList;
import org.drools.util.LinkedListEntry;
-import org.drools.util.PrimitiveLongMap;
-import org.drools.util.Queueable;
-import org.drools.util.LinkedList.LinkedListIterator;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-
/**
* <code>AgendaGroup</code> implementation that uses a <code>PriorityQueue</code> to prioritise the evaluation of added
* <code>ActivationQueue</code>s. The <code>AgendaGroup</code> also maintains a <code>Map</code> of <code>ActivationQueues</code>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/BetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/BetaConstraints.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/BetaConstraints.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,13 +1,13 @@
package org.drools.common;
+import java.io.Externalizable;
+
import org.drools.RuleBaseConfiguration;
import org.drools.reteoo.BetaMemory;
import org.drools.reteoo.LeftTuple;
import org.drools.rule.ContextEntry;
import org.drools.util.LinkedList;
-import java.io.Externalizable;
-
public interface BetaConstraints
extends
Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/BinaryHeapQueueAgendaGroup.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/BinaryHeapQueueAgendaGroup.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/BinaryHeapQueueAgendaGroup.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,20 +16,15 @@
* limitations under the License.
*/
-import org.drools.conflict.DepthConflictResolver;
-import org.drools.marshalling.MarshallerReaderContext;
-import org.drools.marshalling.MarshallerWriteContext;
-import org.drools.spi.Activation;
-import org.drools.spi.AgendaGroup;
-import org.drools.spi.ConflictResolver;
-import org.drools.util.BinaryHeapQueue;
-import org.drools.util.Queueable;
-
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.util.Collection;
+import java.util.PriorityQueue;
+import org.drools.spi.Activation;
+import org.drools.util.BinaryHeapQueue;
+import org.drools.util.Queueable;
+
/**
* <code>AgendaGroup</code> implementation that uses a <code>PriorityQueue</code> to prioritise the evaluation of added
* <code>ActivationQueue</code>s. The <code>AgendaGroup</code> also maintains a <code>Map</code> of <code>ActivationQueues</code>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ConcurrentNodeMemories.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ConcurrentNodeMemories.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ConcurrentNodeMemories.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,9 +18,6 @@
package org.drools.common;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.util.concurrent.atomic.AtomicReferenceArray;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -20,10 +20,6 @@
import org.drools.reteoo.RightTuple;
import org.drools.runtime.rule.FactHandle;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
/**
* Implementation of <code>FactHandle</code>.
* @author <a href="mailto:mark.proctor at jboss.com">Mark Proctor</a>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,29 +16,29 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.List;
+
import org.drools.RuleBaseConfiguration;
import org.drools.base.evaluators.Operator;
import org.drools.reteoo.BetaMemory;
-import org.drools.reteoo.RightTupleMemory;
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.LeftTupleMemory;
+import org.drools.reteoo.RightTupleMemory;
import org.drools.rule.ContextEntry;
import org.drools.rule.VariableConstraint;
import org.drools.spi.BetaNodeFieldConstraint;
-import org.drools.util.AbstractHashTable.FieldIndex;
+import org.drools.util.LeftTupleIndexHashTable;
+import org.drools.util.LeftTupleList;
+import org.drools.util.LinkedList;
+import org.drools.util.LinkedListEntry;
import org.drools.util.RightTupleIndexHashTable;
import org.drools.util.RightTupleList;
-import org.drools.util.LinkedList;
-import org.drools.util.LinkedListEntry;
-import org.drools.util.LeftTupleList;
-import org.drools.util.LeftTupleIndexHashTable;
+import org.drools.util.AbstractHashTable.FieldIndex;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
public class DoubleBetaConstraints
implements
BetaConstraints {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectInputStream.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectInputStream.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectInputStream.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,27 +3,14 @@
*/
package org.drools.common;
-import java.io.Externalizable;
import java.io.IOException;
import java.io.InputStream;
import java.io.InvalidClassException;
-import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectStreamClass;
-import java.io.StreamCorruptedException;
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Collection;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.atomic.AtomicReferenceArray;
-import org.drools.base.ClassFieldAccessorCache;
-import org.drools.rule.DialectRuntimeRegistry;
import org.drools.rule.Package;
public class DroolsObjectInputStream extends ObjectInputStream
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectOutputStream.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectOutputStream.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DroolsObjectOutputStream.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,17 +1,8 @@
package org.drools.common;
-import java.io.Externalizable;
import java.io.IOException;
-import java.io.NotSerializableException;
-import java.io.ObjectOutput;
-import java.io.OutputStream;
import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicReferenceArray;
+import java.io.OutputStream;
/**
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EmptyBetaConstraints.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,19 +16,18 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.RuleBaseConfiguration;
import org.drools.reteoo.BetaMemory;
-import org.drools.reteoo.RightTupleMemory;
import org.drools.reteoo.LeftTuple;
import org.drools.rule.ContextEntry;
-import org.drools.util.RightTupleList;
-import org.drools.util.LinkedList;
import org.drools.util.LeftTupleList;
+import org.drools.util.LinkedList;
+import org.drools.util.RightTupleList;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
public class EmptyBetaConstraints
implements
BetaConstraints {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityAssertMapComparator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-import org.drools.base.ShadowProxy;
-import org.drools.runtime.rule.FactHandle;
-import org.drools.util.AbstractHashTable.ObjectComparator;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.util.AbstractHashTable.ObjectComparator;
+
public class EqualityAssertMapComparator
implements
ObjectComparator {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKey.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKey.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKey.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,14 +17,12 @@
*/
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
-import org.drools.base.ShadowProxy;
-
/**
* Upon instantiation the EqualityKey caches the first Object's hashCode
* this can never change. The EqualityKey has an internal datastructure
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKeyComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKeyComparator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/EqualityKeyComparator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import org.drools.util.AbstractHashTable.ObjectComparator;
-
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.drools.util.AbstractHashTable.ObjectComparator;
+
public class EqualityKeyComparator
implements
ObjectComparator {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/IdentityAssertMapComparator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-import org.drools.base.ShadowProxy;
-import org.drools.runtime.rule.FactHandle;
-import org.drools.util.AbstractHashTable.ObjectComparator;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
+import org.drools.runtime.rule.FactHandle;
+import org.drools.util.AbstractHashTable.ObjectComparator;
+
public class IdentityAssertMapComparator
implements
ObjectComparator {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,16 +16,16 @@
package org.drools.common;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.reteoo.LeftTuple;
-import org.drools.rule.Pattern;
import org.drools.rule.ContextEntry;
import org.drools.rule.Declaration;
+import org.drools.rule.Pattern;
import org.drools.spi.BetaNodeFieldConstraint;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-
/**
* InstanceEqualsConstraint
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,16 +16,16 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.reteoo.LeftTuple;
import org.drools.rule.ContextEntry;
import org.drools.rule.Declaration;
import org.drools.rule.Pattern;
import org.drools.spi.BetaNodeFieldConstraint;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
public class InstanceNotEqualsConstraint
implements
BetaNodeFieldConstraint {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InternalRuleBase.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,8 +17,8 @@
*/
import java.io.IOException;
-import java.util.Map;
import java.util.List;
+import java.util.Map;
import org.drools.FactException;
import org.drools.RuleBase;
@@ -28,7 +28,6 @@
import org.drools.reteoo.Rete;
import org.drools.reteoo.ReteooWorkingMemory;
import org.drools.rule.CompositeClassLoader;
-import org.drools.rule.MapBackedClassLoader;
import org.drools.rule.Package;
import org.drools.rule.TypeDeclaration;
import org.drools.runtime.rule.FactHandle;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NamedEntryPoint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,17 +3,14 @@
*/
package org.drools.common;
-import java.beans.PropertyChangeListener;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.concurrent.locks.ReentrantLock;
-import org.drools.WorkingMemoryEntryPoint;
import org.drools.FactException;
import org.drools.RuntimeDroolsException;
+import org.drools.WorkingMemoryEntryPoint;
import org.drools.RuleBaseConfiguration.AssertBehaviour;
-import org.drools.base.ShadowProxy;
-import org.drools.event.WorkingMemoryEventSupport;
import org.drools.reteoo.EntryPointNode;
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.ObjectTypeConf;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NodeMemories.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NodeMemories.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/NodeMemories.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,7 +18,6 @@
package org.drools.common;
-import java.io.Externalizable;
/**
* An interface for node memories implementation
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ObjectTypeConfigurationRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ObjectTypeConfigurationRegistry.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ObjectTypeConfigurationRegistry.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -5,7 +5,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.drools.base.ShadowProxy;
import org.drools.facttemplates.Fact;
import org.drools.reteoo.ClassObjectTypeConf;
import org.drools.reteoo.FactTemplateTypeConf;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PriorityQueueAgendaGroupFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PriorityQueueAgendaGroupFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PriorityQueueAgendaGroupFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,9 +1,9 @@
package org.drools.common;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
public class PriorityQueueAgendaGroupFactory implements AgendaGroupFactory, Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/PropagationContextImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,6 +16,10 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.reteoo.LeftTuple;
import org.drools.rule.EntryPoint;
import org.drools.rule.Rule;
@@ -24,10 +28,6 @@
import org.drools.spi.PropagationContext;
import org.drools.util.ObjectHashMap;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.IOException;
-
public class PropagationContextImpl
implements
PropagationContext {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,29 +16,29 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.List;
+
import org.drools.RuleBaseConfiguration;
import org.drools.base.evaluators.Operator;
import org.drools.reteoo.BetaMemory;
-import org.drools.reteoo.RightTupleMemory;
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.LeftTupleMemory;
+import org.drools.reteoo.RightTupleMemory;
import org.drools.rule.ContextEntry;
import org.drools.rule.VariableConstraint;
import org.drools.spi.BetaNodeFieldConstraint;
-import org.drools.util.AbstractHashTable.FieldIndex;
+import org.drools.util.LeftTupleIndexHashTable;
+import org.drools.util.LeftTupleList;
+import org.drools.util.LinkedList;
+import org.drools.util.LinkedListEntry;
import org.drools.util.RightTupleIndexHashTable;
import org.drools.util.RightTupleList;
-import org.drools.util.LinkedList;
-import org.drools.util.LinkedListEntry;
-import org.drools.util.LeftTupleList;
-import org.drools.util.LeftTupleIndexHashTable;
+import org.drools.util.AbstractHashTable.FieldIndex;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.ArrayList;
-import java.util.List;
-
public class QuadroupleBetaConstraints
implements
BetaConstraints {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/RuleFlowGroupImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,11 +18,10 @@
import java.io.IOException;
import java.io.ObjectInput;
-import java.io.ObjectInputStream;
import java.io.ObjectOutput;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import org.drools.marshalling.PersisterEnums;
+
import org.drools.marshalling.MarshallerReaderContext;
import org.drools.marshalling.MarshallerWriteContext;
import org.drools.spi.Activation;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,19 +17,16 @@
*/
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
-import java.util.TimerTask;
+import java.io.ObjectOutput;
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
import org.drools.spi.Activation;
-import org.drools.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
import org.drools.spi.Tuple;
import org.drools.time.JobHandle;
-import org.drools.util.LinkedList;
import org.drools.util.LinkedListNode;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SequentialAgendaGroupImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SequentialAgendaGroupImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SequentialAgendaGroupImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,18 +16,17 @@
* limitations under the License.
*/
-import org.drools.conflict.DepthConflictResolver;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.PriorityQueue;
+
import org.drools.spi.Activation;
import org.drools.spi.AgendaGroup;
import org.drools.spi.ConflictResolver;
-import org.drools.util.BinaryHeapQueue;
import org.drools.util.PrimitiveLongMap;
import org.drools.util.Queueable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
/**
* <code>AgendaGroup</code> implementation that uses a <code>PriorityQueue</code> to prioritise the evaluation of added
* <code>ActivationQueue</code>s. The <code>AgendaGroup</code> also maintains a <code>Map</code> of <code>ActivationQueues</code>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedTemporalWorkingMemoryContext.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedTemporalWorkingMemoryContext.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedTemporalWorkingMemoryContext.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,19 +1,7 @@
package org.drools.common;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import org.drools.base.MapGlobalResolver;
-import org.drools.event.AgendaEventSupport;
-import org.drools.event.RuleFlowEventSupport;
-import org.drools.event.WorkingMemoryEventSupport;
-import org.drools.process.instance.ProcessInstanceFactory;
-import org.drools.process.instance.InternalWorkItemManager;
-import org.drools.rule.TimeMachine;
import org.drools.spi.FactHandleFactory;
-import org.drools.spi.GlobalResolver;
import org.drools.time.SessionClock;
public class SharedTemporalWorkingMemoryContext<T extends SessionClock> extends SharedWorkingMemoryContext {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedWorkingMemoryContext.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedWorkingMemoryContext.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SharedWorkingMemoryContext.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -14,7 +14,6 @@
import org.drools.rule.TimeMachine;
import org.drools.spi.FactHandleFactory;
import org.drools.spi.GlobalResolver;
-import org.drools.time.SessionClock;
public class SharedWorkingMemoryContext {
protected InternalRuleBase ruleBase;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,27 +15,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import java.io.Externalizable;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
import org.drools.RuleBaseConfiguration;
import org.drools.base.evaluators.Operator;
import org.drools.reteoo.BetaMemory;
-import org.drools.reteoo.RightTupleMemory;
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.LeftTupleMemory;
+import org.drools.reteoo.RightTupleMemory;
import org.drools.rule.ContextEntry;
import org.drools.rule.VariableConstraint;
import org.drools.spi.BetaNodeFieldConstraint;
-import org.drools.util.AbstractHashTable;
-import org.drools.util.RightTupleList;
-import org.drools.util.RightTupleIndexHashTable;
+import org.drools.util.LeftTupleIndexHashTable;
+import org.drools.util.LeftTupleList;
import org.drools.util.LinkedList;
import org.drools.util.LinkedListEntry;
-import org.drools.util.LeftTupleList;
-import org.drools.util.LeftTupleIndexHashTable;
+import org.drools.util.RightTupleIndexHashTable;
+import org.drools.util.RightTupleList;
import org.drools.util.AbstractHashTable.FieldIndex;
public class SingleBetaConstraints
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleThreadedObjectStore.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -4,15 +4,14 @@
package org.drools.common;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Iterator;
import java.util.concurrent.locks.Lock;
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;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -25,18 +25,18 @@
import org.drools.RuleBaseConfiguration;
import org.drools.base.evaluators.Operator;
import org.drools.reteoo.BetaMemory;
-import org.drools.reteoo.RightTupleMemory;
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.LeftTupleMemory;
+import org.drools.reteoo.RightTupleMemory;
import org.drools.rule.ContextEntry;
import org.drools.rule.VariableConstraint;
import org.drools.spi.BetaNodeFieldConstraint;
-import org.drools.util.RightTupleList;
-import org.drools.util.RightTupleIndexHashTable;
+import org.drools.util.LeftTupleIndexHashTable;
+import org.drools.util.LeftTupleList;
import org.drools.util.LinkedList;
import org.drools.util.LinkedListEntry;
-import org.drools.util.LeftTupleList;
-import org.drools.util.LeftTupleIndexHashTable;
+import org.drools.util.RightTupleIndexHashTable;
+import org.drools.util.RightTupleList;
import org.drools.util.AbstractHashTable.FieldIndex;
public class TripleBetaConstraints
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TruthMaintenanceSystem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TruthMaintenanceSystem.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TruthMaintenanceSystem.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,31 +16,20 @@
* limitations under the License.
*/
-import java.io.ObjectInputStream;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
-import java.io.Externalizable;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Comparator;
+import java.io.ObjectOutput;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import org.drools.FactException;
-import org.drools.marshalling.PersisterEnums;
import org.drools.marshalling.MarshallerReaderContext;
import org.drools.marshalling.MarshallerWriteContext;
import org.drools.rule.Rule;
import org.drools.spi.Activation;
-import org.drools.spi.AgendaGroup;
import org.drools.spi.PropagationContext;
import org.drools.util.ObjectHashMap;
-import org.drools.util.PrimitiveLongMap;
-import org.drools.util.ObjectHashMap.ObjectEntry;
-import org.w3c.dom.views.AbstractView;
/**
* The Truth Maintenance System is responsible for tracking two things. Firstly
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TupleStartEqualsConstraint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,15 +16,15 @@
package org.drools.common;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.reteoo.LeftTuple;
import org.drools.rule.ContextEntry;
import org.drools.rule.Declaration;
import org.drools.spi.BetaNodeFieldConstraint;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
/**
* Checks if one tuple is the start subtuple of other tuple.
* For instance, if we have two tuples:
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/AssertObject.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/AssertObject.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/AssertObject.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,12 +3,12 @@
*/
package org.drools.concurrent;
-import org.drools.WorkingMemory;
-
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.drools.WorkingMemory;
+
public class AssertObject
implements
Command,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/AssertObjects.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/AssertObjects.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/AssertObjects.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,8 +3,6 @@
*/
package org.drools.concurrent;
-import org.drools.WorkingMemory;
-
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
@@ -12,6 +10,8 @@
import java.util.Iterator;
import java.util.List;
+import org.drools.WorkingMemory;
+
public class AssertObjects
implements
Command,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/Command.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/Command.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/Command.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,10 +3,10 @@
*/
package org.drools.concurrent;
+import java.io.Externalizable;
+
import org.drools.WorkingMemory;
-import java.io.Externalizable;
-
public interface Command extends Externalizable {
void execute(WorkingMemory workingMemory);
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/CommandExecutor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/CommandExecutor.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/CommandExecutor.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,8 +3,6 @@
*/
package org.drools.concurrent;
-import org.drools.WorkingMemory;
-
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -12,6 +10,8 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
+import org.drools.WorkingMemory;
+
/**
* The CommandExecutor is a Producer/Consumer style classes that provides a queue of Commands
* in a LinkedBlockingQueue. This the run() method loops for continously until shutdown() is
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/DefaultExecutorService.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/DefaultExecutorService.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/DefaultExecutorService.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,9 +3,9 @@
*/
package org.drools.concurrent;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
public class DefaultExecutorService implements ExecutorService {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/FireAllRules.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/FireAllRules.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/FireAllRules.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,13 +3,13 @@
*/
package org.drools.concurrent;
-import org.drools.WorkingMemory;
-import org.drools.spi.AgendaFilter;
-
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.WorkingMemory;
+import org.drools.spi.AgendaFilter;
+
public class FireAllRules
implements
Command,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/RetractObject.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/RetractObject.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/RetractObject.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,13 +3,14 @@
*/
package org.drools.concurrent;
-import org.drools.runtime.rule.FactHandle;
-import org.drools.WorkingMemory;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.WorkingMemory;
+import org.drools.runtime.rule.FactHandle;
+
public class RetractObject
implements
Command,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/UpdateObject.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/UpdateObject.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/concurrent/UpdateObject.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,13 +3,13 @@
*/
package org.drools.concurrent;
-import org.drools.runtime.rule.FactHandle;
-import org.drools.WorkingMemory;
-
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.drools.FactHandle;
+import org.drools.WorkingMemory;
+
public class UpdateObject
implements
Command,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/conflict/DepthConflictResolver.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/conflict/DepthConflictResolver.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/conflict/DepthConflictResolver.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,13 +1,13 @@
package org.drools.conflict;
-import org.drools.spi.Activation;
-import org.drools.spi.ConflictResolver;
-
import java.io.Externalizable;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
+import org.drools.spi.Activation;
+import org.drools.spi.ConflictResolver;
+
public class DepthConflictResolver
implements
ConflictResolver, Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/AgendaEventSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/AgendaEventSupport.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/AgendaEventSupport.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,9 +17,9 @@
*/
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/DefaultRuleBaseEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/DefaultRuleBaseEventListener.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/DefaultRuleBaseEventListener.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,23 +1,8 @@
package org.drools.event;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
-/*
- * 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.ObjectOutput;
import org.drools.event.AfterFunctionRemovedEvent;
import org.drools.event.AfterRuleAddedEvent;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleBaseEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleBaseEventListener.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleBaseEventListener.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,7 @@
package org.drools.event;
+import java.io.Externalizable;
import java.util.EventListener;
-import java.io.Externalizable;
import org.drools.event.AfterFunctionRemovedEvent;
import org.drools.event.AfterRuleAddedEvent;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleBaseEventSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleBaseEventSupport.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/RuleBaseEventSupport.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,22 +17,15 @@
*/
import java.io.Externalizable;
import java.io.IOException;
-import java.io.ObjectOutput;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.List;
-
import java.util.concurrent.CopyOnWriteArrayList;
import org.drools.RuleBase;
-import org.drools.event.AfterFunctionRemovedEvent;
-import org.drools.event.AfterRuleAddedEvent;
-import org.drools.event.AfterRuleRemovedEvent;
-import org.drools.event.BeforeFunctionRemovedEvent;
-import org.drools.event.BeforeRuleAddedEvent;
-import org.drools.event.BeforeRuleRemovedEvent;
-import org.drools.rule.Rule;
import org.drools.rule.Package;
+import org.drools.rule.Rule;
/**
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/event/WorkingMemoryEventSupport.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,9 +17,9 @@
*/
import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/ClassDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/ClassDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/ClassDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,11 +16,9 @@
* limitations under the License.
*/
-import java.beans.IntrospectionException;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -29,12 +27,7 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.Map.Entry;
-import org.drools.base.ClassFieldAccessor;
-import org.drools.base.ClassFieldAccessorCache;
-import org.drools.base.ClassFieldReader;
-import org.drools.base.ClassFieldWriter;
import org.drools.rule.FactField;
import org.drools.rule.FactType;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/FieldDefinition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/FieldDefinition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/FieldDefinition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -23,8 +23,6 @@
import org.drools.base.ClassFieldAccessor;
import org.drools.rule.FactField;
-import org.drools.spi.AcceptsReadAccessor;
-import org.drools.spi.InternalReadAccessor;
/**
* Declares a field to be dynamically generated.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/Jenerator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/Jenerator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/factmodel/Jenerator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -9,7 +9,6 @@
import java.util.jar.JarInputStream;
import java.util.jar.JarOutputStream;
-
import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,11 +16,10 @@
*/
package org.drools.facttemplates;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Arrays;
//import woolfel.engine.rule.Rule;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,10 +16,10 @@
*/
package org.drools.facttemplates;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Arrays;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import org.drools.rule.Package;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateObjectType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateObjectType.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FactTemplateObjectType.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,13 +16,13 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.base.ValueType;
import org.drools.spi.ObjectType;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
public class FactTemplateObjectType
implements
ObjectType {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FieldTemplateImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FieldTemplateImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/facttemplates/FieldTemplateImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,12 +1,12 @@
package org.drools.facttemplates;
-import org.drools.base.ValueType;
-
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.base.ValueType;
+
public class FieldTemplateImpl
implements
FieldTemplate, Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/InputMarshaller.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -948,12 +948,16 @@
return workItem;
}
- public static void readTimers(MarshallerReaderContext context) throws IOException {
+ public static void readTimers(MarshallerReaderContext context) throws IOException, ClassNotFoundException {
InternalWorkingMemory wm = context.wm;
ObjectInputStream stream = context.stream;
TimerManager timerManager = wm.getTimerManager();
timerManager.internalSetTimerId( stream.readLong() );
+
+ // still need to think on how to fix this.
+// TimerService service = (TimerService) stream.readObject();
+// timerManager.setTimerService( service );
while ( stream.readShort() == PersisterEnums.TIMER ) {
TimerInstance timer = readTimer( context );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/Marshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/Marshaller.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/Marshaller.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -7,7 +7,6 @@
import org.drools.StatefulSession;
import org.drools.common.InternalRuleBase;
import org.drools.concurrent.ExecutorService;
-import org.drools.reteoo.ReteooStatefulSession;
public interface Marshaller {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/OutputMarshaller.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -923,6 +923,9 @@
long timerId = timerManager.internalGetTimerId();
stream.writeLong( timerId );
+ // need to think on how to fix this
+ // stream.writeObject( timerManager.getTimerService() );
+
List<TimerInstance> timers = new ArrayList<TimerInstance>( timerManager.getTimers() );
Collections.sort( timers,
new Comparator<TimerInstance>() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PersisterHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PersisterHelper.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PersisterHelper.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -7,9 +7,6 @@
import org.drools.common.TruthMaintenanceSystem.LogicalRetractCallback;
import org.drools.reteoo.PropagationQueuingNode.PropagateAction;
import org.drools.reteoo.ReteooWorkingMemory.WorkingMemoryReteAssertAction;
-import org.drools.reteoo.PropagationQueuingNode.PropagateAction;
-import org.drools.common.RuleFlowGroupImpl.DeactivateCallback;
-import org.drools.common.TruthMaintenanceSystem;
public class PersisterHelper {
public static WorkingMemoryAction readWorkingMemoryAction(MarshallerReaderContext context) throws IOException {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PlaceholderResolverStrategy.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PlaceholderResolverStrategy.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PlaceholderResolverStrategy.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,8 @@
package org.drools.marshalling;
import java.io.IOException;
-import java.io.InputStream;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.OutputStream;
public interface PlaceholderResolverStrategy {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PlaceholderResolverStrategyFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PlaceholderResolverStrategyFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/PlaceholderResolverStrategyFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,9 +1,7 @@
package org.drools.marshalling;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
public class PlaceholderResolverStrategyFactory {
List<PlaceholderResolverStrategy> strategiesList;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/Placeholders.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/Placeholders.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/Placeholders.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,5 @@
package org.drools.marshalling;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/RuleBaseNodes.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/RuleBaseNodes.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/marshalling/RuleBaseNodes.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -5,7 +5,6 @@
import org.drools.common.BaseNode;
import org.drools.common.InternalRuleBase;
-import org.drools.reteoo.BetaNode;
import org.drools.reteoo.LeftTupleSink;
import org.drools.reteoo.LeftTupleSource;
import org.drools.reteoo.ObjectSink;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/persistence/memory/MemoryXaResource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/persistence/memory/MemoryXaResource.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/persistence/memory/MemoryXaResource.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -8,8 +8,6 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import org.drools.persistence.ByteArraySnapshotter;
-
public class MemoryXaResource implements XAResource {
private MemoryPersister pm;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/Work.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/Work.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/Work.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,5 @@
package org.drools.process.core;
-import java.util.List;
import java.util.Map;
import java.util.Set;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/WorkEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/WorkEditor.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/WorkEditor.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,5 @@
package org.drools.process.core;
-import org.drools.process.core.Work;
-import org.drools.process.core.WorkDefinition;
public interface WorkEditor {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/BooleanDataType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/BooleanDataType.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/BooleanDataType.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import org.drools.process.core.datatype.DataType;
-
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.process.core.datatype.DataType;
+
/**
* Representation of a boolean datatype.
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/FloatDataType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/FloatDataType.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/FloatDataType.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import org.drools.process.core.datatype.DataType;
-
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.process.core.datatype.DataType;
+
/**
* Representation of a float datatype.
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/IntegerDataType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/IntegerDataType.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/IntegerDataType.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import org.drools.process.core.datatype.DataType;
-
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.process.core.datatype.DataType;
+
/**
* Representation of an integer datatype.
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/StringDataType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/StringDataType.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/StringDataType.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import org.drools.process.core.datatype.DataType;
-
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.process.core.datatype.DataType;
+
/**
* Representation of a string datatype.
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/UndefinedDataType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/UndefinedDataType.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/datatype/impl/type/UndefinedDataType.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-import org.drools.process.core.datatype.DataType;
-
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.drools.process.core.datatype.DataType;
+
/**
* Representation of an undefined datatype.
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/impl/WorkImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/impl/WorkImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/core/impl/WorkImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -4,7 +4,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Map;
import java.util.Set;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/process/instance/timer/TimerManager.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -108,6 +108,10 @@
public void internalSetTimerId(long timerId) {
this.timerId = timerId;
}
+
+ public void setTimerService(TimerService timerService) {
+ this.timerService = timerService;
+ }
public class ProcessJob implements Job {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AbstractLeftTupleSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AbstractLeftTupleSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AbstractLeftTupleSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,12 +15,12 @@
*/
package org.drools.reteoo;
-import org.drools.common.RuleBasePartitionId;
-
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.drools.common.RuleBasePartitionId;
+
/**
* An abstract super class for the LeftTupleSinkAdapters
* @author: <a href="mailto:tirelli at post.com">Edson Tirelli</a>
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AbstractObjectSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AbstractObjectSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AbstractObjectSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,13 +15,13 @@
*/
package org.drools.reteoo;
-import org.drools.common.RuleBasePartitionId;
-
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.drools.common.RuleBasePartitionId;
+
/**
* An abstract super class for ObjectSinks
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNetworkCompiler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNetworkCompiler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNetworkCompiler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -4,10 +4,8 @@
import java.util.Comparator;
import org.drools.util.Iterator;
-import org.drools.util.LinkedList;
import org.drools.util.ObjectHashMap;
import org.drools.util.ObjectHashMap.ObjectEntry;
-import org.drools.reteoo.CompositeObjectSinkAdapter.HashKey;
public class AlphaNetworkCompiler {
private StringBuilder builder;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,21 +15,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.Externalizable;
import org.drools.FactException;
import org.drools.RuleBaseConfiguration;
-import org.drools.common.*;
+import org.drools.common.BaseNode;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.NodeMemory;
+import org.drools.common.PropagationContextImpl;
+import org.drools.common.RuleBasePartitionId;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.ContextEntry;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.PropagationContext;
-import org.drools.util.FactEntry;
-import org.drools.util.RightTupleList;
-import org.drools.util.Iterator;
/**
* <code>AlphaNodes</code> are nodes in the <code>Rete</code> network used
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncCompositeLeftTupleSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncCompositeLeftTupleSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncCompositeLeftTupleSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,8 +15,8 @@
*/
package org.drools.reteoo;
+import org.drools.common.InternalWorkingMemory;
import org.drools.common.RuleBasePartitionId;
-import org.drools.common.InternalWorkingMemory;
import org.drools.spi.PropagationContext;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncCompositeObjectSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncCompositeObjectSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncCompositeObjectSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,9 +15,9 @@
*/
package org.drools.reteoo;
-import org.drools.common.RuleBasePartitionId;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
+import org.drools.common.RuleBasePartitionId;
import org.drools.spi.PropagationContext;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncSingleLeftTupleSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncSingleLeftTupleSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncSingleLeftTupleSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,8 +15,8 @@
*/
package org.drools.reteoo;
+import org.drools.common.InternalWorkingMemory;
import org.drools.common.RuleBasePartitionId;
-import org.drools.common.InternalWorkingMemory;
import org.drools.spi.PropagationContext;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncSingleObjectSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncSingleObjectSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AsyncSingleObjectSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,9 +15,9 @@
*/
package org.drools.reteoo;
-import org.drools.common.RuleBasePartitionId;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
+import org.drools.common.RuleBasePartitionId;
import org.drools.spi.PropagationContext;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -23,7 +23,12 @@
import java.util.List;
import org.drools.RuleBaseConfiguration;
-import org.drools.common.*;
+import org.drools.common.BaseNode;
+import org.drools.common.BetaConstraints;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.NodeMemory;
+import org.drools.common.PropagationContextImpl;
+import org.drools.common.RuleBasePartitionId;
import org.drools.reteoo.AccumulateNode.AccumulateMemory;
import org.drools.reteoo.CollectNode.CollectMemory;
import org.drools.rule.Behavior;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ClassObjectTypeConf.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ClassObjectTypeConf.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ClassObjectTypeConf.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -21,14 +21,10 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
-import java.util.Map;
import org.drools.FactException;
-import org.drools.RuntimeDroolsException;
import org.drools.base.ClassObjectType;
import org.drools.base.DroolsQuery;
import org.drools.base.ShadowProxy;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeLeftTupleSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeLeftTupleSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/CompositeLeftTupleSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,15 +1,15 @@
package org.drools.reteoo;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.common.BaseNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.common.RuleBasePartitionId;
import org.drools.spi.PropagationContext;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
public class CompositeLeftTupleSinkAdapter extends AbstractLeftTupleSinkAdapter {
private LeftTupleSinkNodeList sinks;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EmptyLeftTupleSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EmptyLeftTupleSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EmptyLeftTupleSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,15 +1,15 @@
package org.drools.reteoo;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import org.drools.common.BaseNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
-import org.drools.common.BaseNode;
import org.drools.common.RuleBasePartitionId;
import org.drools.spi.PropagationContext;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
public class EmptyLeftTupleSinkAdapter extends AbstractLeftTupleSinkAdapter {
private static final EmptyLeftTupleSinkAdapter instance = new EmptyLeftTupleSinkAdapter();
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EmptyObjectSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EmptyObjectSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EmptyObjectSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,15 +1,15 @@
package org.drools.reteoo;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import org.drools.common.BaseNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
-import org.drools.common.BaseNode;
import org.drools.common.RuleBasePartitionId;
import org.drools.spi.PropagationContext;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
public class EmptyObjectSinkAdapter extends AbstractObjectSinkAdapter {
private static final long serialVersionUID = -631743913176779720L;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EntryPointNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EntryPointNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EntryPointNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -19,23 +19,26 @@
*/
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
-import java.io.IOException;
import java.io.ObjectOutput;
import java.util.HashMap;
import java.util.Map;
-import org.drools.WorkingMemoryEntryPoint;
import org.drools.base.ShadowProxy;
-import org.drools.common.*;
+import org.drools.common.BaseNode;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.InternalWorkingMemoryEntryPoint;
+import org.drools.common.NodeMemory;
+import org.drools.common.PropagationContextImpl;
+import org.drools.common.RuleBasePartitionId;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.EntryPoint;
import org.drools.spi.ObjectType;
import org.drools.spi.PropagationContext;
-import org.drools.util.FactEntry;
+import org.drools.util.Iterator;
import org.drools.util.ObjectHashSet;
-import org.drools.util.RightTupleList;
-import org.drools.util.Iterator;
import org.drools.util.ObjectHashSet.ObjectEntry;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/EvalConditionNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import java.io.ObjectOutput;
+import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
-import java.io.Externalizable;
+import java.io.ObjectOutput;
import org.drools.RuleBaseConfiguration;
import org.drools.common.BaseNode;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FactTemplateTypeConf.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FactTemplateTypeConf.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FactTemplateTypeConf.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,11 +17,10 @@
*/
package org.drools.reteoo;
-import java.io.Serializable;
import java.io.Externalizable;
import java.io.IOException;
-import java.io.ObjectOutput;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import org.drools.RuntimeDroolsException;
import org.drools.common.InternalRuleBase;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/FromNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -6,7 +6,6 @@
import java.io.Serializable;
import org.drools.RuleBaseConfiguration;
-import org.drools.reteoo.builder.BuildContext;
import org.drools.common.BaseNode;
import org.drools.common.BetaConstraints;
import org.drools.common.EmptyBetaConstraints;
@@ -14,6 +13,7 @@
import org.drools.common.InternalWorkingMemory;
import org.drools.common.NodeMemory;
import org.drools.common.PropagationContextImpl;
+import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.ContextEntry;
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.DataProvider;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/InitialFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/InitialFactHandle.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/InitialFactHandle.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,10 +3,6 @@
import org.drools.common.DefaultFactHandle;
import org.drools.common.InternalFactHandle;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
-
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/InitialFactImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/InitialFactImpl.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/InitialFactImpl.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-import org.drools.InitialFact;
-
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
+import org.drools.InitialFact;
+
/**
* We dont want users to be able to instantiate InitialFact so we expose it as
* an interface and make the class and its constructor package protected
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LIANodePropagation.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LIANodePropagation.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LIANodePropagation.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,14 +1,14 @@
package org.drools.reteoo;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.spi.PropagationContext;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-
public class LIANodePropagation
implements
Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftInputAdapterNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,18 +16,21 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.RuleBaseConfiguration;
-import org.drools.common.*;
+import org.drools.common.BaseNode;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.NodeMemory;
+import org.drools.common.PropagationContextImpl;
+import org.drools.common.RuleBasePartitionId;
import org.drools.reteoo.builder.BuildContext;
import org.drools.spi.PropagationContext;
-import org.drools.util.FactEntry;
import org.drools.util.RightTupleList;
-import org.drools.util.Iterator;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
/**
* All asserting Facts must propagated into the right <code>ObjectSink</code> side of a BetaNode, if this is the first Pattern
* then there are no BetaNodes to propagate to. <code>LeftInputAdapter</code> is used to adapt an ObjectSink propagation into a
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTuple.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTuple.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTuple.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,12 +1,8 @@
package org.drools.reteoo;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
-import org.drools.base.ShadowProxy;
import org.drools.common.InternalFactHandle;
import org.drools.rule.Declaration;
import org.drools.spi.Activation;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleMemory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleMemory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,5 @@
package org.drools.reteoo;
-import org.drools.common.InternalFactHandle;
import org.drools.util.Entry;
import org.drools.util.Iterator;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSink.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSink.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSink.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.io.Serializable;
import java.io.Externalizable;
import org.drools.common.InternalWorkingMemory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSinkNodeList.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSinkNodeList.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSinkNodeList.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,9 @@
package org.drools.reteoo;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Iterator;
import java.util.NoSuchElementException;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSinkPropagator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSinkPropagator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSinkPropagator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,9 +2,9 @@
import java.io.Externalizable;
+import org.drools.common.BaseNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
-import org.drools.common.BaseNode;
import org.drools.spi.PropagationContext;
public interface LeftTupleSinkPropagator
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSource.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/LeftTupleSource.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,11 +16,10 @@
* limitations under the License.
*/
-import java.io.Serializable;
import java.io.Externalizable;
import java.io.IOException;
-import java.io.ObjectOutput;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import org.drools.common.BaseNode;
import org.drools.common.InternalWorkingMemory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/MemoryVisitor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/MemoryVisitor.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/MemoryVisitor.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,20 +1,18 @@
package org.drools.reteoo;
-import java.lang.reflect.Field;
-import java.util.Map;
import java.io.Externalizable;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Field;
import org.drools.common.InternalWorkingMemory;
import org.drools.reteoo.RuleTerminalNode.TerminalNodeMemory;
-import org.drools.spi.ObjectType;
import org.drools.util.AbstractHashTable;
import org.drools.util.Entry;
+import org.drools.util.ReflectiveVisitor;
import org.drools.util.RightTupleIndexHashTable;
import org.drools.util.RightTupleList;
-import org.drools.util.ReflectiveVisitor;
public class MemoryVisitor extends ReflectiveVisitor
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkNodeList.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkNodeList.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkNodeList.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,8 @@
package org.drools.reteoo;
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
-import java.io.IOException;
import java.io.ObjectOutput;
import java.util.Iterator;
import java.util.NoSuchElementException;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkPropagator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkPropagator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkPropagator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,9 +2,9 @@
import java.io.Externalizable;
+import org.drools.common.BaseNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
-import org.drools.common.BaseNode;
import org.drools.common.RuleBasePartitionId;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeConf.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeConf.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeConf.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,7 +17,6 @@
*/
package org.drools.reteoo;
-import org.drools.RuntimeDroolsException;
import org.drools.rule.TypeDeclaration;
public interface ObjectTypeConf {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectTypeNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -23,7 +23,13 @@
import org.drools.RuleBaseConfiguration;
import org.drools.base.ClassObjectType;
-import org.drools.common.*;
+import org.drools.common.AbstractRuleBase;
+import org.drools.common.BaseNode;
+import org.drools.common.DroolsObjectInputStream;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.NodeMemory;
+import org.drools.common.PropagationContextImpl;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Declaration;
import org.drools.rule.EntryPoint;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/PropagationQueuingNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/PropagationQueuingNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/PropagationQueuingNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,21 +15,25 @@
*/
package org.drools.reteoo;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicBoolean;
+
import org.drools.RuleBaseConfiguration;
import org.drools.RuntimeDroolsException;
-import org.drools.common.*;
+import org.drools.common.BaseNode;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.NodeMemory;
+import org.drools.common.WorkingMemoryAction;
import org.drools.marshalling.MarshallerReaderContext;
import org.drools.marshalling.MarshallerWriteContext;
import org.drools.reteoo.builder.BuildContext;
import org.drools.spi.PropagationContext;
-import java.io.Externalizable;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.util.concurrent.ConcurrentLinkedQueue;
-import java.util.concurrent.atomic.AtomicBoolean;
-
/**
* A node that will add the propagation to the working memory actions queue,
* in order to allow multiple threads to concurrently assert objects to multiple
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/QueryTerminalNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,14 +16,17 @@
* limitations under the License.
*/
-import java.util.LinkedList;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.LinkedList;
import org.drools.RuleBaseConfiguration;
+import org.drools.common.BaseNode;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.NodeMemory;
+import org.drools.common.PropagationContextImpl;
import org.drools.reteoo.builder.BuildContext;
-import org.drools.common.*;
import org.drools.rule.GroupElement;
import org.drools.rule.Rule;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/Rete.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -25,7 +25,12 @@
import java.util.List;
import java.util.Map;
-import org.drools.common.*;
+import org.drools.common.BaseNode;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalRuleBase;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.InternalWorkingMemoryEntryPoint;
+import org.drools.common.RuleBasePartitionId;
import org.drools.rule.EntryPoint;
import org.drools.spi.ObjectType;
import org.drools.spi.PropagationContext;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteStatelessSessionResult.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteStatelessSessionResult.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteStatelessSessionResult.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,10 @@
package org.drools.reteoo;
-import java.util.Iterator;
import java.io.Externalizable;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Iterator;
import org.drools.QueryResults;
import org.drools.StatelessSessionResult;
@@ -12,9 +12,6 @@
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;
-import org.drools.util.AbstractHashTable.HashTableIterator;
public class ReteStatelessSessionResult
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,17 +16,12 @@
* limitations under the License.
*/
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Externalizable;
import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.Serializable;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Externalizable;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.io.OutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -42,9 +37,9 @@
import org.drools.base.SalienceInteger;
import org.drools.common.BaseNode;
import org.drools.common.DroolsObjectInputStream;
+import org.drools.common.DroolsObjectOutputStream;
import org.drools.common.InternalRuleBase;
import org.drools.common.InternalWorkingMemory;
-import org.drools.common.DroolsObjectOutputStream;
import org.drools.reteoo.builder.ReteooRuleBuilder;
import org.drools.rule.InvalidPatternException;
import org.drools.rule.Rule;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -28,7 +28,11 @@
import org.drools.SessionConfiguration;
import org.drools.StatefulSession;
import org.drools.StatelessSession;
-import org.drools.common.*;
+import org.drools.common.AbstractRuleBase;
+import org.drools.common.DefaultFactHandle;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.RuleBasePartitionId;
import org.drools.concurrent.CommandExecutor;
import org.drools.concurrent.ExecutorService;
import org.drools.event.RuleBaseEventListener;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatefulSession.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,7 +2,6 @@
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import org.drools.SessionConfiguration;
@@ -16,7 +15,6 @@
import org.drools.concurrent.Future;
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;
@@ -81,7 +79,7 @@
public Future asyncUpdate(final FactHandle factHandle,
final Object object) {
- return this.executor.submit( new UpdateObject( factHandle,
+ return this.executor.submit( new UpdateObject( (org.drools.FactHandle)factHandle,
object ) );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatelessSession.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatelessSession.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooStatelessSession.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,12 +1,12 @@
package org.drools.reteoo;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
-import java.io.Externalizable;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import org.drools.SessionConfiguration;
import org.drools.StatelessSession;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightInputAdapterNode.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,19 +16,22 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.RuleBaseConfiguration;
-import org.drools.common.*;
+import org.drools.common.BaseNode;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.NodeMemory;
+import org.drools.common.PropagationContextImpl;
import org.drools.reteoo.builder.BuildContext;
-import org.drools.rule.EntryPoint;
import org.drools.spi.PropagationContext;
import org.drools.util.Iterator;
import org.drools.util.ObjectHashMap;
import org.drools.util.ObjectHashMap.ObjectEntry;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
-
/**
* When joining a subnetwork into the main network again, RightInputAdapterNode adapts the
* subnetwork's tuple into a fact in order right join it with the tuple being propagated in
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightTuple.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightTuple.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightTuple.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,9 +1,5 @@
package org.drools.reteoo;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
import org.drools.common.InternalFactHandle;
import org.drools.util.Entry;
import org.drools.util.RightTupleList;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightTupleMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightTupleMemory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RightTupleMemory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,5 @@
package org.drools.reteoo;
-import org.drools.common.InternalFactHandle;
-import org.drools.util.Entry;
import org.drools.util.Iterator;
public interface RightTupleMemory {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleRemovalContext.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleRemovalContext.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/RuleRemovalContext.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,16 +18,13 @@
package org.drools.reteoo;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.HashMap;
import java.util.Map;
-import org.drools.common.BaseNode;
-
/**
* This context class is used during rule removal to ensure
* network consistency.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/SingleLeftTupleSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/SingleLeftTupleSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/SingleLeftTupleSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,15 +1,15 @@
package org.drools.reteoo;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.common.BaseNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
import org.drools.common.RuleBasePartitionId;
import org.drools.spi.PropagationContext;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
public class SingleLeftTupleSinkAdapter extends AbstractLeftTupleSinkAdapter {
protected LeftTupleSink sink;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/SingleObjectSinkAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/SingleObjectSinkAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/SingleObjectSinkAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,16 +1,15 @@
package org.drools.reteoo;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import org.drools.common.BaseNode;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
-import org.drools.common.BaseNode;
import org.drools.common.RuleBasePartitionId;
import org.drools.spi.PropagationContext;
-import java.io.Externalizable;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-
public class SingleObjectSinkAdapter extends AbstractObjectSinkAdapter {
private static final long serialVersionUID = 873985743021L;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/CollectBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/CollectBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/CollectBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -20,8 +20,6 @@
import java.util.Collections;
import java.util.List;
-import org.drools.RuntimeDroolsException;
-import org.drools.base.ClassObjectType;
import org.drools.common.BetaConstraints;
import org.drools.common.TupleStartEqualsConstraint;
import org.drools.reteoo.CollectNode;
@@ -33,7 +31,6 @@
import org.drools.rule.Pattern;
import org.drools.rule.RuleConditionElement;
import org.drools.spi.AlphaNodeFieldConstraint;
-import org.drools.spi.ObjectType;
/**
* @author etirelli
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ForallBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ForallBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ForallBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,10 +18,10 @@
import java.util.Iterator;
-import org.drools.rule.Pattern;
import org.drools.rule.Forall;
import org.drools.rule.GroupElement;
import org.drools.rule.GroupElementFactory;
+import org.drools.rule.Pattern;
import org.drools.rule.RuleConditionElement;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/FromBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/FromBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/FromBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,8 +16,6 @@
package org.drools.reteoo.builder;
-import java.util.Collections;
-
import org.drools.common.BetaConstraints;
import org.drools.reteoo.FromNode;
import org.drools.reteoo.LeftTupleSource;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/PatternBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/PatternBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/PatternBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,12 +16,6 @@
package org.drools.reteoo.builder;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -29,8 +23,6 @@
import org.drools.RuntimeDroolsException;
import org.drools.base.ClassObjectType;
import org.drools.base.DroolsQuery;
-import org.drools.common.DroolsObjectInputStream;
-import org.drools.common.DroolsObjectOutputStream;
import org.drools.common.InstanceNotEqualsConstraint;
import org.drools.common.InternalWorkingMemory;
import org.drools.reteoo.AlphaNode;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/builder/ReteooRuleBuilder.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,6 +16,9 @@
package org.drools.reteoo.builder;
+import java.util.ArrayList;
+import java.util.List;
+
import org.drools.InitialFact;
import org.drools.RuleIntegrationException;
import org.drools.base.ClassObjectType;
@@ -25,11 +28,18 @@
import org.drools.reteoo.ReteooBuilder;
import org.drools.reteoo.RuleTerminalNode;
import org.drools.reteoo.TerminalNode;
-import org.drools.rule.*;
+import org.drools.rule.Accumulate;
+import org.drools.rule.Collect;
+import org.drools.rule.EntryPoint;
+import org.drools.rule.EvalCondition;
+import org.drools.rule.Forall;
+import org.drools.rule.From;
+import org.drools.rule.GroupElement;
+import org.drools.rule.InvalidPatternException;
+import org.drools.rule.Pattern;
+import org.drools.rule.Query;
+import org.drools.rule.Rule;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author etirelli
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeConstraint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeConstraint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,10 +15,10 @@
*/
package org.drools.rule;
-import java.util.Arrays;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.Arrays;
import org.drools.RuntimeDroolsException;
import org.drools.common.InternalFactHandle;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/AbstractCompositeRestriction.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,11 +1,11 @@
package org.drools.rule;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Accumulate.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Accumulate.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Accumulate.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,14 +16,14 @@
package org.drools.rule;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.Serializable;
import org.drools.RuntimeDroolsException;
import org.drools.common.InternalFactHandle;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Collect.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Collect.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Collect.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,13 +16,13 @@
package org.drools.rule;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
import org.drools.RuntimeDroolsException;
import org.drools.base.ClassObjectType;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Declaration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Declaration.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Declaration.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -40,7 +40,6 @@
*
*/
-import java.io.Serializable;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -50,11 +49,8 @@
import java.util.Iterator;
import org.drools.RuntimeDroolsException;
-import org.drools.base.ClassFieldReader;
-import org.drools.base.ShadowProxy;
import org.drools.base.ValueType;
import org.drools.common.InternalWorkingMemory;
-import org.drools.spi.AcceptsClassObjectType;
import org.drools.spi.AcceptsReadAccessor;
import org.drools.spi.InternalReadAccessor;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DialectRuntimeData.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DialectRuntimeData.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DialectRuntimeData.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,5 @@
package org.drools.rule;
-import org.drools.RuntimeDroolsException;
-import org.drools.rule.JavaDialectRuntimeData.PackageClassLoader;
public interface DialectRuntimeData extends Cloneable {
public void removeRule(Package pkg, Rule rule);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DialectRuntimeRegistry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DialectRuntimeRegistry.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DialectRuntimeRegistry.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -9,8 +9,6 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.drools.common.DroolsObjectInput;
-
public class DialectRuntimeRegistry
implements
Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DroolsClassLoader.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DroolsClassLoader.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/DroolsClassLoader.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,6 @@
package org.drools.rule;
import java.io.InputStream;
-import java.io.Externalizable;
public interface DroolsClassLoader {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/EntryPoint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/EntryPoint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/EntryPoint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,13 +17,13 @@
*/
package org.drools.rule;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.io.Externalizable;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.ObjectOutput;
/**
* This class defines a Rete "Entry Point".
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/EvalCondition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/EvalCondition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/EvalCondition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,14 +16,14 @@
* limitations under the License.
*/
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.Externalizable;
import org.drools.RuntimeDroolsException;
import org.drools.WorkingMemory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Forall.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Forall.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Forall.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,15 +16,15 @@
package org.drools.rule;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
/**
* The forall conditional element.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/From.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/From.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/From.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,5 @@
package org.drools.rule;
-import java.io.Serializable;
import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
@@ -10,7 +9,6 @@
import java.util.Map;
import org.drools.spi.DataProvider;
-import org.drools.spi.ReturnValueExpression;
import org.drools.spi.Wireable;
public class From extends ConditionalElement
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ImportDeclaration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ImportDeclaration.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ImportDeclaration.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,8 +18,8 @@
package org.drools.rule;
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
-import java.io.IOException;
import java.io.ObjectOutput;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/JavaDialectRuntimeData.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/JavaDialectRuntimeData.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/JavaDialectRuntimeData.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -34,18 +34,9 @@
import java.util.Map.Entry;
import org.drools.RuntimeDroolsException;
-import org.drools.base.accumulators.JavaAccumulatorFunctionExecutor;
import org.drools.common.DroolsObjectInput;
-import org.drools.spi.Accumulator;
-import org.drools.spi.Consequence;
-import org.drools.spi.EvalExpression;
-import org.drools.spi.PredicateExpression;
-import org.drools.spi.ReturnValueEvaluator;
-import org.drools.spi.ReturnValueExpression;
import org.drools.spi.Wireable;
import org.drools.util.StringUtils;
-import org.drools.workflow.core.DroolsAction;
-import org.drools.workflow.instance.impl.ReturnValueConstraintEvaluator;
public class JavaDialectRuntimeData
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LineMappings.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LineMappings.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LineMappings.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,9 +1,8 @@
package org.drools.rule;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
public class LineMappings implements Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LiteralConstraint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -29,7 +29,6 @@
import org.drools.spi.Evaluator;
import org.drools.spi.FieldValue;
import org.drools.spi.InternalReadAccessor;
-import org.drools.spi.ReadAccessor;
public class LiteralConstraint
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -20,7 +20,6 @@
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
import java.util.Map;
import java.util.Stack;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/MVELDialectRuntimeData.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/MVELDialectRuntimeData.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/MVELDialectRuntimeData.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -12,12 +11,10 @@
import java.util.Map;
import java.util.Map.Entry;
-import org.drools.base.mvel.MVELCompilationUnit;
import org.drools.base.mvel.MVELCompileable;
import org.drools.spi.Wireable;
-import org.mvel.ast.Function;
-import org.mvel.integration.VariableResolver;
-import org.mvel.integration.impl.MapVariableResolverFactory;
+import org.mvel2.integration.VariableResolver;
+import org.mvel2.integration.impl.MapVariableResolverFactory;
public class MVELDialectRuntimeData
implements
@@ -119,10 +116,11 @@
Rule rule) {
}
- public void addFunction(Function function) {
+ public void addFunction(org.mvel2.ast.Function function) {
this.functionFactory.addFunction( function );
}
+ // TODO: FIXME: make it consistent with above
public void removeFunction(Package pkg,
org.drools.rule.Function function) {
this.functionFactory.removeFunction( function.getName() );
@@ -156,7 +154,7 @@
this.variables = (Map) in.readObject();
}
- public void addFunction(Function function) {
+ public void addFunction(org.mvel2.ast.Function function) {
this.variables.put( function.getName(),
function );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/MutableTypeConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/MutableTypeConstraint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/MutableTypeConstraint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,15 +18,15 @@
package org.drools.rule;
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.spi.AlphaNodeFieldConstraint;
import org.drools.spi.BetaNodeFieldConstraint;
import org.drools.spi.Constraint;
-import java.io.Externalizable;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
-
/**
* A base class for constraints
*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Package.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -26,13 +26,11 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
-import org.drools.base.ClassObjectType;
import org.drools.common.DroolsObjectInputStream;
import org.drools.common.DroolsObjectOutputStream;
import org.drools.facttemplates.FactTemplate;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/PredicateConstraint.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,14 +16,14 @@
* limitations under the License.
*/
+import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.io.Externalizable;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.IOException;
import org.drools.RuntimeDroolsException;
import org.drools.common.InternalFactHandle;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/ReturnValueRestriction.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,14 +16,13 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import java.io.Externalizable;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.IOException;
import org.drools.RuntimeDroolsException;
import org.drools.common.InternalFactHandle;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -380,7 +380,7 @@
* This uses the dateEffective, dateExpires and enabled flag to decide this.
*/
public boolean isEffective(TimeMachine tm, Tuple tuple, WorkingMemory workingMemory) {
- if ( !this.enabled.getValue( tuple, workingMemory ) ) {
+ if ( !this.enabled.getValue( tuple, this, workingMemory ) ) {
return false;
}
if ( this.dateEffective == null && this.dateExpires == null ) {
@@ -680,7 +680,7 @@
}
public boolean isEnabled( Tuple tuple, WorkingMemory workingMemory ) {
- return this.enabled.getValue( tuple, workingMemory );
+ return this.enabled.getValue( tuple, this, workingMemory );
}
public void setMetaAttributes(Map<String,String> metaAttributes) {
this.metaAttributes = metaAttributes;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/SlidingTimeWindow.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/SlidingTimeWindow.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/SlidingTimeWindow.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -273,7 +273,8 @@
private static class BehaviorJobContext
implements
- JobContext {
+ JobContext,
+ Externalizable {
public InternalWorkingMemory workingMemory;
public Behavior behavior;
public Object behaviorContext;
@@ -301,6 +302,16 @@
this.handle = jobHandle;
}
+ public void readExternal(ObjectInput in) throws IOException,
+ ClassNotFoundException {
+ //this.behavior = (O)
+ }
+
+ public void writeExternal(ObjectOutput out) throws IOException {
+ // TODO Auto-generated method stub
+
+ }
+
}
private static class BehaviorJob
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TimeMachine.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TimeMachine.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TimeMachine.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,9 @@
package org.drools.rule;
-import java.io.Serializable;
import java.io.Externalizable;
import java.io.IOException;
-import java.io.ObjectOutput;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.Calendar;
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TypeDeclaration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TypeDeclaration.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/TypeDeclaration.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -23,7 +23,6 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import org.drools.common.DroolsObjectInputStream;
import org.drools.factmodel.ClassDefinition;
import org.drools.facttemplates.FactTemplate;
import org.drools.spi.AcceptsReadAccessor;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/core/validation/RuleFlowProcessValidator.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -46,9 +46,9 @@
import org.drools.workflow.core.node.SubProcessNode;
import org.drools.workflow.core.node.WorkItemNode;
import org.drools.workflow.core.node.CompositeNode.NodeAndType;
-import org.mvel.ErrorDetail;
-import org.mvel.ParserContext;
-import org.mvel.compiler.ExpressionCompiler;
+import org.mvel2.ErrorDetail;
+import org.mvel2.ParserContext;
+import org.mvel2.compiler.ExpressionCompiler;
/**
* Default implementation of a RuleFlow validator.
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/ruleflow/instance/RuleFlowProcessInstanceFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,9 +1,9 @@
package org.drools.ruleflow.instance;
import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import org.drools.process.instance.InternalProcessInstance;
import org.drools.process.instance.ProcessInstanceFactory;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/AgendaGroup.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/AgendaGroup.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/AgendaGroup.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,5 @@
package org.drools.spi;
-import java.io.Serializable;
import java.io.Externalizable;
import java.util.Collection;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Enabled.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Enabled.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Enabled.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,8 +3,10 @@
import java.io.Serializable;
import org.drools.WorkingMemory;
+import org.drools.rule.Rule;
public interface Enabled extends Serializable {
public boolean getValue(final Tuple tuple,
+ final Rule rule,
final WorkingMemory workingMemory);
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ExecutorServiceFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ExecutorServiceFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ExecutorServiceFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,7 @@
package org.drools.spi;
+import org.drools.concurrent.ExecutorService;
import org.drools.util.ClassUtils;
-import org.drools.concurrent.ExecutorService;
/**
* Factory class that will return a ExecutorService based on the provided string className
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/FactHandleFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,13 +16,8 @@
* limitations under the License.
*/
-import java.io.IOException;
-import java.io.Serializable;
-
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;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/GlobalExtractor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/GlobalExtractor.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/GlobalExtractor.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -21,13 +21,11 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.lang.reflect.Method;
-import java.util.Map;
import org.drools.RuntimeDroolsException;
import org.drools.base.ClassObjectType;
import org.drools.base.ValueType;
import org.drools.common.InternalWorkingMemory;
-import org.drools.util.ClassUtils;
/**
* This is a global variable extractor used to get a global variable value
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PatternExtractor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PatternExtractor.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PatternExtractor.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -8,7 +8,6 @@
import org.drools.RuntimeDroolsException;
import org.drools.base.ClassObjectType;
-import org.drools.base.ShadowProxy;
import org.drools.base.ValueType;
import org.drools.common.InternalWorkingMemory;
import org.drools.facttemplates.Fact;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PredicateExpression.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PredicateExpression.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/PredicateExpression.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -19,8 +19,6 @@
import org.drools.rule.Declaration;
import org.drools.WorkingMemory;
-import java.io.Externalizable;
-
public interface PredicateExpression
extends
Invoker {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ReadAccessor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ReadAccessor.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ReadAccessor.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,5 @@
package org.drools.spi;
-import java.io.Externalizable;
import java.lang.reflect.Method;
import org.drools.base.ValueType;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Restriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Restriction.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Restriction.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,5 @@
package org.drools.spi;
-import java.io.Serializable;
import java.io.Externalizable;
import org.drools.common.InternalFactHandle;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/RuleBaseUpdateListenerFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/RuleBaseUpdateListenerFactory.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/RuleBaseUpdateListenerFactory.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,5 @@
package org.drools.spi;
-import java.util.HashMap;
-import java.util.Map;
-
import org.drools.StatefulSession;
import org.drools.util.ClassUtils;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/JobHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/JobHandle.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/JobHandle.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,8 +17,6 @@
*/
package org.drools.time;
-import java.io.Externalizable;
-import java.io.Serializable;
/**
* An interface for Job Handles
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/Trigger.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/Trigger.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/Trigger.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,5 @@
package org.drools.time;
-import java.io.Externalizable;
import java.util.Date;
public interface Trigger {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/impl/PseudoClockScheduler.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/impl/PseudoClockScheduler.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/time/impl/PseudoClockScheduler.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,6 +17,7 @@
*/
package org.drools.time.impl;
+import java.io.Externalizable;
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
@@ -45,7 +46,8 @@
public class PseudoClockScheduler
implements
TimerService,
- SessionPseudoClock {
+ SessionPseudoClock,
+ Externalizable {
private volatile long timer;
private PriorityQueue<ScheduledJob> queue;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/BinaryHeapQueue.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/BinaryHeapQueue.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/BinaryHeapQueue.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,8 +18,8 @@
import java.io.Externalizable;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
import java.util.Comparator;
import java.util.NoSuchElementException;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ChainedProperties.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ChainedProperties.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ChainedProperties.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,12 +3,11 @@
*/
package org.drools.util;
+import java.io.Externalizable;
import java.io.File;
import java.io.IOException;
-import java.io.Serializable;
-import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/DroolsStreamUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/DroolsStreamUtils.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/DroolsStreamUtils.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,12 +1,16 @@
package org.drools.util;
-import org.drools.common.DroolsObjectOutputStream;
-import org.drools.common.DroolsObjectInputStream;
-
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
+import org.drools.common.DroolsObjectInputStream;
+import org.drools.common.DroolsObjectOutputStream;
+
/**
* Created by IntelliJ IDEA.
* User: sg0521861
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/Entry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/Entry.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/Entry.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,7 +3,6 @@
*/
package org.drools.util;
-import java.io.Externalizable;
public interface Entry {
public void setNext(Entry next);
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/JavaIteratorAdapter.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/JavaIteratorAdapter.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/JavaIteratorAdapter.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,10 +2,8 @@
import java.util.NoSuchElementException;
-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/trunk/drools-core/src/main/java/org/drools/util/LeftTupleIndexHashTable.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LeftTupleIndexHashTable.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LeftTupleIndexHashTable.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,18 +3,14 @@
*/
package org.drools.util;
-import org.drools.common.InternalFactHandle;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.LeftTupleMemory;
import org.drools.reteoo.RightTuple;
-import org.drools.util.AbstractHashTable.HashTableIterator;
-import org.drools.util.AbstractHashTable.ObjectComparator;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
-import java.io.Externalizable;
-
public class LeftTupleIndexHashTable extends AbstractHashTable
implements
LeftTupleMemory {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LeftTupleList.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LeftTupleList.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LeftTupleList.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,11 +3,6 @@
*/
package org.drools.util;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
-import org.drools.common.InternalFactHandle;
import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.LeftTupleMemory;
import org.drools.reteoo.RightTuple;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedList.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedList.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedList.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,9 +1,9 @@
package org.drools.util;
import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import java.util.NoSuchElementException;
/*
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedListEntry.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedListEntry.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/LinkedListEntry.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,8 @@
package org.drools.util;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashMap.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashMap.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashMap.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,12 +3,10 @@
*/
package org.drools.util;
-import org.drools.util.AbstractHashTable.EqualityEquals;
-
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
public class ObjectHashMap extends AbstractHashTable implements Externalizable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashSet.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashSet.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/ObjectHashSet.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,11 +3,9 @@
*/
package org.drools.util;
-import org.drools.util.AbstractHashTable.EqualityEquals;
-
import java.io.Externalizable;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
public class ObjectHashSet extends AbstractHashTable {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/PrimitiveLongMap.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/PrimitiveLongMap.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/PrimitiveLongMap.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
import java.util.Arrays;
import java.util.Collection;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/PrimitiveLongStack.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/PrimitiveLongStack.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/PrimitiveLongStack.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,10 +16,9 @@
* limitations under the License.
*/
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
public class PrimitiveLongStack
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/RightTupleIndexHashTable.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/RightTupleIndexHashTable.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/RightTupleIndexHashTable.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,20 +3,14 @@
*/
package org.drools.util;
-import org.drools.common.InternalFactHandle;
-import org.drools.reteoo.RightTuple;
-import org.drools.reteoo.RightTupleMemory;
-import org.drools.reteoo.LeftTuple;
-import org.drools.util.AbstractHashTable.HashTableIterator;
-import org.drools.util.AbstractHashTable.Index;
-import org.drools.util.AbstractHashTable.ObjectComparator;
-import org.drools.util.LeftTupleIndexHashTable.FieldIndexHashTableFullIterator;
-
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Externalizable;
+import org.drools.reteoo.LeftTuple;
+import org.drools.reteoo.RightTuple;
+import org.drools.reteoo.RightTupleMemory;
+
public class RightTupleIndexHashTable extends AbstractHashTable
implements
RightTupleMemory {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/RightTupleList.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/RightTupleList.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/RightTupleList.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,16 +3,11 @@
*/
package org.drools.util;
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
import org.drools.common.InternalFactHandle;
+import org.drools.reteoo.LeftTuple;
import org.drools.reteoo.RightTuple;
import org.drools.reteoo.RightTupleMemory;
-import org.drools.reteoo.LeftTuple;
import org.drools.util.AbstractHashTable.Index;
-import org.drools.util.LeftTupleList.TupleHashTableIterator;
public class RightTupleList
implements
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/StringUtils.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/StringUtils.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/StringUtils.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,8 +17,6 @@
* limitations under the License.
*/
-import java.io.BufferedReader;
-import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
import java.util.ArrayList;
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/DroolsAction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/DroolsAction.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/workflow/core/DroolsAction.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/CheeseEqual.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/CheeseEqual.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/CheeseEqual.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,9 @@
package org.drools;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
/*
* Copyright 2005 JBoss Inc
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/MockFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/MockFactHandle.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/MockFactHandle.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,8 @@
package org.drools;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
import org.drools.runtime.rule.FactHandle;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/TestWorkingMemoryEventListener.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/TestWorkingMemoryEventListener.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/TestWorkingMemoryEventListener.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,16 +17,16 @@
*/
import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import org.drools.event.ActivationCancelledEvent;
import org.drools.event.ActivationCreatedEvent;
import org.drools.event.AfterActivationFiredEvent;
import org.drools.event.ObjectInsertedEvent;
+import org.drools.event.ObjectRetractedEvent;
import org.drools.event.ObjectUpdatedEvent;
-import org.drools.event.ObjectRetractedEvent;
import org.drools.event.WorkingMemoryEventListener;
public class TestWorkingMemoryEventListener
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/DirectoryScannerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/DirectoryScannerTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/DirectoryScannerTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,12 +3,12 @@
import java.io.File;
import java.util.Properties;
+import junit.framework.TestCase;
+
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.rule.Package;
-import junit.framework.TestCase;
-
public class DirectoryScannerTest extends TestCase {
public void testScan() throws Exception {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/FileScannerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/FileScannerTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/FileScannerTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,20 +1,16 @@
package org.drools.agent;
import java.io.File;
-import java.io.FileOutputStream;
-import java.io.ObjectOutputStream;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import junit.framework.TestCase;
+
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.rule.Package;
-import junit.framework.TestCase;
-
public class FileScannerTest extends TestCase {
public void testHasChanged() {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/MockProvider.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/MockProvider.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/MockProvider.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,8 +1,6 @@
package org.drools.agent;
import java.util.Properties;
-
-import org.drools.rule.Package;
public class MockProvider extends PackageProvider {
public MockProvider() {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/MockRuleAgent.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/MockRuleAgent.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/MockRuleAgent.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,5 @@
package org.drools.agent;
-import java.util.Properties;
-
import org.drools.RuleBaseConfiguration;
public class MockRuleAgent extends RuleAgent {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleAgentTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleAgentTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleAgentTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,21 +2,20 @@
import java.io.File;
import java.io.FileOutputStream;
-import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Random;
+import junit.framework.TestCase;
+
import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseConfiguration.SequentialAgenda;
import org.drools.common.InternalRuleBase;
import org.drools.rule.Package;
-import junit.framework.TestCase;
-
public class RuleAgentTest extends TestCase {
public void testLists() {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleBaseAssemblerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleBaseAssemblerTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/RuleBaseAssemblerTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -5,19 +5,17 @@
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.util.DroolsStreamUtils;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.rule.Package;
+import org.drools.util.DroolsStreamUtils;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.framework.Test;
-
public class RuleBaseAssemblerTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/URLScannerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/URLScannerTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/agent/URLScannerTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -5,8 +5,6 @@
import java.io.IOException;
import java.net.URL;
import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Properties;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/ClassTypeResolverTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/ClassTypeResolverTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/ClassTypeResolverTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -10,9 +10,6 @@
import org.drools.Cheese;
import org.drools.FirstClass;
import org.drools.SecondClass;
-import org.drools.base.ClassTypeResolver;
-import org.drools.base.TypeResolver;
-import org.drools.Person.Nested1.Nested2.Nested3;
/**
* @author fburlet
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/FieldValueTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/FieldValueTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/base/FieldValueTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-import org.drools.spi.FieldValue;
-
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.drools.spi.FieldValue;
+
public class FieldValueTest extends TestCase {
FieldValue field1;
FieldValue field2;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/DroolsObjectIOTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/DroolsObjectIOTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/DroolsObjectIOTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,20 +1,20 @@
package org.drools.common;
-import junit.framework.TestCase;
-
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.Externalizable;
import java.io.File;
-import java.io.ByteArrayOutputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInput;
-import java.io.FileOutputStream;
-import java.io.Externalizable;
-import java.io.IOException;
+import java.io.ObjectInputStream;
import java.io.ObjectOutput;
-import java.io.ByteArrayInputStream;
+import java.io.ObjectOutputStream;
import java.io.Serializable;
-import java.io.ObjectOutputStream;
-import java.io.ObjectInputStream;
+import junit.framework.TestCase;
+
import org.drools.rule.GroupElement;
import org.drools.rule.Package;
import org.drools.util.DroolsStreamUtils;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/EqualityKeyTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/EqualityKeyTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/EqualityKeyTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,11 +1,10 @@
package org.drools.common;
+import junit.framework.TestCase;
+
import org.drools.Cheese;
import org.drools.reteoo.ReteooFactHandleFactory;
-import org.drools.spi.FactHandleFactory;
-import junit.framework.TestCase;
-
public class EqualityKeyTest extends TestCase {
public void test1() {
ReteooFactHandleFactory factory = new ReteooFactHandleFactory();
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/SequentialAgendaTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/SequentialAgendaTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/common/SequentialAgendaTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,10 @@
package org.drools.common;
+import junit.framework.TestCase;
+
import org.drools.rule.Rule;
import org.drools.spi.Activation;
-import junit.framework.TestCase;
-
public class SequentialAgendaTest extends TestCase {
public void testgetNext() {
SequentialAgendaGroupImpl agenda = new SequentialAgendaGroupImpl( "test", null );
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/AgendaEventSupportTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-import java.io.Serializable;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -28,11 +28,10 @@
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
-import org.drools.base.ClassFieldReader;
import org.drools.base.ClassFieldAccessorCache;
+import org.drools.base.ClassFieldReader;
import org.drools.base.ClassObjectType;
import org.drools.base.FieldFactory;
-import org.drools.base.ShadowProxy;
import org.drools.base.ValueType;
import org.drools.base.evaluators.ComparableEvaluatorsDefinition;
import org.drools.base.evaluators.EqualityEvaluatorsDefinition;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/event/WorkingMemoryEventSupportTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -20,14 +20,14 @@
import java.util.ArrayList;
import java.util.List;
+import junit.framework.TestCase;
+
import org.drools.Cheese;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
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>
*/
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Chosen.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Chosen.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Chosen.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,10 +15,9 @@
*/
package org.drools.examples.manners;
-import java.io.Serializable;
import java.io.Externalizable;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
public class Chosen
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Guest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Guest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Guest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,9 +16,9 @@
package org.drools.examples.manners;
import java.io.Externalizable;
+import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
public class Guest
implements
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/LastSeat.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/LastSeat.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/LastSeat.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,8 +16,8 @@
package org.drools.examples.manners;
import java.io.Externalizable;
+import java.io.IOException;
import java.io.ObjectInput;
-import java.io.IOException;
import java.io.ObjectOutput;
public class LastSeat
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Seating.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Seating.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/Seating.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,8 +17,8 @@
import java.io.Externalizable;
import java.io.IOException;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
public class Seating
implements
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/factmodel/InstancesHashcodedTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/factmodel/InstancesHashcodedTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/factmodel/InstancesHashcodedTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -17,7 +17,6 @@
*/
package org.drools.factmodel;
-import java.sql.Types;
import java.util.Calendar;
import java.util.Date;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/facttemplates/FactTemplateFieldExtractorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/facttemplates/FactTemplateFieldExtractorTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/facttemplates/FactTemplateFieldExtractorTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,9 +2,9 @@
import junit.framework.TestCase;
-import org.drools.rule.Pattern;
import org.drools.rule.Declaration;
import org.drools.rule.Package;
+import org.drools.rule.Pattern;
import org.drools.spi.InternalReadAccessor;
public class FactTemplateFieldExtractorTest extends TestCase {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/integrationtests/SerializationHelper.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/integrationtests/SerializationHelper.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/integrationtests/SerializationHelper.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,9 +1,9 @@
package org.drools.integrationtests;
+import java.io.IOException;
+
import org.drools.util.DroolsStreamUtils;
-import java.io.IOException;
-
/**
* Marshalling helper class to perform serialize/de-serialize a given object
*/
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/EventTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/EventTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/process/EventTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,8 +18,8 @@
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;
-import org.drools.spi.KnowledgeHelper;
import org.drools.workflow.core.DroolsAction;
import org.drools.workflow.core.Node;
import org.drools.workflow.core.impl.ConnectionImpl;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/BetaNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/BetaNodeTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/BetaNodeTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,13 +16,13 @@
package org.drools.reteoo;
+import junit.framework.TestCase;
+
import org.drools.RuleBaseFactory;
import org.drools.common.EmptyBetaConstraints;
import org.drools.reteoo.builder.BuildContext;
import org.drools.rule.Behavior;
-import junit.framework.TestCase;
-
/**
* @author etirelli
*
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/CrossProductTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/CrossProductTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/CrossProductTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,20 +16,20 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.IOException;
import junit.framework.TestCase;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.base.ClassObjectType;
-import org.drools.rule.Pattern;
import org.drools.rule.Declaration;
import org.drools.rule.Package;
+import org.drools.rule.Pattern;
import org.drools.rule.Rule;
import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/EvalConditionNodeTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -24,7 +24,6 @@
import org.drools.reteoo.EvalConditionNode.EvalMemory;
import org.drools.reteoo.builder.BuildContext;
import org.drools.spi.PropagationContext;
-import org.drools.util.LeftTupleList;
public class EvalConditionNodeTest extends DroolsTestCase {
private PropagationContext context;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ExistsNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ExistsNodeTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ExistsNodeTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -18,8 +18,6 @@
import java.beans.IntrospectionException;
-import junit.framework.Assert;
-
import org.drools.Cheese;
import org.drools.DroolsTestCase;
import org.drools.FactException;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/FromNodeTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -10,9 +10,9 @@
import org.drools.Cheese;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
+import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassFieldReader;
-import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassObjectType;
import org.drools.base.FieldFactory;
import org.drools.base.ValueType;
@@ -36,8 +36,6 @@
import org.drools.spi.FieldValue;
import org.drools.spi.PropagationContext;
import org.drools.spi.Tuple;
-import org.drools.util.LinkedList;
-import org.drools.util.LinkedListEntry;
public class FromNodeTest extends TestCase {
EqualityEvaluatorsDefinition equals = new EqualityEvaluatorsDefinition();
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/JoinNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/JoinNodeTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/JoinNodeTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -21,7 +21,6 @@
import java.util.List;
import org.drools.DroolsTestCase;
-import org.drools.RuleBase;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.common.DefaultBetaConstraints;
@@ -35,8 +34,6 @@
import org.drools.spi.BetaNodeFieldConstraint;
import org.drools.spi.MockConstraint;
import org.drools.spi.PropagationContext;
-import org.drools.util.FactEntry;
-import org.drools.util.Iterator;
public class JoinNodeTest extends DroolsTestCase {
Rule rule;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LeftInputAdapterNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LeftInputAdapterNodeTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LeftInputAdapterNodeTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -21,15 +21,11 @@
import org.drools.DroolsTestCase;
import org.drools.RuleBaseFactory;
-import org.drools.common.BaseNode;
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.spi.PropagationContext;
import org.drools.spi.Tuple;
-import org.drools.util.RightTupleList;
public class LeftInputAdapterNodeTest extends DroolsTestCase {
private ReteooRuleBase ruleBase;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/LogicalAssertionTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,6 +16,10 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
import org.drools.Agenda;
import org.drools.Cheese;
import org.drools.DroolsTestCase;
@@ -24,7 +28,6 @@
import org.drools.RuleBaseFactory;
import org.drools.RuleBaseConfiguration.LogicalOverride;
import org.drools.base.ClassObjectType;
-import org.drools.base.ShadowProxy;
import org.drools.common.DefaultFactHandle;
import org.drools.common.InternalAgenda;
import org.drools.common.InternalFactHandle;
@@ -38,10 +41,6 @@
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.PropagationContext;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
-
public class LogicalAssertionTest extends DroolsTestCase {
private ReteooRuleBase ruleBase;
private BuildContext buildContext;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockEvalCondition.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,16 +16,16 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+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;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
-
public class MockEvalCondition extends EvalCondition {
/**
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockObjectSink.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockObjectSink.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockObjectSink.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,11 +16,11 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockObjectSource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockObjectSource.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockObjectSource.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,12 +16,6 @@
* limitations under the License.
*/
-import org.drools.common.BaseNode;
-import org.drools.common.InternalFactHandle;
-import org.drools.common.InternalWorkingMemory;
-import org.drools.common.RuleBasePartitionId;
-import org.drools.spi.PropagationContext;
-
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
@@ -29,6 +23,12 @@
import java.util.Iterator;
import java.util.List;
+import org.drools.common.BaseNode;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.common.RuleBasePartitionId;
+import org.drools.spi.PropagationContext;
+
public class MockObjectSource extends ObjectSource {
/**
*
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockRightTupleSink.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockRightTupleSink.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/MockRightTupleSink.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,10 @@
package org.drools.reteoo;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
-import java.io.ObjectOutput;
-import java.io.IOException;
-import java.io.ObjectInput;
import org.drools.common.InternalWorkingMemory;
import org.drools.common.RuleBasePartitionId;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ObjectTypeNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ObjectTypeNodeTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ObjectTypeNodeTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-import java.lang.reflect.Field;
import java.util.List;
import java.util.Map;
@@ -28,7 +27,6 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.base.ClassObjectType;
-import org.drools.base.ShadowProxy;
import org.drools.common.DefaultFactHandle;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalRuleBase;
@@ -39,8 +37,6 @@
import org.drools.spi.ObjectType;
import org.drools.spi.PropagationContext;
import org.drools.util.ObjectHashSet;
-import org.drools.util.RightTupleList;
-import org.drools.util.ObjectHashMap;
public class ObjectTypeNodeTest extends DroolsTestCase {
private ReteooRuleBase ruleBase;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/OtherwiseTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/OtherwiseTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/OtherwiseTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,24 +1,24 @@
package org.drools.reteoo;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import junit.framework.TestCase;
+
import org.drools.Otherwise;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassObjectType;
import org.drools.base.TestBean;
+import org.drools.rule.Package;
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;
-import junit.framework.TestCase;
-
-import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-
/**
* This tests the "otherwise" feature.
* @author Michael Neale
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/PartitionTaskManagerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/PartitionTaskManagerTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/PartitionTaskManagerTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,7 +15,6 @@
*/
package org.drools.reteoo;
-import junit.framework.Assert;
import junit.framework.TestCase;
import org.drools.RuleBase;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/QueryTerminalNodeTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -26,9 +26,9 @@
import org.drools.QueryResult;
import org.drools.QueryResults;
import org.drools.RuleBaseFactory;
+import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassFieldReader;
-import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassObjectType;
import org.drools.base.DroolsQuery;
import org.drools.base.FieldFactory;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -21,7 +21,6 @@
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import java.util.Properties;
import org.drools.Cheese;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooBuilderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooBuilderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,5 +1,11 @@
package org.drools.reteoo;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
+import junit.framework.TestCase;
+
import org.drools.RuleBaseConfiguration;
import org.drools.base.SalienceInteger;
import org.drools.rule.Rule;
@@ -7,12 +13,6 @@
import org.drools.spi.Consequence;
import org.drools.spi.KnowledgeHelper;
-import junit.framework.TestCase;
-
-import java.io.IOException;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-
public class ReteooBuilderTest extends TestCase {
public void testOrder() {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/ReteooWorkingMemoryTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -15,7 +15,6 @@
import org.drools.common.EqualityKey;
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;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/RuleFlowGroupTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,18 +16,17 @@
* limitations under the License.
*/
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.ArrayList;
import java.util.List;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
-import java.io.IOException;
import org.drools.DroolsTestCase;
import org.drools.RuleBaseFactory;
import org.drools.base.SalienceInteger;
import org.drools.common.DefaultAgenda;
import org.drools.common.DefaultFactHandle;
-import org.drools.common.InternalAgenda;
import org.drools.common.PropagationContextImpl;
import org.drools.common.RuleFlowGroupImpl;
import org.drools.process.instance.InternalProcessInstance;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/SchedulerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/SchedulerTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/SchedulerTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,15 +16,14 @@
* limitations under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-import java.io.ObjectOutput;
import java.io.IOException;
import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.ArrayList;
+import java.util.List;
import org.drools.Agenda;
import org.drools.DroolsTestCase;
-import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.common.DefaultFactHandle;
import org.drools.common.InternalWorkingMemory;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/builder/ReteooRuleBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/builder/ReteooRuleBuilderTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/builder/ReteooRuleBuilderTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -16,10 +16,10 @@
package org.drools.reteoo.builder;
-import java.util.List;
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.util.List;
import junit.framework.Assert;
import junit.framework.TestCase;
@@ -28,11 +28,9 @@
import org.drools.reteoo.ReteooBuilder;
import org.drools.reteoo.ReteooRuleBase;
import org.drools.reteoo.RuleTerminalNode;
-import org.drools.reteoo.ReteooBuilder.IdGenerator;
-import org.drools.rule.Package;
-import org.drools.rule.Pattern;
import org.drools.rule.GroupElement;
import org.drools.rule.GroupElementFactory;
+import org.drools.rule.Pattern;
import org.drools.rule.Rule;
import org.drools.WorkingMemory;
import org.drools.spi.Consequence;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/EnumSerialiationTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/EnumSerialiationTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/EnumSerialiationTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,6 +1,7 @@
package org.drools.rule;
import junit.framework.TestCase;
+
import org.drools.integrationtests.SerializationHelper;
/**
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/FieldConstraintTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -30,7 +30,6 @@
import org.drools.base.ClassFieldReader;
import org.drools.base.ClassObjectType;
import org.drools.base.FieldFactory;
-import org.drools.base.ShadowProxy;
import org.drools.base.ValueType;
import org.drools.base.evaluators.ComparableEvaluatorsDefinition;
import org.drools.base.evaluators.EqualityEvaluatorsDefinition;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/GroupElementTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/GroupElementTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/GroupElementTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,10 +1,10 @@
package org.drools.rule;
-import org.drools.RuntimeDroolsException;
-
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.drools.RuntimeDroolsException;
+
public class GroupElementTest extends TestCase {
public void testPackNestedAnd() {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/LogicTransformerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/LogicTransformerTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/LogicTransformerTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -19,13 +19,11 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
import org.drools.DroolsTestCase;
-import org.drools.util.DroolsStreamUtils;
import org.drools.base.ClassObjectType;
import org.drools.spi.ObjectType;
+import org.drools.util.DroolsStreamUtils;
public class LogicTransformerTest extends DroolsTestCase {
/**
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/PackageCompilationDataTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,8 +3,8 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectInput;
import java.security.CodeSource;
import junit.framework.TestCase;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/RuleTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/RuleTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/rule/RuleTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -2,10 +2,10 @@
import java.util.Calendar;
+import junit.framework.TestCase;
+
import org.drools.base.EnabledBoolean;
-import junit.framework.TestCase;
-
/**
* @author Michael Neale
*/
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/spi/MockObjectType.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/spi/MockObjectType.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/spi/MockObjectType.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,12 +1,11 @@
package org.drools.spi;
-import org.drools.base.ClassObjectType;
-import org.drools.base.ValueType;
-
-import java.io.ObjectOutput;
-import java.io.ObjectInput;
import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import org.drools.base.ValueType;
+
/*
* Copyright 2005 JBoss Inc
*
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/FieldIndexEntryTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/FieldIndexEntryTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/FieldIndexEntryTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -3,9 +3,9 @@
import junit.framework.TestCase;
import org.drools.Cheese;
+import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ClassFieldAccessorStore;
import org.drools.base.ClassFieldReader;
-import org.drools.base.ClassFieldAccessorCache;
import org.drools.base.ValueType;
import org.drools.base.evaluators.EqualityEvaluatorsDefinition;
import org.drools.base.evaluators.Operator;
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/ObjectHashMapTest2.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/ObjectHashMapTest2.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/ObjectHashMapTest2.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -1,7 +1,6 @@
package org.drools.util;
import junit.framework.TestCase;
-import org.drools.util.ObjectHashMap;
public class ObjectHashMapTest2 extends TestCase {
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/RightTupleListTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/RightTupleListTest.java 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/util/RightTupleListTest.java 2008-10-31 14:28:13 UTC (rev 23650)
@@ -6,8 +6,6 @@
import org.drools.common.DefaultFactHandle;
import org.drools.common.InternalFactHandle;
import org.drools.reteoo.LeftTuple;
-import org.drools.reteoo.RightTuple;
-import org.drools.util.ObjectHashMap.ObjectEntry;
public class RightTupleListTest extends TestCase {
public void testEmptyIterator() {
Modified: labs/jbossrules/trunk/pom.xml
===================================================================
--- labs/jbossrules/trunk/pom.xml 2008-10-31 13:35:01 UTC (rev 23649)
+++ labs/jbossrules/trunk/pom.xml 2008-10-31 14:28:13 UTC (rev 23650)
@@ -13,7 +13,7 @@
<url>http://www.jboss.com/products/rules</url>
<properties>
- <mvel.dep.version>2.0-SNAPSHOT</mvel.dep.version>
+ <mvel.dep.version>2.0.1-SNAPSHOT</mvel.dep.version>
</properties>
@@ -903,7 +903,7 @@
</dependency>
<dependency>
<groupId>org.mvel</groupId>
- <artifactId>mvel</artifactId>
+ <artifactId>mvel2</artifactId>
<version>${mvel.dep.version}</version>
</dependency>
More information about the jboss-svn-commits
mailing list