Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
lanceleverich committed Jul 28, 2014
1 parent 2ed3e36 commit 4a8ce96
Showing 1 changed file with 3 additions and 2 deletions.
Expand Up @@ -544,7 +544,8 @@ private String expandLHS(final String lhs,

// logger.info( "*** LHS>" + lhs + "<" );
final StringBuilder buf = new StringBuilder();
final String[] lines = lhs.split( nl,

final String[] lines = lhs.split( (lhs.indexOf("\r\n") >= 0 ? "\r\n":"\n"),
-1 ); // since we assembled the string, we know line breaks are \n
final String[] expanded = new String[lines.length]; // buffer for expanded lines
int lastExpanded = -1;
Expand Down Expand Up @@ -614,7 +615,7 @@ private String expandLHS(final String lhs,
private String expandRHS(final String lhs,
int lineOffset) {
final StringBuilder buf = new StringBuilder();
final String[] lines = lhs.split( nl,
final String[] lines = lhs.split((lhs.indexOf("\r\n") >= 0 ? "\r\n":"\n"),
-1 ); // since we assembled the string, we know line breaks are \n

final String[] expanded = new String[lines.length]; // buffer for expanded lines
Expand Down

0 comments on commit 4a8ce96

Please sign in to comment.