Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: droolsjbpm/drools
...
head fork: droolsjbpm/drools
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on May 20, 2011
@etirelli etirelli JBRULES-2500: fixing soundex problem
06b4ec2
@ge0ffrey ge0ffrey new nexus repository rule that all poms have to have a description
326430a
@mdproctor mdproctor JBRULES-2335 StackOverflowError on serialization of KnowledgeBase
-Applied the patch + test
-Also made serialisation work for unification nodes, both rulebase and session
4ebcbc4
Wolfgang Laun JBRULES-3040 and 3041
Avoid NPE and SIOOB after various classes after "declare x extend"
b40c451
@mdproctor mdproctor JBRULES-2380 KnowledgeBuilderImpl.add(...) throws org.mvel2.CompileEx…
…ception when executed concurrently for the same resource
7ea5b9c
Wolfgang Laun JBRULES-3039
Remove type arguments before looking for class to avoid
ClassNotFoundException.

Also, make type names and qualified identifiers safe against
invading spaces.
734b93d
@etirelli etirelli JBRULES-2881: fixing behavior handling for the first pattern in the rule
17baec6
@mdproctor mdproctor JBRULES-2380 KnowledgeBuilderImpl.add(...) throws org.mvel2.CompileEx…
…ception when executed concurrently for the same resource
fcc5388
krisv JBPM-3015: Core engine should support multi-threading
7b98001
Commits on May 22, 2011
Wolfgang Laun JBRULES-3045 Avoid ESE after simple syntax errors inside exists CE an…
…d not CE
5541d48
Commits on May 24, 2011
@etirelli etirelli Adding missing test file
25349e6
@etirelli etirelli JBRULES-2203: fixing ReturnValueRestriction cloning
aadff32
@etirelli etirelli JBRULES-2203: fixing tests
3298530
Commits on May 25, 2011
@etirelli etirelli JBRULES-2203: reverting changes as per Mark request
2242722
@mdproctor mdproctor JBRULES-3049 Improve @typesafe
@typesafe wasn't workign too well. So decided to simplify things.

Now it'll only apply to the pattern that matches the object type from the type declaration.

Also need to refactor things so that the MVELClassReader can take imports, for things like enums on Map keys - without having to fall back to Predicate.
044d784
@mdproctor mdproctor JBRULES-3049 Improve @typesafe
2629cda
@mdproctor mdproctor JBRULES-3050 Use := for unification
8651085
@mdproctor mdproctor set test to @ignore as it's an MVEL bug
0243c45
@mdproctor mdproctor JBRULES-3050 Use := for unification
68ced77
@mdproctor mdproctor JBRULES-3050 Use := for unification
d66fa80
@mdproctor mdproctor JBRULES-3049 Improve @typesafe
-undid a change to improve error reporting, that broke other things - i.e. building read accessors needs to be able to silently fail.
4b5ae21
@etirelli etirelli Adding parser unit test
97c4cf3
Commits on May 26, 2011
@mdproctor mdproctor JBRULES-2045 Rules Fact Error In Complex Condition Structure
-Added failing test, with @ignore for 'or' problem
c1ebe08
@mdproctor mdproctor JBRULES-3047 NPE (fatal) when using bound var to non-existing field i…
…n eval

JBRULES-3051 Incorrect test due to previous cloning of Collections in 'from'
9768cb8
@mdproctor mdproctor JBRULES-2971 update swipes fact from entry-point
172f438
@ge0ffrey ge0ffrey typo's: mainly bellow instead below
033d814
@Rikkola Rikkola Removing unused code
9424789
@Salaboy Salaboy JBRULES-3031: Insert Command cause problems with the fact handle is d…
…isconnected

	- returning a cloned version of the fact handle disconnected to the client, without disconnecting the local one
        - improving EventDefaultHandler to contain the same fields as the DefaultFactHandler
e2af0de
Wolfgang Laun Avoid EmptyStackException due to simple typo: declare foo ; int end
c96e3a2
@ge0ffrey ge0ffrey Mask Pacman example for CR1
f063595
@ge0ffrey ge0ffrey Prepare release drools 5.2.0.CR1 and jbpm 5.1.0.CR1
8f59f65
@etirelli etirelli JBRULES-2970: removing the context stack from the parser in order to …
…make it more robust
37745a4
@ge0ffrey ge0ffrey Revert "Mask Pacman example for CR1"
This reverts commit f063595.
38938c2
@ge0ffrey ge0ffrey Revert "Prepare release drools 5.2.0.CR1 and jbpm 5.1.0.CR1" back to …
…SNAPSHOT

This reverts commit 8f59f65.
98d67ad
@ge0ffrey ge0ffrey Merge branch '5.2.x' of github.com:droolsjbpm/drools into 5.2.x
e615a47
@etirelli etirelli JBRULES-3052: fixing from accumulate
0054ce1
Commits on May 27, 2011
krisv Fixing audit issue where agenda events where not registered
4a295b9
@esteban-aliverti esteban-aliverti JBRULES-2817: Make the KnowledgeAgent Tests more robust and faster -n…
…o more @Ignored tests
4dbabc1
@esteban-aliverti esteban-aliverti - Missing import
8735ba1
Wolfgang Laun Remove spurious '$'
6d30195
@etirelli etirelli JBRULES-3052: fixing bug on accumulate CE using a single function
f31cb9d
@etirelli etirelli JBRULES-3052: fixing bug on multifunction detection
JBRULES-2049, JBRULES-2838: changing packaged agenda filters to work with stable API interface
JBRULES-2883: exposing ksession.fireAllRules( AgendaFilter, int ) method on the stable API
ba5137c
Commits on May 30, 2011
@ge0ffrey ge0ffrey extract drools.osgi.version
d950624
Commits on Jun 03, 2011
@etirelli etirelli JBRULES-3025: adding support for nested bindings
fefcfc1
@etirelli etirelli JBRULES-3025: fixing support for nested bindings
8a92b6d
@etirelli etirelli JBRULES-3025: fixing support for nested bindings
5fa10fe
Wolfgang Laun Tighten parser to forbid/force bindings for function calls in accumul…
…ate from/CE, respectively.

Minor documentation fixes for "Calendars and Timers"
d89f697
Wolfgang Laun Avoid horizontal scrolling for loooong lines in <programlisting>
0f97943
Lee Carlon Edits proposed and requested in JIRA https://issues.jboss.org/browse/…
e20699e
Commits on Jun 06, 2011
@ge0ffrey ge0ffrey typo
df9776f
@ge0ffrey ge0ffrey typo's + reformatting by xmlmind
08b0492
@ge0ffrey ge0ffrey docbook schema errors + writing style
e293e22
@esteban-aliverti esteban-aliverti JBRULES-2960: ClassPathResource fails to get last version if the unde…
…rlying ClassLoader uses a cache. - Removed URLClassPathResource - ClassPathResource: getInputStream() uses getURL().getStream() instead of classloader.getResourceAsStream()
f800f2f
@etirelli etirelli Adding test for map facts
bcdc344
Commits on Jun 07, 2011
@etirelli etirelli Adding javadocs to the rule authoring API
6770ee4
@etirelli etirelli Adding javadocs to the rule authoring API
d277add
@etirelli etirelli Moving concrete classes into the 'impl' package
4c6ddbe
@etirelli etirelli Fixing refactory of implementation classes
797cd35
@etirelli etirelli Refactoring the API to add end() methods to all classes for proper fl…
…uent support
e2ea081
@etirelli etirelli Adding test case
2abef17
@etirelli etirelli Adding test cases
b92e5fa
@etirelli etirelli Adding test cases for the descr API and adding resource type support …
…for it
b7e3620
@ge0ffrey ge0ffrey rewrite LHS section for free form expressions
53c024f
Commits on Jun 08, 2011
Wolfgang Laun Parser beautification: - syntax rules in comments - some methods rena…
…med - use stringId() after entry-point
08a43ad
Commits on Jun 09, 2011
@etirelli etirelli JBRULES-3055: adding test cases
c35f240
@ge0ffrey ge0ffrey drools-docs rewrite LHS: laune's feedback
cde3362
@ge0ffrey ge0ffrey drools-docs rewrite LHS: etirelli's feedback
d34fb6e
@etirelli etirelli JBRULES-3055: fixing concurrent modification exception
55e5c13
@etirelli etirelli JBRULES-3055: ignoring failing test
11b8671
Commits on Jun 10, 2011
@etirelli etirelli GUVNOR-1476: fixing lexer to support ~
35318ba
unknown GUVNOR-1476: fixing lexer to support ~ Added unit test with tilde to …
…DSLMappingEntryTest.java
71ddd0b
unknown GUVNOR-1476 added unit test with ~ in dsl
881e4d7
Commits on Jun 16, 2011
@etirelli etirelli Fixing tests, adding api documentation
b72a799
Commits on Jun 17, 2011
@etirelli etirelli JBRULES-3086: fixing parsing bug when using bindings and complex oper…
…ators in and not in
7910c22
@etirelli etirelli JBRULES-3082: fixing support to infinity literals
43f3afc
@etirelli etirelli JBRULES-2642: fixing fluent API and parser to support comments in the…
… last line without line breaks
5237d90
Commits on Jun 20, 2011
@ge0ffrey ge0ffrey rename multi restriction
1b9543e
@ge0ffrey ge0ffrey remove garbage section + remove all dead images
e4ff32f
Commits on Jun 21, 2011
@etirelli etirelli Updating documentation
f266e89
Wolfgang Laun New syntax diagrams
b138ff5
Wolfgang Laun BNF source file
171eed2
@esteban-aliverti esteban-aliverti JBRULES-2913: SingleSessionCommandService Constructor Eats an Actual …
…/ Real Exception on Rollback - Same fix as JBRULES-2656
047d727
@etirelli etirelli Ignoring test due to mvel regression on inline constructors
313d8df
@zenix zenix SimpleDateFormat is not thread safe. Synchronized access to it if usi…
…ng static.
3c313aa
@etirelli etirelli JBRULES-2642: fixing free form expressions compilation
27d619a
@etirelli etirelli JBRULES-2642: fixing free form expressions
7b54e03
@etirelli etirelli JBRULES-2642: fixing free form expressions
0bfba59
@mdproctor mdproctor Updated IndexingTest to show more indexed test cases
77fbed3
@mdproctor mdproctor removed file I didn't mean to push
440da50
Wolfgang Laun Fix error message.
df9a9eb
@ge0ffrey ge0ffrey Add section 5.8.3.8 Railroad diagrams with a list of all railroad dia…
…grams
4bf2d56
@mdproctor mdproctor JBRULES-3035 Check against duplicate declaration for variable has dis…
…appeared

JBRULES-3090 Use Stack Queues for Backward Chaining to avoid blow the method stack
JBRULES-3091 Support live "open queries" for backward chaining
d9a5a0e
@mdproctor mdproctor JBRULES-3091 refactored Variable to api module
16d6de3
@mdproctor mdproctor updated N&N segments into main docs
325dd23
@mdproctor mdproctor small doc typo
48f4bda
@mdproctor mdproctor small doc typo
76332da
Commits on Jun 22, 2011
@ge0ffrey ge0ffrey Prepare drools release 5.2.0.Final and jbpm release 5.1.0.Final
63ece68
@ge0ffrey ge0ffrey workaround for the pacman example
37b5e05
@manstis manstis GUVNOR-1484: Date locale issues
43ca141
krisv JBRULES-3084: java.lang.ClassCastException:
org.jbpm.ruleflow.instance.RuleFlowProcessInstance
ae2942a
Commits on Jun 23, 2011
krisv JBPM-3223: Clean up system outs in jBPM5 codebase
 - Replacing default system event listener to one that does nothing
e5d2bfb
@mdproctor mdproctor JBRULES-3078 fail to remove timerjob on removing timerrule
802236f
@mdproctor mdproctor Updated to have better toString outputs
f49a9fd
@mdproctor mdproctor JBRULES-3087 NPE in PatternBuilder due to missing field position numbers
8892222
@mdproctor mdproctor JBRULES-3087 NPE in PatternBuilder due to missing field position numbers
0b0ce66
@mdproctor mdproctor JBRULES-3079 java.lang.ClassCastException: statefulKnowledgeSession.g…
…etAgendaEventListeners().size() and statefulKnowledgeSession.getWorkingMemoryEventListeners().size()
ac66e18
@mdproctor mdproctor JBRULES-3087 NPE in PatternBuilder due to missing field position numbers
f8b7308
@mdproctor mdproctor query's getDeclarations needs a null or empty check
e4d7fc5
@mdproctor mdproctor default imports can now be overriden
5d464dd
@mdproctor mdproctor changed package name, so it no longer conflicts
c247a72
@ge0ffrey ge0ffrey Prepare for work on drools 5.2.1.Final and jbpm 5.1.1.Final (might no…
…t be released if not needed)
8d1ca6f
Commits on Jul 02, 2011
@etirelli etirelli JBRULES-3114: fixing NPE when using 'not in' operator
c9e05de
Commits on Jul 05, 2011
@mdproctor mdproctor JBRULES-3119 Timestamp and Duration no longer work with complex expre…
…ssions
6ff1652
@mdproctor mdproctor JBRULES-3119 Timestamp and Duration no longer work with complex expre…
…ssions
b455fe6
Commits on Jul 06, 2011
@manstis manstis GUVNOR-1492: In Guided Editor, DSL configuration conditions with "-"
and ")" is not handled correctly.
0fce94b
Commits on Jul 13, 2011
@manstis manstis GUVNOR-1524: DRL Model Editor should support "extends"
1f17eef
Commits on Jul 15, 2011
@manstis manstis Re-work of change to PackageBuilder to support GUVNOR-1524 following
discussions with laune.
6060f47
@sotty sotty JBRULES-3127 Sort packages by creation/last modification order
0f0fbab
@sotty sotty JBRULES-3126 NPE when retracting an object with a collection field wh…
…ich has been accumulated from
3588ff2
@sotty sotty JBRULES-3126 NPE when retracting an object with a collection field wh…
…ich has been accumulated on
a1cdeb1
@sotty sotty JBRULES-3136 Exception when extending non-bean classes
fa14700
Commits on Jul 18, 2011
@manstis manstis Re-work of change to PackageBuilder to support GUVNOR-1524 following
discussions with sotty.
2d1fcaf
Commits on Jul 20, 2011
@etirelli etirelli JBRULES-3066, BRMS-611: fixing node sharing when using MVELClassField…
…Reader
e43c105
Commits on Jul 22, 2011
@cristianonicolai cristianonicolai Fix for JBRULES-3138
ea9efe6
@cristianonicolai cristianonicolai Test case for JBRULES-3138
6e55bc9
@sotty sotty JBRULES-3143 Knowledge Agent does not handle multiple packages in Bui…
…lder output from single resource
a35a908
@sotty sotty JBRULES-3143 Knowledge Agent does not handle multiple packages in Bui…
…lder output from single resource
54c28b8
@etirelli etirelli Adding documentation for predefined type annotations
9f90bde
Commits on Jul 28, 2011
@manstis manstis GUVNOR-1573: No listbox for enum fields declared in parent class
c4671e4
@manstis manstis GUVNOR-1573: Improved test for ClassFieldInspector
9cb1dd5
Commits on Aug 16, 2011
krisv BRMS-626: Memory leak in KnowledgeBase
 - making sure process runtime is only created once
