Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6.1.x #393

Closed
wants to merge 77 commits into from
Closed

6.1.x #393

wants to merge 77 commits into from

Conversation

WebsterHomer
Copy link

No description provided.

mariofusco and others added 30 commits June 9, 2014 14:57
…t includes a kiebase from a different kjar

(cherry picked from commit 7320e0c)
…to generate modify() {...} block

(cherry picked from commit bc6203b)
… give a complete error reporting

(cherry picked from commit 789b4e2)
(cherry picked from commit acff8a982ca853f76d46547f0c7803eb9c7de0c1)
…a non-maven project

(cherry picked from commit 1fb4c12)
…ing to Integer in BRMS 6.0.1

(cherry picked from commit 73c1ee5)
mariofusco and others added 25 commits July 24, 2014 17:01
(cherry picked from commit 8b55c3b)
(cherry picked from commit 59973c9)
  * this phase is needed in order to copy the test resources into target/,
    so they can be actually used for testing.
(cherry picked from commit e5f1dc8)
(cherry picked from commit 9db38d0)
(cherry picked from commit 855efef)
(cherry picked from commit 7941a0c)
(cherry picked from commit a1d5e6d)
(cherry picked from commit 785e278)
(cherry picked from commit 2ed3e36)
-Change back to use BufferedImage.
-Improve the synchronisation of paint().
-Make pong, wumpus and invaders all share more code.
-Update TextAdventure for lock handling, attacking and general improvements.
(cherry picked from commit 3dd405f)
(cherry picked from commit fa919b3)
-Minor corrections
(cherry picked from commit b0e442d)
Conflicts:
	drools-compiler/pom.xml
	drools-compiler/src/main/java/org/drools/compiler/builder/impl/CompositeKnowledgeBuilderImpl.java
	drools-compiler/src/main/java/org/drools/compiler/builder/impl/KnowledgeBuilderImpl.java
	drools-compiler/src/main/java/org/drools/compiler/compiler/PMMLCompilerFactory.java
	drools-compiler/src/main/java/org/drools/compiler/compiler/PackageBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/compiler/PackageBuilderConfiguration.java
	drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/AbstractKieModule.java
	drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/InternalKieScanner.java
	drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieBuilderSetImpl.java
	drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieContainerImpl.java
	drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieMetaInfoBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieRepositoryImpl.java
	drools-compiler/src/main/java/org/drools/compiler/kie/builder/impl/KieServicesImpl.java
	drools-compiler/src/main/java/org/drools/compiler/kie/util/CDIHelper.java
	drools-compiler/src/main/java/org/drools/compiler/kie/util/ChangeSetBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/kproject/ReleaseIdImpl.java
	drools-compiler/src/main/java/org/drools/compiler/lang/descr/AnnotationDescr.java
	drools-compiler/src/main/java/org/drools/compiler/lang/descr/CompositePackageDescr.java
	drools-compiler/src/main/java/org/drools/compiler/lang/descr/PackageDescr.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/ConditionalBranchBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/MVELConstraintBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/PackageBuildContext.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/PatternBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/QueryBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/QueryElementBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/RuleBuildContext.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/RuleBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/java/JavaAccumulateBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/java/JavaDialect.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/mvel/MVELAccumulateBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/mvel/MVELConsequenceBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/mvel/MVELDialect.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/mvel/MVELEnabledBuilder.java
	drools-compiler/src/main/java/org/drools/compiler/rule/builder/dialect/mvel/MVELSalienceBuilder.java
	drools-compiler/src/main/resources/org/drools/compiler/rule/builder/dialect/java/javaRule.mvel
	drools-compiler/src/test/java/org/drools/compiler/CommonTestMethodBase.java
	drools-compiler/src/test/java/org/drools/compiler/beliefsystem/defeasible/DefeasibilityTest.java
	drools-compiler/src/test/java/org/drools/compiler/compiler/PackageBuilderConfigurationTest.java
	drools-compiler/src/test/java/org/drools/compiler/compiler/TypeDeclarationTest.java
	drools-compiler/src/test/java/org/drools/compiler/factmodel/traits/LogicalTraitTest.java
	drools-compiler/src/test/java/org/drools/compiler/factmodel/traits/TraitFieldsAndLegacyClassesTest.java
	drools-compiler/src/test/java/org/drools/compiler/factmodel/traits/TraitMapCoreTest.java
	drools-compiler/src/test/java/org/drools/compiler/factmodel/traits/TraitTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/AccumulateTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/AddRemoveRulesTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/AnnotationsTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/CepEspTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/ChangesetUndoTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/DynamicRuleRemovalTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/ExecutionFlowControlTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/ExtendsTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/IncrementalCompilationTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/IndexingTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/KieLoggersTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/KnowledgeBuilderTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/LargeRuleBaseSerializationTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/Misc2Test.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/MiscTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/QueryTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/SerializationHelper.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/TimerAndCalendarTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/TruthMaintenanceTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/marshalling/FactHandleMarshallingTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/marshalling/MarshallingTest.java
	drools-compiler/src/test/java/org/drools/compiler/integrationtests/sequential/SequentialTest.java
	drools-compiler/src/test/java/org/drools/compiler/kproject/KieProjectDefaultClasspathTest.java
	drools-compiler/src/test/java/org/drools/compiler/lang/descr/PackageDescrTest.java
	drools-compiler/src/test/java/org/drools/compiler/phreak/SegmentPropagationTest.java
	drools-compiler/src/test/java/org/drools/compiler/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
	drools-compiler/src/test/java/org/drools/compiler/testframework/MockWorkingMemory.java
	drools-compiler/src/test/resources/org/drools/compiler/beliefsystem/defeasible/defeat.drl
	drools-compiler/src/test/resources/org/drools/compiler/beliefsystem/defeasible/defeaterOnly.drl
	drools-compiler/src/test/resources/org/drools/compiler/beliefsystem/defeasible/multiDefeat.drl
	drools-compiler/src/test/resources/org/drools/compiler/beliefsystem/defeasible/strictOverride.drl
	drools-core/pom.xml
	drools-core/src/main/java/org/drools/core/RuleBaseConfiguration.java
	drools-core/src/main/java/org/drools/core/audit/WorkingMemoryLogger.java
	drools-core/src/main/java/org/drools/core/base/ClassFieldAccessorFactory.java
	drools-core/src/main/java/org/drools/core/base/DefaultKnowledgeHelper.java
	drools-core/src/main/java/org/drools/core/base/DroolsQuery.java
	drools-core/src/main/java/org/drools/core/base/EvaluatorWrapper.java
	drools-core/src/main/java/org/drools/core/base/UndefinedCalendarExcption.java
	drools-core/src/main/java/org/drools/core/base/mvel/MVELReturnValueExpression.java
	drools-core/src/main/java/org/drools/core/beliefsystem/defeasible/DefeasibleBeliefSet.java
	drools-core/src/main/java/org/drools/core/beliefsystem/defeasible/DefeasibleBeliefSystem.java
	drools-core/src/main/java/org/drools/core/beliefsystem/jtms/JTMSBeliefSet.java
	drools-core/src/main/java/org/drools/core/beliefsystem/jtms/JTMSBeliefSystem.java
	drools-core/src/main/java/org/drools/core/beliefsystem/simple/BeliefSystemLogicalCallback.java
	drools-core/src/main/java/org/drools/core/command/impl/CommandBasedStatefulKnowledgeSession.java
	drools-core/src/main/java/org/drools/core/command/runtime/rule/FireUntilHaltCommand.java
	drools-core/src/main/java/org/drools/core/command/runtime/rule/GetObjectInEntryPointCommand.java
	drools-core/src/main/java/org/drools/core/command/runtime/rule/GetObjectsInEntryPointCommand.java
	drools-core/src/main/java/org/drools/core/common/AbstractWorkingMemory.java
	drools-core/src/main/java/org/drools/core/common/AgendaGroupQueueImpl.java
	drools-core/src/main/java/org/drools/core/common/DefaultAgenda.java
	drools-core/src/main/java/org/drools/core/common/DefaultFactHandle.java
	drools-core/src/main/java/org/drools/core/common/NamedEntryPoint.java
	drools-core/src/main/java/org/drools/core/common/PhreakWorkingMemoryFactory.java
	drools-core/src/main/java/org/drools/core/common/ProjectClassLoader.java
	drools-core/src/main/java/org/drools/core/common/Scheduler.java
	drools-core/src/main/java/org/drools/core/concurrent/ExecutorProviderImpl.java
	drools-core/src/main/java/org/drools/core/definitions/impl/KnowledgePackageImpl.java
	drools-core/src/main/java/org/drools/core/factmodel/DefaultBeanClassBuilder.java
	drools-core/src/main/java/org/drools/core/factmodel/traits/TraitClassBuilderImpl.java
	drools-core/src/main/java/org/drools/core/factmodel/traits/TraitCoreWrapperClassBuilderImpl.java
	drools-core/src/main/java/org/drools/core/factmodel/traits/TraitFactory.java
	drools-core/src/main/java/org/drools/core/factmodel/traits/TraitField.java
	drools-core/src/main/java/org/drools/core/factmodel/traits/TraitMapPropertyWrapperClassBuilderImpl.java
	drools-core/src/main/java/org/drools/core/factmodel/traits/TraitMapProxyClassBuilderImpl.java
	drools-core/src/main/java/org/drools/core/factmodel/traits/TraitTriplePropertyWrapperClassBuilderImpl.java
	drools-core/src/main/java/org/drools/core/factmodel/traits/TraitTripleProxyClassBuilderImpl.java
	drools-core/src/main/java/org/drools/core/factmodel/traits/TypeCache.java
	drools-core/src/main/java/org/drools/core/impl/KnowledgeBaseImpl.java
	drools-core/src/main/java/org/drools/core/impl/StatefulKnowledgeSessionImpl.java
	drools-core/src/main/java/org/drools/core/impl/StatelessKnowledgeSessionImpl.java
	drools-core/src/main/java/org/drools/core/io/impl/UrlResource.java
	drools-core/src/main/java/org/drools/core/marshalling/impl/InputMarshaller.java
	drools-core/src/main/java/org/drools/core/marshalling/impl/OutputMarshaller.java
	drools-core/src/main/java/org/drools/core/marshalling/impl/PersisterHelper.java
	drools-core/src/main/java/org/drools/core/marshalling/impl/ProtobufInputMarshaller.java
	drools-core/src/main/java/org/drools/core/marshalling/impl/ProtobufOutputMarshaller.java
	drools-core/src/main/java/org/drools/core/phreak/AddRemoveRule.java
	drools-core/src/main/java/org/drools/core/phreak/PhreakQueryNode.java
	drools-core/src/main/java/org/drools/core/phreak/RuleAgendaItem.java
	drools-core/src/main/java/org/drools/core/phreak/RuleExecutor.java
	drools-core/src/main/java/org/drools/core/phreak/SegmentUtilities.java
	drools-core/src/main/java/org/drools/core/process/instance/WorkItem.java
	drools-core/src/main/java/org/drools/core/process/instance/impl/WorkItemImpl.java
	drools-core/src/main/java/org/drools/core/reteoo/BetaNode.java
	drools-core/src/main/java/org/drools/core/reteoo/ClassObjectTypeConf.java
	drools-core/src/main/java/org/drools/core/reteoo/DisposedReteooWorkingMemory.java
	drools-core/src/main/java/org/drools/core/reteoo/FromNode.java
	drools-core/src/main/java/org/drools/core/reteoo/LeftInputAdapterNode.java
	drools-core/src/main/java/org/drools/core/reteoo/NotNode.java
	drools-core/src/main/java/org/drools/core/reteoo/PathMemory.java
	drools-core/src/main/java/org/drools/core/reteoo/QueryElementNode.java
	drools-core/src/main/java/org/drools/core/reteoo/ReteooBuilder.java
	drools-core/src/main/java/org/drools/core/reteoo/ReteooRuleBase.java
	drools-core/src/main/java/org/drools/core/reteoo/ReteooStatelessSession.java
	drools-core/src/main/java/org/drools/core/reteoo/RiaPathMemory.java
	drools-core/src/main/java/org/drools/core/reteoo/RuleRemovalContext.java
	drools-core/src/main/java/org/drools/core/reteoo/SegmentMemory.java
	drools-core/src/main/java/org/drools/core/reteoo/builder/BuildUtils.java
	drools-core/src/main/java/org/drools/core/reteoo/builder/PhreakNodeFactory.java
	drools-core/src/main/java/org/drools/core/reteoo/builder/ReteooRuleBuilder.java
	drools-core/src/main/java/org/drools/core/rule/JavaDialectRuntimeData.java
	drools-core/src/main/java/org/drools/core/rule/LogicTransformer.java
	drools-core/src/main/java/org/drools/core/rule/PredicateConstraint.java
	drools-core/src/main/java/org/drools/core/rule/Rule.java
	drools-core/src/main/java/org/drools/core/rule/builder/dialect/asm/GeneratorHelper.java
	drools-core/src/main/java/org/drools/core/rule/constraint/MvelConstraint.java
	drools-core/src/main/java/org/drools/core/spi/PropagationContext.java
	drools-core/src/main/java/org/drools/core/time/TimeUtils.java
	drools-core/src/main/java/org/drools/core/util/asm/ClassFieldInspector.java
	drools-core/src/test/java/org/drools/core/common/DroolsObjectIOTest.java
	drools-core/src/test/java/org/drools/core/factmodel/ClassBuilderTest.java
	drools-core/src/test/java/org/drools/core/factmodel/InstancesHashcodedTest.java
	drools-core/src/test/java/org/drools/core/reteoo/NodeSegmentUnlinkingTest.java
	drools-core/src/test/java/org/drools/core/reteoo/ReteTest.java
	drools-core/src/test/java/org/drools/core/reteoo/RuleUnlinkingTest.java
	drools-core/src/test/java/org/drools/core/reteoo/RuleUnlinkingWithSegmentMemoryTest.java
	drools-decisiontables/pom.xml
	drools-distribution/pom.xml
	drools-docs/drools-expert-docs/pom.xml
	drools-docs/drools-expert-docs/src/main/docbook/en-US/LanguageReference/Rule.xml
	drools-docs/drools-fusion-docs/pom.xml
	drools-docs/pom.xml
	drools-examples-api/default-kiesession-from-file/pom.xml
	drools-examples-api/default-kiesession/pom.xml
	drools-examples-api/kie-module-from-multiple-files/pom.xml
	drools-examples-api/kiebase-inclusion/pom.xml
	drools-examples-api/kiecontainer-from-kierepo/pom.xml
	drools-examples-api/kiefilesystem-example/pom.xml
	drools-examples-api/kiemodulemodel-example/pom.xml
	drools-examples-api/multiple-kbases/pom.xml
	drools-examples-api/named-kiesession-from-file/pom.xml
	drools-examples-api/named-kiesession/pom.xml
	drools-examples-api/pom.xml
	drools-examples-cdi/cdi-example-with-inclusion/pom.xml
	drools-examples-cdi/cdi-example/pom.xml
	drools-examples-cdi/pom.xml
	drools-examples/pom.xml
	drools-examples/src/main/java/org/drools/examples/state/StateExampleUsingAgendaGroup.java
	drools-jsr94/pom.xml
	drools-maven-plugin/.gitignore
	drools-persistence-jpa/pom.xml
	drools-persistence-jpa/src/main/java/org/drools/persistence/SingleSessionCommandService.java
	drools-persistence-jpa/src/main/java/org/drools/persistence/info/WorkItemInfo.java
	drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/marshaller/JPAPlaceholderResolverStrategy.java
	drools-persistence-jpa/src/main/java/org/drools/persistence/jpa/processinstance/JPAWorkItemManager.java
	drools-persistence-jpa/src/test/java/org/drools/persistence/jta/JtaTransactionManagerTest.java
	drools-persistence-jpa/src/test/java/org/drools/persistence/marshalling/util/CompareViaReflectionUtil.java
	drools-persistence-jpa/src/test/java/org/drools/persistence/marshalling/util/MarshalledData.java
	drools-persistence-jpa/src/test/java/org/drools/persistence/marshalling/util/MarshallingTestUtil.java
	drools-persistence-jpa/src/test/java/org/drools/persistence/marshalling/util/TestMarshallingUtilsTest.java
	drools-persistence-jpa/src/test/java/org/drools/persistence/session/AgendaRuleFlowGroupsTest.java
	drools-reteoo/pom.xml
	drools-reteoo/src/main/java/org/drools/reteoo/builder/ReteNodeFactory.java
	drools-reteoo/src/main/java/org/drools/reteoo/common/ReteAgenda.java
	drools-reteoo/src/main/java/org/drools/reteoo/common/ReteWorkingMemory.java
	drools-reteoo/src/main/java/org/drools/reteoo/common/ReteWorkingMemoryEntryPoint.java
	drools-reteoo/src/main/java/org/drools/reteoo/common/ReteWorkingMemoryFactory.java
	drools-reteoo/src/main/java/org/drools/reteoo/nodes/ReteAccumulateNode.java
	drools-reteoo/src/main/java/org/drools/reteoo/nodes/ReteBetaNodeUtils.java
	drools-reteoo/src/test/java/org/drools/reteoo/common/AgendaItemTest.java
	drools-reteoo/src/test/java/org/drools/reteoo/integrationtests/AccumulateTest.java
	drools-reteoo/src/test/java/org/drools/reteoo/integrationtests/AlphaNetworkModifyTest.java
	drools-reteoo/src/test/java/org/drools/reteoo/integrationtests/CommonTestMethodBase.java
	drools-reteoo/src/test/java/org/drools/reteoo/integrationtests/DynamicRulesTest.java
	drools-reteoo/src/test/java/org/drools/reteoo/integrationtests/Misc2Test.java
	drools-reteoo/src/test/java/org/drools/reteoo/integrationtests/MiscTest.java
	drools-reteoo/src/test/java/org/drools/reteoo/integrationtests/QueryTest.java
	drools-reteoo/src/test/java/org/drools/reteoo/integrationtests/marshalling/FactHandleMarshallingTest.java
	drools-reteoo/src/test/java/org/drools/reteoo/integrationtests/marshalling/MarshallingTest.java
	drools-reteoo/src/test/resources/org/drools/reteoo/integrationtests/test_salienceExpressionRule.drl
	drools-reteoo/src/test/resources/org/drools/reteoo/integrationtests/test_salienceIntegerRule.drl
	drools-reteoo/src/test/resources/testEnumReteoo.jar
	drools-scorecards/pom.xml
	drools-scorecards/src/main/java/org/drools/scorecards/drl/AbstractDRLEmitter.java
	drools-scorecards/src/main/java/org/drools/scorecards/drl/ExternalModelDRLEmitter.java
	drools-scorecards/src/test/java/org/drools/scorecards/ScorecardsKModuleTest.java
	drools-templates/pom.xml
	drools-verifier/pom.xml
	drools-verifier/src/test/java/org/drools/verifier/consequence/NamedConsequencesTest.java
	drools-workbench-models/drools-workbench-models-commons/pom.xml
	drools-workbench-models/drools-workbench-models-commons/src/main/java/org/drools/workbench/models/commons/backend/rule/ActionCallMethodBuilder.java
	drools-workbench-models/drools-workbench-models-commons/src/main/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceImpl.java
	drools-workbench-models/drools-workbench-models-commons/src/main/java/org/drools/workbench/models/commons/backend/rule/RuleModelPersistenceHelper.java
	drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceTest.java
	drools-workbench-models/drools-workbench-models-commons/src/test/java/org/drools/workbench/models/commons/backend/rule/RuleModelDRLPersistenceUnmarshallingTest.java
	drools-workbench-models/drools-workbench-models-datamodel-api/pom.xml
	drools-workbench-models/drools-workbench-models-guided-dtable/pom.xml
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/backend/util/GuidedDTBRDRLPersistence.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/auditlog/UpdateColumnAuditLogEntry.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/ActionInsertFactCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/ActionInsertFactFieldsPattern.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/ActionSetFieldCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/ActionWorkItemCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/ActionWorkItemInsertFactCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/ActionWorkItemSetFieldCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/AttributeCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/BRLActionColumn.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/BRLActionVariableColumn.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/BRLConditionColumn.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/BRLConditionVariableColumn.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/BaseColumnFieldDiffImpl.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/ConditionCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/DTCellValue52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/DTColumnConfig52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/DiffColumn.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/LimitedEntryActionInsertFactCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/LimitedEntryActionRetractFactCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/LimitedEntryActionSetFieldCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/LimitedEntryConditionCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/MetadataCol52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/main/java/org/drools/workbench/models/guided/dtable/shared/model/Pattern52.java
	drools-workbench-models/drools-workbench-models-guided-dtable/src/test/java/org/drools/workbench/models/guided/dtable/backend/BRLRuleModelTest.java
	drools-workbench-models/drools-workbench-models-guided-scorecard/pom.xml
	drools-workbench-models/drools-workbench-models-guided-scorecard/src/main/java/org/drools/workbench/models/guided/scorecard/backend/GuidedScoreCardDRLPersistence.java
	drools-workbench-models/drools-workbench-models-guided-template/pom.xml
	drools-workbench-models/drools-workbench-models-guided-template/src/main/java/org/drools/workbench/models/guided/template/backend/RuleTemplateModelDRLPersistenceImpl.java
	drools-workbench-models/drools-workbench-models-guided-template/src/test/java/org/drools/workbench/models/guided/template/backend/RuleTemplateModelDRLPersistenceTest.java
	drools-workbench-models/drools-workbench-models-test-scenarios/pom.xml
	drools-workbench-models/drools-workbench-models-test-scenarios/src/main/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunner.java
	drools-workbench-models/drools-workbench-models-test-scenarios/src/test/java/org/drools/workbench/models/testscenarios/backend/ScenarioRunnerTest.java
	drools-workbench-models/pom.xml
	kie-ci-osgi/.gitignore
	kie-ci-osgi/pom.xml
	kie-ci/pom.xml
	kie-ci/src/main/java/org/kie/scanner/Aether.java
	kie-ci/src/main/java/org/kie/scanner/KieRepositoryScannerImpl.java
	kie-ci/src/main/java/org/kie/scanner/MavenPomModelGenerator.java
	kie-ci/src/main/java/org/kie/scanner/MavenRepository.java
	kie-ci/src/test/java/org/kie/scanner/AbstractKieCiTest.java
	kie-ci/src/test/java/org/kie/scanner/KieModuleMavenTest.java
	kie-ci/src/test/java/org/kie/scanner/KieModuleMetaDataTest.java
	kie-ci/src/test/java/org/kie/scanner/KieRepositoryScannerTest.java
	kie-maven-plugin-example/.gitignore
	kie-maven-plugin/pom.xml
	knowledge-api-legacy5-adapter/pom.xml
	knowledge-api-legacy5-adapter/src/main/java/org/drools/impl/KnowledgeBuilderFactoryServiceImpl.java
	knowledge-api-legacy5-adapter/src/main/java/org/drools/impl/adapters/KnowledgeRuntimeAdapter.java
	knowledge-api-legacy5-adapter/src/test/java/org/drools/integrationtests/MiscTest.java
	pom.xml