39fed96
@etirelli etirelli JBRULES-2994: adding test case for expiration offset
412e757
Commits on Aug 17, 2011
@etirelli etirelli JBRULES-2994: fixing type declaration merging when multiple declarati…
…ons are present.
09196b1
Commits on Aug 18, 2011
@etirelli etirelli JBRULES-2993: fixing metadata annotations. Please note that rules sti…
…ll only support single value annotations.
625bd3c
@etirelli etirelli JBRULES-2993: removing wrong tests
007827a
Commits on Aug 19, 2011
@etirelli etirelli JBRULES-2872: fixing line numbers on error messages
0c025c9
Commits on Aug 22, 2011
@ryanzhang ryanzhang Update drools example title(Drools->JBoss BRMS) in soaProfile
9e4b5d4
Commits on Aug 29, 2011
@etirelli etirelli JBRULES-2993: fixing DRLParser to not unescape strings, as this is be…
…ing done by the compiler when MVEL executes the expression.
8b3d0d6
Commits on Sep 14, 2011
@mdproctor mdproctor moved ClassObjectType instantiations to use static fields
(cherry picked from commit c9fb2f5)
cdbf550
@mdproctor mdproctor Added insertion ordering test for backward chaining
(cherry picked from commit 501f219)
ca27022
@mdproctor mdproctor removed unused files for multiconstraints
(cherry picked from commit 51f1219)
ed94d7f
@mdproctor mdproctor JBRULES-3099 Use LeftTuple factories to create more minimal LeftTuples
(cherry picked from commit 81a5e9a)
53e307a
@mdproctor mdproctor JBRULES-3099 Use LeftTuple factories to create more minimal LeftTuples
(cherry picked from commit 872102d)
63bf74d
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
(cherry picked from commit 279c9df)
be14953
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
(cherry picked from commit 3305d05)
43486e5
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
-Added failing tests, although with @ignore to stop the build breaking
JBRULES-3099 Use LeftTuple factories to create more minimal LeftTuples
-Updated the Mockito stuff to correctly mock out LeftTupleSink, so the DSL engine now works.
(cherry picked from commit 6d707f5)

Conflicts:

	drools-compiler/src/test/java/org/drools/integrationtests/BackwardChainingTest.java
7fb83b7
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
(cherry picked from commit 390c6d8)
a58726b
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
(cherry picked from commit fbb74a6)
68872b8
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
(cherry picked from commit eaea6d6)
a68d8e4
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
(cherry picked from commit 6ce953d)
38d084c
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
(cherry picked from commit 5c2eba7)
608e63c
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
(cherry picked from commit 090a358)
a1038f9
@mdproctor mdproctor JBRULES-3101 Right Input triggering doesn't work for Queries
(cherry picked from commit 9e4baf2)

Conflicts:

	drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
	drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
118af08
@mdproctor mdproctor JBRULES-3119 Timestamp and Duration no longer work with complex expre…
…ssions

(cherry picked from commit 64f3ba9)

Conflicts:

	drools-compiler/src/test/java/org/drools/integrationtests/CepEspTest.java
b90dc7b
@mdproctor mdproctor JBRULES-3148 Dynamic Declarative Conflict Resolution
(cherry picked from commit aadf250)
9b5ed65
@mdproctor mdproctor JBRULES-3148 Dynamic Declarative Conflict Resolution
(cherry picked from commit d201631)

Conflicts:

	drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
15cebe1
@mdproctor mdproctor JBRULES-3148 Dynamic Declarative Conflict Resolution
JBRULES-3149 ObjectTypeNodes are not handled correctly during Marshalling
(cherry picked from commit aadcfda)
7daf224
@mdproctor mdproctor JBRULES-3148 Dynamic Declarative Conflict Resolution
JBRULES-3164 Serialization broken for Backward Chaining
JBRULES-3165 Dynamic Rules broken for Backward Chaining
(cherry picked from commit 737a782)
40ea48c
@mdproctor mdproctor JBRULES-3148 Dynamic Declarative Conflict Resolution
-Added property to enable and disable. Disabled by default
(cherry picked from commit f3b7a6f)
a58dcb7
@mdproctor mdproctor JBRULES-3148 Declarative Agenda
(cherry picked from commit a94f21e)
b49c1e7
@mdproctor mdproctor JBRULES-3148 Declarative Agenda
(cherry picked from commit 86e9b80)
00290b7
@mdproctor mdproctor JBRULES-3148 Declarative Agenda
(cherry picked from commit e34badf)
a995d0a
@mdproctor mdproctor JBRULES-3148 Declarative Agenda
(cherry picked from commit b921d1a)
240abb6
@mdproctor mdproctor JBRULES-3148 Declarative Agenda
(cherry picked from commit 2688ec8)
10b15a0
@mdproctor mdproctor JBRULES-3162 OutputMarshaller cause NullPointerException in create se…
…ssion

(cherry picked from commit cd8abae)
353d5fc
@mdproctor mdproctor JBRULES-3171 Auto-focus combined with lock-on-active incrrectly block…
…s activations for the same working memory action

(cherry picked from commit 50e837f)
d090733
@mdproctor mdproctor JBRULES-3172 Positional variables do not allow accessors
(cherry picked from commit df9d0b1)
9b5ccc8
@mdproctor mdproctor JBRULES-3174 MVEL Is unable to resolve Handles on consequence WM actions
(cherry picked from commit d0f36bd)
b2ad1ed
@mdproctor mdproctor JBRULES-3172 Minor fixes to builder to wrap extensions and catch more…
… invlid chars

(cherry picked from commit 5c69cb0)
e6b077c
@mdproctor mdproctor JBRULES-3175 Composite indexing incorrect allowed for Unification res…
…trictions.

(cherry picked from commit 526e9d8)
a3f0f30
@mdproctor mdproctor JBRULES-3176 Classload issue on Package Merging for MVEL dialect's
(cherry picked from commit a633e31)
7aae47f
@mdproctor mdproctor JBRULES-3126 NPE when retracting an object with a collection field wh…
…ich has been accumulated on

(cherry picked from commit 5605bdd)
9bc069f
@mdproctor mdproctor JBRULES-3178 Query results getIdentifier should preserve the position…
…al ordering for query parameter declarations

(cherry picked from commit 428af65)
12b4136
@mdproctor mdproctor JBRULES-3178 Query results getIdentifier should preserve the position…
…al ordering for query parameter declarations

(cherry picked from commit 5aa2763)
09d1c4e
@mdproctor mdproctor JBRULES-3142 Exception when using from with mixed collections
(cherry picked from commit 1728d93)
d1301a4
@mdproctor mdproctor added additional MVEL static settings, so they are in each MVEL invoc…
…ation point

(cherry picked from commit d1cd521)
79986b6
@mdproctor mdproctor JBRULES-3186 Open Queries called from Closed queries would null pointer
(cherry picked from commit 3e98d21)
98956ad
@mdproctor mdproctor JBRULES-3174 MVEL Is unable to resolve Handles on consequence WM actions
(cherry picked from commit d0f36bd)
85cdfdb
@mdproctor mdproctor JBRULES-3126 NPE when retracting an object with a collection field wh…
…ich has been accumulated on

(cherry picked from commit 5605bdd)
26ea95b
@mdproctor mdproctor JBRULES-3186 Open Queries called from Closed queries would null pointer
(cherry picked from commit 47ff87c)
41438a0
@mdproctor mdproctor JBRULES-3146 rules with timers do not persist
(cherry picked from commit 0a3575e)

Conflicts:

	drools-examples/src/main/java/org/drools/adventures/AdventureFrame.java
	drools-persistence-jpa/src/main/java/org/drools/persistence/SingleSessionCommandService.java
b270646
@mdproctor mdproctor JBRULES-3146 rules with timers do not persist
(cherry picked from commit 79a0e94)
0b3c18c
@mrietveld mrietveld Modified the TransactionManager classes: only calling classes can kee…
…p track of what the "localTransaction" is or in other words, who started the transaction (because once the tx is active -- you can't tell anything). Added copyright header.

(cherry picked from commit 6f97646)
2fea28f
@mdproctor mdproctor JBRULES-3207 Getting 5.2.x Working Again after various merges
7e88b18
@mdproctor mdproctor JBRULES-3207 Getting 5.2.x Working Again after various merges
0a2c4f1
@mdproctor mdproctor JBRULES-3170 Compiler erroneously resolves the package of declared cl…
…asses with the same name as basic classes

(cherry picked from commit 7d6c899)

Conflicts:

	drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
c5993da
@mdproctor mdproctor JBRULES-3207 Getting 5.2.x Working Again after various merges
-fixed bad imports for OutputMarshaller.java
1a3be9a
@mdproctor mdproctor JBRULES-3177 avoid to invoke getResourceAsStream twice when using fin…
…dType()

in EclipseJavaCompiler

cherry-picked from:
0faffd3
47fbe5c (partial)
59e0260 (parital)
5a728aa
@anpieber anpieber Minor modifications to make the compiler run with java7
Signed-off-by: Andreas Pieber <anpieber@gmail.com>
(cherry picked from commit bc259b2)
ccfbc38
@etirelli etirelli Fixing copy&paste typo
(cherry picked from commit 2dba965)
139ce11
@manstis manstis GUVNOR-1104: Rules not inheriting package attributes when compiling
package binary from Guvnor.(cherry picked from commit 09c6489)

Conflicts:

	drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
f43a7f3
@sotty sotty JBRULES-3127 Sort packages by creation/last modification order
(cherry picked from commit 49fe15d)
bbbc549
@manstis manstis GUVNOR-1524: DRL Model Editor should support "extends"(cherry picked …
…from commit dc00433)

Conflicts:

	drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
e8da04c
@manstis manstis Re-work of change to PackageBuilder to support GUVNOR-1524 following
discussions with laune.(cherry picked from commit efd8d09)
3923743
@manstis manstis Re-work of change to PackageBuilder to support GUVNOR-1524 following
discussions with sotty.(cherry picked from commit 2020ba7)
da70135
Commits on Sep 15, 2011
@etirelli etirelli JBRULES-3193: fixing expression analysis in modify blocks
(cherry picked from commit b404478)
8605c64
@mariofusco mariofusco JBRULES-3181
(cherry picked from commit 59e0260)

Conflicts:

	drools-compiler/src/main/java/org/drools/commons/jci/compilers/EclipseJavaCompiler.java
1c9384b
@mdproctor mdproctor removed illegal import
e1e3e18
@sotty sotty JBRULES-3143 Knowledge Agent does not handle multiple packages in Bui…
…lder output from single resource

(cherry picked from commit bc93d30)

Conflicts:

	drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java
e7d750c
@Salaboy Salaboy JBRULES-3180: FIX queryCommand for variable serialization
- fix query command
(cherry picked from commit 6c63d57)
e4e9910
@bauna bauna fix error when disconnected == true
(cherry picked from commit 45c43ff)

Conflicts:

	drools-core/src/main/java/org/drools/command/runtime/rule/GetFactHandleCommand.java
495a355
@mrietveld mrietveld Oracle fix: Added @SequenceGenerator annotation to classes using @Gen…
…eratedValue (for their @Id's mostly) -- Oracle databases will throw "ORA-02289: sequence does not exist" otherwise (upon "select hibernate_sequence.nextval from dual", for example.)

(cherry picked from commit 5f22821)
970a4d2
krisv JBPM-3246
 - setting em flush mode to commit(cherry picked from commit 150dd84)
5e120f9
@mdproctor mdproctor removed incorrectly added file
eca628b
@sotty sotty JBRULES-3136 Exception when extending non-bean classes
(cherry picked from commit da44551)
39d4fb6
@sotty sotty JBRULES 2945 - Support "extends" feature in declared beans
(cherry picked from commit e62e733)

Conflicts:

	drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
	drools-compiler/src/main/java/org/drools/lang/DRLParser.java
	drools-compiler/src/main/java/org/drools/lang/api/DeclareDescrBuilderImpl.java
	drools-compiler/src/main/java/org/drools/lang/api/FieldDescrBuilderImpl.java
	drools-compiler/src/main/java/org/drools/lang/descr/TypeFieldDescr.java
	drools-core/src/main/java/org/drools/core/util/asm/ClassFieldInspector.java
	drools-core/src/main/java/org/drools/factmodel/ClassBuilder.java
	drools-core/src/main/java/org/drools/factmodel/FieldDefinition.java
	drools-core/src/main/java/org/drools/rule/TypeDeclaration.java
0a49243
@mdproctor mdproctor fixed compilation errors
6b080ad
@mdproctor mdproctor JBRULES-2993: fixing DRLParser to not unescape strings, as this is be…
…ing done by the compiler when MVEL executes the expression.
0517965
@mdproctor mdproctor JBRULES-3146 Rules with timers do not persist
6f80d0e
@mdproctor mdproctor JBRULES-3146 Rules with timers do not persist
d2574f5
Commits on Sep 16, 2011
@mdproctor mdproctor JBRULES-3146 rules with timers do not persist
(cherry picked from commit e8061e1)
d9ff06c
@mdproctor mdproctor JBRULES-3146 rules with timers do not persist
(cherry picked from commit ba5ecf7)
74f6b55
Commits on Sep 18, 2011
@mdproctor mdproctor JBRULES-3213 DisposeCommand closes down all data structures and then …
…persits them

JBRULES-3212 Spring is closing EntityManager early
(cherry picked from commit 52ca21b)
1b3bd6e
@etirelli etirelli JBRULES-3214: fixing timers to work with western timezones
0a629a8
Commits on Sep 19, 2011
krisv Fixing persistence
951b219
@mdproctor mdproctor JBRULES-2297 Enable marshalling of events in drools fusion
6571295
@mdproctor mdproctor JBRULES-3146 rules with timers do not persist
-Enabled a previous disabled test
dee32dd
@mdproctor mdproctor JBRULES-3216 Enable marshalling of Entry Points
(cherry picked from commit 293c6b3)
0894767
@mdproctor mdproctor JBRULES-3216 Enable marshalling of Entry Points
(cherry picked from commit ac2d36a)
51109ca
@mdproctor mdproctor BUG731642 Removed politician names from Honest Politician Example
(cherry picked from commit b9d453c)
57b3e8f
@ge0ffrey ge0ffrey 735113 testcase that shows that changeset of type CSV does not work w…
…hen used with KnowledgeAgent
f953bdd
@ge0ffrey ge0ffrey 735113 fix that changeset of type CSV does not work when used with Kn…
…owledgeAgent
1fcba33
@mariofusco mariofusco [JBRULES-3217] dispose stateful session inside stateless one after ex…
…ecute and avoid to create a ProcessRuntime twice
1315268
Commits on Sep 20, 2011
krisv Only SingleSessionCommandService turns off process instance
serialization as part of the session
5abb20d
@etirelli etirelli JBRULES-3218: fixing name resolution of declared statements when pack…
…age imports are present
08ce9da
Commits on Sep 21, 2011
@ge0ffrey ge0ffrey Prepare drools 5.2.2-SNAPSHOT and jbpm 5.1.2-SNAPSHOT
67d2807
@etirelli etirelli Fixing Stock Broker example
5a0f904
Commits on Sep 27, 2011
@etirelli etirelli bz735732: adding test case to avoid future regressions
619274c
@etirelli etirelli JBRULES-3227: fixing regression on CLOUD mode
963fd9a
Commits on Sep 28, 2011
@mdproctor mdproctor JBRULES-3223 Enable marshalling of sliding time and length windows
(cherry picked from commit b869611)

Conflicts:

	drools-core/src/main/java/org/drools/marshalling/impl/OutputMarshaller.java
db9b94f
@mdproctor mdproctor Merge branch '5.2.x' of github.com:droolsjbpm/drools into 5.2.x
aefe57e
@mdproctor mdproctor JBRULES-3223 Enable marshalling of sliding time and length windows
-cleaned up imports
5bea637
Commits on Sep 30, 2011
@mariofusco mariofusco [JBRULES-3219] decapitalize fields starting with an uppercase letter
e972d85
@etirelli etirelli Bug 724350 : JBRULES-3219 : fixing bug when the property name starts …
…with a lower case letter followed by an upper case one.
10f4a0e
Commits on Oct 04, 2011
@etirelli etirelli As requested by QA, I am reverting commit: "Bug 724350 : JBRULES-3219…
… : fixing bug when the property name starts with a lower case letter followed by an upper case one."

This reverts commit 10f4a0e.
177c65a
@etirelli etirelli As requested by QA, I am reverting "[JBRULES-3219] decapitalize field…
…s starting with an uppercase letter"

This reverts commit e972d85.
46b2d3a
Commits on Oct 05, 2011
@mariofusco mariofusco [JBRULES-3220] fix ObjectHashMap resize
(cherry picked from commit 17bb924)
ad15f5d
@mdproctor mdproctor JBRULES-3220 AbstractHashTable resize gets corrupted
-Existing commits for this jira are incorrect and still result in
corruptions
-See ObjectHashMapTest.testEqualityWithResize for corruption introduced by
previous fix
5d9c466
@mdproctor mdproctor JBRULES-3220 AbstractHashTable resize gets corrupted
-Added test for edge cases on disconnected facthandles using external form
6f394ee
@mariofusco mariofusco [JBRULES-3220] remove useless imports
9913a68
Commits on Nov 22, 2011
@etirelli etirelli Fixing grammar generation in the pom file
(cherry picked from commit f240461)
(cherry picked from commit 808f188)
818da61
@etirelli etirelli JBRULES-3292: adding support for BigDecimal and BigInteger literals
(cherry picked from commit da8f24f)
(cherry picked from commit 9021aa3)
fe01918
@etirelli etirelli JBRULES-3292: regenerating the grammars for consistency
3f31806
Commits on Feb 24, 2012
@etirelli etirelli JBRULES-2671: adding support for String comparisons with operators >,…
… >=, <, <=

(cherry picked from commit 00c4c01)
9f3f5c6
@etirelli etirelli JBRULES-2671: adding support for String comparisons with operators >,…
… >=, <, <=

(cherry picked from commit 6111ebf)
582557a
Commits on Apr 04, 2012
@mdproctor mdproctor JBRULES-3234 NPE on modify with lock-on-active
(cherry picked from commit c6a3bee)

Conflicts:

	drools-compiler/src/test/java/org/drools/integrationtests/ExecutionFlowControlTest.java
	drools-core/src/main/java/org/drools/common/DefaultAgenda.java
	drools-core/src/main/java/org/drools/reteoo/RuleTerminalNode.java
7b86663
Commits on Apr 21, 2012
@etirelli etirelli JBRULES-3467: BZ-813547: fixing agent incremental kbase building
(cherry picked from commit d29fabb)

Conflicts:

	drools-compiler/src/test/java/org/drools/integrationtests/MarshallingTest.java
	drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java
	drools-core/src/main/java/org/drools/reteoo/LeftTuple.java
	drools-core/src/main/java/org/drools/rule/Function.java
	drools-core/src/test/java/org/drools/agent/DummyProcess.java
cbd835c
@etirelli etirelli JBRULES-3467: BZ-813547: fixing agent incremental kbase building
c04e46a
Commits on Apr 25, 2012
@etirelli etirelli JBRULES-3145 BZ-811745: improving the agent code to handle different …
…types of serialized packages

(cherry picked from commit 5fadf55)

Conflicts:

	drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
	drools-compiler/src/test/java/org/drools/agent/KnowledgeAgentTest.java
	drools-compiler/src/test/java/org/drools/integrationtests/KnowledgeBuilderTest.java
(cherry picked from commit 5802f2e)

Conflicts:

	drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
	drools-core/src/main/java/org/drools/agent/impl/KnowledgeAgentImpl.java
611c993
Commits on Apr 26, 2012
@manstis manstis JBRULES-3145 BZ-811745: improving the agent code to handle different
types of serialized packages - Phase 3.(cherry picked from commit 2222a7f)
9091171