(cherry picked from commit 4a8ce96)
…y excluded by reactivity

(cherry picked from commit 4f2f82e)
…ed missing import package of org.hibernate

(cherry picked from commit a73ba51)
… an InputStream

(cherry picked from commit ef77b58)

Conflicts:
	drools-core/src/main/java/org/drools/core/util/IoUtils.java
Backport of the bugfix from master branch to Drools 6.1.x branch
Backport of the bugfix from master branch to Drools 6.1.x branch
Bugfix for DROOLS-354 and DROOLS-540 on 6.1.x branch (backport from master)
@sotty
Copy link
Contributor

sotty commented Oct 21, 2014

It seems that this PR was opened by mistake, could you please close it?
Thanks
Davide

On Tue, Oct 21, 2014 at 1:03 PM, WebsterHomer notifications@github.com
wrote:


You can merge this Pull Request by running

git pull https://github.com/droolsjbpm/drools 6.1.x

Or view, comment on, or merge it at:

#393
Commit Summary

  • [BZ-1096128] fix incremental compilation of KieModules having
    external dependencies
  • [BZ-1106300] propagate as insert a formerly deleted eval left tuple
  • [DROOLS-517] enhance DRL->RuleModel unmarshalling to handle modify()
    {...} block
  • BZ1105043 - Guided rule editor cannot handle 'str' as a substring of
    fact pattern
  • [BZ-1105043] fix operators recognition inside an expression
  • Fix ClassLoader leak during incremental compilation
  • [BZ-1108070] fix compilation of a kjar in the kie-maven-plugin when
    it includes a kiebase from a different kjar
  • [BZ-1107982] log errors when trying to resolve maven artifacts
  • GUVNOR-2104: Change Guided Rule, Template and Decision Table Editors
    to generate modify() {...} block
  • Remove hard-coded version number (build section not needed at all
    for tests)
  • [BZ-1084362] handle external:* notation in maven settings
  • [DROOLS-526] flush stream queue before eagerly evaluating a rule
  • DROOLS-527: IncrementalBuild Results are incorrect when DRL is
    completely invalid
  • BZ996944 - GDT Audit log: missing information in column update logs
  • [DROOLS-527] attempt drl compilation even if parsing fail in order
    to give a complete error reporting
  • [DROOLS-516] implement stream queue garbage collector
  • DROOLS-530: fixing jar file creation on MemoryFileSystem
  • [BZ-1084362] handle external:* notation in maven settings
  • [DROOLS-532] Avoid using compilation cache between incompatible
    drools versions
  • [DROOLS-531] allow to create a valid KieClasspathContainer even from
    a non-maven project
  • BZ996944 - GDT Audit log: missing information in column update logs
  • [DROOLS-529] fix synchronization of phreak segments creation
  • BZ1112278 - Rule re-opens with one of the field type changed from
    String to Integer in BRMS 6.0.1
  • BZ975922 - GRE constraint operator list box problems when re-opening
    file
  • [DROOLS-523] make incremental compilation to also update globals
  • [DROOLS-518] fix left tuple delete in from node
  • [DROOLS-509] fix method resolution during constraints jitting
  • [DROOLS-510] Traiting a non-natively-traitable bean breaks the
    assertion behavior
  • [DROOLS-536] KieBuilder does not resolve declarations across
    packages - KBase Fix
  • [DROOLS-532] fix automatic version recognition when running drools
    inside eclipse
  • [DROOLS-541] implement session cache
  • [DROOLS-543] try to compile all type declarations even if there was
    a former compilation problem
  • [DROOLS-536] KieBuilder does not resolve declarations across packages
  • [DROOLS-546] check for non-existing fields on fact types
  • [DROOLS-542] Expose more commands through the KieCommands interface
  • [DROOLS-551] avoid to serialize the expiration job of an already
    retracted event
  • [BZ-1119731] return null in legacy api when trying to retrieve the
    FactHandle for an object not present in the working memory
  • [DROOLS-516] register unlinking caused by a delete in a not node
  • upgrade to asm5
  • GUVNOR-2109: DRL->RuleModel marshalling: Method invocations with
    parameters are not handled correctly
  • [DROOLS-549] Queries in the default package are built twice
  • [DROOLS-547] Queries should check the type of input arguments
  • [DROOLS-555] Support both static and dynamic trait interfaces on the
    same object
  • [DROOLS-549] Move helper methods to ClassUtils
  • fix wumpus 'climb' command
  • [BZ-1120972] avoid trying to parse xsd files when no jaxb
    configuration is available
  • [DROOLS-559] emit a compilation error when trying to use a
    non-existing positional argument
  • [DROOLS-560] fix incremental compilation when both versions of a drl
    file contain an event type declaration for an existing class
  • Improve TextAdventure
  • remove wrong import from TextAdventure data file
  • [DROOLS-561] test case reproducing a NPE when having a shared query
    node
  • [DROOLS-561] pass the right staged tuple set to the PhreakQueryNode
  • [BZ-1122738] fix CompositeMaxDurationTimer
  • [DROOLS-535] fix build on windows platforms
  • [PMML] Remove problematic comments
  • [DROOLS-516] register unlinking caused by a delete in a lia node
  • [DROOLS-535] Fix platform dependencies
  • [DROOLS-495] maven-plugin now executes also process-test-resources
    phase
  • [DROOLS-564] NPE when using globals as query element inputs
  • [DROOLS-114] Support defeasible rules
  • [DROOLS-565] Retrieve the rule that caused a RuleRuntimeEvent
  • DROOLS-567 Improve Examples
  • [DROOLS-567] fix TextAdventure data
  • DROOLS-567 Improve Examples
  • Merge branch '6.0.x' of https://github.com/droolsjbpm/drools.git
  • [DROOLS-569] update the index of a property even when it is
    explicitly excluded by reactivity
  • upgrade to 6.1.1-SNAPSHOT
  • [DROOLS-570] fix invocation of LeftTuple.getIndex in generated
    consequence invoker
  • [DROOLS-532] add automatic version recognition in PersisterHelper
  • JBPM-4400: Problems using persistences with human tasks in OSGi -
    added missing import package of org.hibernate
  • [BZ-1138420] fix very inefficient algorithm to read a byte array
    from an InputStream
  • [BZ-1138420] fix very inefficient algorithm to read a byte array
    from an InputStream
  • Bugfix for DROOLS-354 and DROOLS-540 on Windows
  • Bugfix for DROOLS-354 and DROOLS-540 on Windows
  • [DROOLS-596] remove tuples from the right memory when gc'ing them
  • [DROOLS-594] fix path mask initialization when a segment as an
    accumulate as last node
  • Merge pull request Bugfix for DROOLS-354 and DROOLS-540 on 6.1.x branch (backport from master) #380 from chearius/6.1.x

File Changes

Patch Links:


Reply to this email directly or view it on GitHub
#393.

@mariofusco mariofusco closed this Oct 22, 2014
Rikkola pushed a commit to Rikkola/drools that referenced this pull request Jan 27, 2020
GUVNOR-2870: Import examples with one click
GUVNOR-2835: EmptyLibraryScreen: Authoring splash screen prevents use of Import Example Wizard
lucamolteni pushed a commit to lucamolteni/drools that referenced this pull request Oct 13, 2021
dupliaka pushed a commit to dupliaka/drools that referenced this pull request Apr 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants