|
From: <jbo...@li...> - 2006-06-26 01:00:08
|
Author: tirelli
Date: 2006-06-25 20:59:51 -0400 (Sun, 25 Jun 2006)
New Revision: 4817
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrs
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrsPerson
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/ThreeColumnsWithConstraints
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java
Log:
Updating serialized datasources.
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrs
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrs 2006-06-25 17:26:27 UTC (rev 4816)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrs 2006-06-26 00:59:51 UTC (rev 4817)
@@ -193,11 +193,11 @@
c3EAfgAucQB+ADJ0AAhtZXNzYWdlMnNxAH4ANHQAA1R3b3hwc3EAfgA4AAAA0nEAfgAyeHNyABJv
cmcuZHJvb2xzLnJ1bGUuT3IVF4eAAV23IwIAAHhxAH4AGnNxAH4AHQAAAAJ3BAAAAApzcQB+ACEA
AAACAAAAAHNxAH4AHQAAAAF3BAAAAAFzcQB+ACZxAH4ALXNxAH4ALnEAfgAydAAIbWVzc2FnZTJz
-cQB+ADRxAH4AN3hwc3EAfgA4AAAA0nEAfgAyc3EAfgAhAAAAAgAAAABzcQB+AB0AAAABdwQAAAAB
+cQB+ADRxAH4AN3hwc3EAfgA4AAAA0nEAfgAyc3EAfgAhAAAAA/////9zcQB+AB0AAAABdwQAAAAB
c3EAfgAmcQB+AC1zcQB+AC5xAH4AMnQACG1lc3NhZ2Uyc3EAfgA0cQB+AEB4cHNxAH4AOAAAANJx
-AH4AMnhzcQB+AEJzcQB+AB0AAAACdwQAAAAKc3EAfgAhAAAAAwAAAABzcQB+AB0AAAABdwQAAAAB
+AH4AMnhzcQB+AEJzcQB+AB0AAAACdwQAAAAKc3EAfgAhAAAABP////9zcQB+AB0AAAABdwQAAAAB
c3EAfgAmcQB+AC1zcQB+AC5xAH4AMnQACG1lc3NhZ2Uzc3EAfgA0cQB+ADd4cHNxAH4AOAAAANJx
-AH4AMnNxAH4AIQAAAAMAAAAAc3EAfgAdAAAAAXcEAAAAAXNxAH4AJnEAfgAtc3EAfgAucQB+ADJ0
+AH4AMnNxAH4AIQAAAAX////+c3EAfgAdAAAAAXcEAAAAAXNxAH4AJnEAfgAtc3EAfgAucQB+ADJ0
AAhtZXNzYWdlM3NxAH4ANHQABVRocmVleHBzcQB+ADgAAADScQB+ADJ4eHQADUhlbGxvIFdvcmxk
IDFwdAA4b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8yXzBDb25zZXF1ZW5jZUlu
dm9rZXJzcQB+AA0AAAAAAAAAAAIAAAAAAAFwcQB+ABRzcgA4b3JnLmRyb29scy5yZXRlb28uUnVs
@@ -208,11 +208,11 @@
AQAAAABzcQB+AB0AAAABdwQAAAABc3EAfgAmcQB+AC1zcQB+AC5xAH4AMnQACG1lc3NhZ2Uyc3EA
fgA0cQB+AEB4cHNxAH4AOAAAANJxAH4AMnhzcQB+AEJzcQB+AB0AAAACdwQAAAAKc3EAfgAhAAAA
AgAAAABzcQB+AB0AAAABdwQAAAABc3EAfgAmcQB+AC1zcQB+AC5xAH4AMnQACG1lc3NhZ2Uyc3EA
-fgA0cQB+ADd4cHNxAH4AOAAAANJxAH4AMnNxAH4AIQAAAAIAAAAAc3EAfgAdAAAAAXcEAAAAAXNx
+fgA0cQB+ADd4cHNxAH4AOAAAANJxAH4AMnNxAH4AIQAAAAP/////c3EAfgAdAAAAAXcEAAAAAXNx
AH4AJnEAfgAtc3EAfgAucQB+ADJ0AAhtZXNzYWdlMnNxAH4ANHEAfgBAeHBzcQB+ADgAAADScQB+
-ADJ4c3EAfgBCc3EAfgAdAAAAAncEAAAACnNxAH4AIQAAAAMAAAAAc3EAfgAdAAAAAXcEAAAAAXNx
+ADJ4c3EAfgBCc3EAfgAdAAAAAncEAAAACnNxAH4AIQAAAAT/////c3EAfgAdAAAAAXcEAAAAAXNx
AH4AJnEAfgAtc3EAfgAucQB+ADJ0AAhtZXNzYWdlM3NxAH4ANHEAfgA3eHBzcQB+ADgAAADScQB+
-ADJzcQB+ACEAAAADAAAAAHNxAH4AHQAAAAF3BAAAAAFzcQB+ACZxAH4ALXNxAH4ALnEAfgAydAAI
+ADJzcQB+ACEAAAAF/////nNxAH4AHQAAAAF3BAAAAAFzcQB+ACZxAH4ALXNxAH4ALnEAfgAydAAI
bWVzc2FnZTNzcQB+ADRxAH4AYnhwc3EAfgA4AAAA0nEAfgAyeHEAfgAHeHQADUhlbGxvIFdvcmxk
IDJweA==</byte-array>
</org.drools.rule.PackageCompilationData>
@@ -258,10 +258,10 @@
YWdlMnNxAH4ALnQAA1R3b3hwc3EAfgAyAAAA0nEAfgAseHNyABJvcmcuZHJvb2xzLnJ1bGUuT3IV
F4eAAV23IwIAAHhxAH4AE3NxAH4AFwAAAAJ3BAAAAApzcQB+ABsAAAACAAAAAHNxAH4AFwAAAAF3
BAAAAAFzcQB+ACBxAH4AJ3NxAH4AKHEAfgAsdAAIbWVzc2FnZTJzcQB+AC5xAH4AMXhwc3EAfgAy
-AAAA0nEAfgAsc3EAfgAbAAAAAgAAAABzcQB+ABcAAAABdwQAAAABc3EAfgAgcQB+ACdzcQB+AChx
+AAAA0nEAfgAsc3EAfgAbAAAAA/////9zcQB+ABcAAAABdwQAAAABc3EAfgAgcQB+ACdzcQB+AChx
AH4ALHQACG1lc3NhZ2Uyc3EAfgAucQB+ADp4cHNxAH4AMgAAANJxAH4ALHhzcQB+ADxzcQB+ABcA
-AAACdwQAAAAKc3EAfgAbAAAAAwAAAABzcQB+ABcAAAABdwQAAAABc3EAfgAgcQB+ACdzcQB+AChx
-AH4ALHQACG1lc3NhZ2Uzc3EAfgAucQB+ADF4cHNxAH4AMgAAANJxAH4ALHNxAH4AGwAAAAMAAAAA
+AAACdwQAAAAKc3EAfgAbAAAABP////9zcQB+ABcAAAABdwQAAAABc3EAfgAgcQB+ACdzcQB+AChx
+AH4ALHQACG1lc3NhZ2Uzc3EAfgAucQB+ADF4cHNxAH4AMgAAANJxAH4ALHNxAH4AGwAAAAX////+
c3EAfgAXAAAAAXcEAAAAAXNxAH4AIHEAfgAnc3EAfgAocQB+ACx0AAhtZXNzYWdlM3NxAH4ALnQA
BVRocmVleHBzcQB+ADIAAADScQB+ACx4eHEAfgADcHQADUhlbGxvIFdvcmxkIDJzcQB+AAQAAAAA
AAAAAAIAAAAAAAFwcQB+AAxzcgA4b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8y
@@ -272,11 +272,11 @@
dwQAAAABc3EAfgAgcQB+ACdzcQB+AChxAH4ALHQACG1lc3NhZ2Uyc3EAfgAucQB+ADp4cHNxAH4A
MgAAANJxAH4ALHhzcQB+ADxzcQB+ABcAAAACdwQAAAAKc3EAfgAbAAAAAgAAAABzcQB+ABcAAAAB
dwQAAAABc3EAfgAgcQB+ACdzcQB+AChxAH4ALHQACG1lc3NhZ2Uyc3EAfgAucQB+ADF4cHNxAH4A
-MgAAANJxAH4ALHNxAH4AGwAAAAIAAAAAc3EAfgAXAAAAAXcEAAAAAXNxAH4AIHEAfgAnc3EAfgAo
+MgAAANJxAH4ALHNxAH4AGwAAAAP/////c3EAfgAXAAAAAXcEAAAAAXNxAH4AIHEAfgAnc3EAfgAo
cQB+ACx0AAhtZXNzYWdlMnNxAH4ALnEAfgA6eHBzcQB+ADIAAADScQB+ACx4c3EAfgA8c3EAfgAX
-AAAAAncEAAAACnNxAH4AGwAAAAMAAAAAc3EAfgAXAAAAAXcEAAAAAXNxAH4AIHEAfgAnc3EAfgAo
-cQB+ACx0AAhtZXNzYWdlM3NxAH4ALnEAfgAxeHBzcQB+ADIAAADScQB+ACxzcQB+ABsAAAADAAAA
-AHNxAH4AFwAAAAF3BAAAAAFzcQB+ACBxAH4AJ3NxAH4AKHEAfgAsdAAIbWVzc2FnZTNzcQB+AC5x
+AAAAAncEAAAACnNxAH4AGwAAAAT/////c3EAfgAXAAAAAXcEAAAAAXNxAH4AIHEAfgAnc3EAfgAo
+cQB+ACx0AAhtZXNzYWdlM3NxAH4ALnEAfgAxeHBzcQB+ADIAAADScQB+ACxzcQB+ABsAAAAF////
+/nNxAH4AFwAAAAF3BAAAAAFzcQB+ACBxAH4AJ3NxAH4AKHEAfgAsdAAIbWVzc2FnZTNzcQB+AC5x
AH4AXHhwc3EAfgAyAAAA0nEAfgAseHNyAB1vcmcuZHJvb2xzLnJ1bGUuRXZhbENvbmRpdGlvbj4q
3Axyg48WAgACTAAKZXhwcmVzc2lvbnQAH0xvcmcvZHJvb2xzL3NwaS9FdmFsRXhwcmVzc2lvbjtb
ABRyZXF1aXJlZERlY2xhcmF0aW9uc3EAfgAHeHEAfgAVc3IAMm9yZy5kcm9vbHMucmV0ZW9vLlJ1
@@ -360,7 +360,7 @@
Zy9kcm9vbHMvcmV0ZW9vL09iamVjdFNvdXJjZTt4cQB+AB8AAQAAAAIAAAAAc3EAfgAjAAAAAXcE
AAAAAXNyACZvcmcuZHJvb2xzLnJldGVvby5MZWZ0SW5wdXRBZGFwdGVyTm9kZWZhub8KOlI0AgAC
TAAGYmluZGVydAAiTG9yZy9kcm9vbHMvY29tbW9uL0JldGFOb2RlQmluZGVyO0wADG9iamVjdFNv
-dXJjZXEAfgA2eHIAHW9yZy5kcm9vbHMucmV0ZW9vLlR1cGxlU291cmNl2d46uOWajpECAAFMAAp0
+dXJjZXEAfgA2eHIAHW9yZy5kcm9vbHMucmV0ZW9vLlR1cGxlU291cmNlnyEX66pio5ACAAFMAAp0
dXBsZVNpbmtzcQB+ACt4cQB+ACEAAQAAAAMAAAAHc3EAfgAkAAAAAXcEAAAAAXNyABpvcmcuZHJv
b2xzLnJldGVvby5Kb2luTm9kZTiQLy6/d83aAgAAeHIAGm9yZy5kcm9vbHMucmV0ZW9vLkJldGFO
b2RlOwpKjoeyYlsCAANMAA5qb2luTm9kZUJpbmRlcnEAfgA6TAAJbGVmdElucHV0dAAfTG9yZy9k
@@ -399,11 +399,11 @@
cQB+AG50AAhtZXNzYWdlMnNxAH4AcHQAA1R3b3hwc3EAfgBzAAAA0nEAfgBueHNyABJvcmcuZHJv
b2xzLnJ1bGUuT3IVF4eAAV23IwIAAHhxAH4AWHNxAH4AJAAAAAJ3BAAAAApzcQB+AF4AAAACAAAA
AHNxAH4AJAAAAAF3BAAAAAFzcQB+AGJxAH4AaXNxAH4AanEAfgBudAAIbWVzc2FnZTJzcQB+AHBx
-AH4AM3hwc3EAfgBzAAAA0nEAfgBuc3EAfgBeAAAAAgAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBi
+AH4AM3hwc3EAfgBzAAAA0nEAfgBuc3EAfgBeAAAAA/////9zcQB+ACQAAAABdwQAAAABc3EAfgBi
cQB+AGlzcQB+AGpxAH4AbnQACG1lc3NhZ2Uyc3EAfgBwcQB+AHt4cHNxAH4AcwAAANJxAH4Abnhz
-cQB+AH1zcQB+ACQAAAACdwQAAAAKc3EAfgBeAAAAAwAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBi
+cQB+AH1zcQB+ACQAAAACdwQAAAAKc3EAfgBeAAAABP////9zcQB+ACQAAAABdwQAAAABc3EAfgBi
cQB+AGlzcQB+AGpxAH4AbnQACG1lc3NhZ2Uzc3EAfgBwcQB+ADN4cHNxAH4AcwAAANJxAH4AbnNx
-AH4AXgAAAAMAAAAAc3EAfgAkAAAAAXcEAAAAAXNxAH4AYnEAfgBpc3EAfgBqcQB+AG50AAhtZXNz
+AH4AXgAAAAX////+c3EAfgAkAAAAAXcEAAAAAXNxAH4AYnEAfgBpc3EAfgBqcQB+AG50AAhtZXNz
YWdlM3NxAH4AcHQABVRocmVleHBzcQB+AHMAAADScQB+AG54eHQADUhlbGxvIFdvcmxkIDFwcQB+
AEVzcgAjb3JnLmRyb29scy5yZXRlb28uRXZhbENvbmRpdGlvbk5vZGUbkCfPlIvj4AIAAkwACWNv
bmRpdGlvbnQAH0xvcmcvZHJvb2xzL3J1bGUvRXZhbENvbmRpdGlvbjtMAAt0dXBsZVNvdXJjZXEA
@@ -416,11 +416,11 @@
AAAAAXcEAAAAAXNxAH4AYnEAfgBpc3EAfgBqcQB+AG50AAhtZXNzYWdlMnNxAH4AcHEAfgB7eHBz
cQB+AHMAAADScQB+AG54c3EAfgB9c3EAfgAkAAAAAncEAAAACnNxAH4AXgAAAAIAAAAAc3EAfgAk
AAAAAXcEAAAAAXNxAH4AYnEAfgBpc3EAfgBqcQB+AG50AAhtZXNzYWdlMnNxAH4AcHEAfgAzeHBz
-cQB+AHMAAADScQB+AG5zcQB+AF4AAAACAAAAAHNxAH4AJAAAAAF3BAAAAAFzcQB+AGJxAH4AaXNx
+cQB+AHMAAADScQB+AG5zcQB+AF4AAAAD/////3NxAH4AJAAAAAF3BAAAAAFzcQB+AGJxAH4AaXNx
AH4AanEAfgBudAAIbWVzc2FnZTJzcQB+AHBxAH4Ae3hwc3EAfgBzAAAA0nEAfgBueHNxAH4AfXNx
-AH4AJAAAAAJ3BAAAAApzcQB+AF4AAAADAAAAAHNxAH4AJAAAAAF3BAAAAAFzcQB+AGJxAH4AaXNx
+AH4AJAAAAAJ3BAAAAApzcQB+AF4AAAAE/////3NxAH4AJAAAAAF3BAAAAAFzcQB+AGJxAH4AaXNx
AH4AanEAfgBudAAIbWVzc2FnZTNzcQB+AHBxAH4AM3hwc3EAfgBzAAAA0nEAfgBuc3EAfgBeAAAA
-AwAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBicQB+AGlzcQB+AGpxAH4AbnQACG1lc3NhZ2Uzc3EA
+Bf////5zcQB+ACQAAAABdwQAAAABc3EAfgBicQB+AGlzcQB+AGpxAH4AbnQACG1lc3NhZ2Uzc3EA
fgBwcQB+AJ14cHNxAH4AcwAAANJxAH4AbnhzcgAdb3JnLmRyb29scy5ydWxlLkV2YWxDb25kaXRp
b24+KtwMcoOPFgIAAkwACmV4cHJlc3Npb250AB9Mb3JnL2Ryb29scy9zcGkvRXZhbEV4cHJlc3Np
b247WwAUcmVxdWlyZWREZWNsYXJhdGlvbnNxAH4ATXhxAH4AWXNyADJvcmcuZHJvb2xzLnJldGVv
@@ -458,11 +458,11 @@
cmV0ZW9vLlJldGVvb0J1aWxkZXIYHVn7j8gD8AIACUkAF2N1cnJlbnRPZmZzZXRBZGp1c3RtZW50
SQACaWRMAA1hdHRhY2hlZE5vZGVzcQB+AA9MAAxkZWNsYXJhdGlvbnNxAH4AD0wADG9iamVjdFNv
dXJjZXEAfgA2TAAKb2JqZWN0VHlwZXEAfgAPTAAIcmVzb2x2ZXJxAH4AHkwABXJ1bGVzcQB+AA9M
-AAt0dXBsZVNvdXJjZXEAfgBAeHAAAAAAAAAAG3NxAH4ADD9AAAAAAAAYdwgAAAAgAAAAEnEAfgEI
-cQB+AQhxAH4A+XEAfgD5cQB+ARNxAH4BE3EAfgDwcQB+APBxAH4A/HEAfgD8cQB+AO1xAH4A7XEA
-fgApcQB+AClxAH4AQ3EAfgBDcQB+AOtxAH4A63EAfgEDcQB+AQNxAH4AonEAfgCicQB+AQVxAH4B
-BXEAfgEZcQB+ARlxAH4AN3EAfgA3cQB+ADxxAH4APHEAfgBFcQB+AEVxAH4A93EAfgD3cQB+AEFx
-AH4AQXhzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAB4cQB+AQNzcgAXamF2YS51dGlsLkxpbmtlZEhh
+AAt0dXBsZVNvdXJjZXEAfgBAeHAAAAAAAAAAG3NxAH4ADD9AAAAAAAAYdwgAAAAgAAAAEnEAfgD8
+cQB+APxxAH4A8HEAfgDwcQB+APlxAH4A+XEAfgDtcQB+AO1xAH4AQ3EAfgBDcQB+AQNxAH4BA3EA
+fgEZcQB+ARlxAH4AKXEAfgApcQB+AQhxAH4BCHEAfgBBcQB+AEFxAH4BE3EAfgETcQB+AOtxAH4A
+63EAfgA3cQB+ADdxAH4APHEAfgA8cQB+AEVxAH4ARXEAfgEFcQB+AQVxAH4A93EAfgD3cQB+AKJx
+AH4AonhzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAB4cQB+AQNzcgAXamF2YS51dGlsLkxpbmtlZEhh
c2hNYXA0wE5cEGzA+wIAAVoAC2FjY2Vzc09yZGVyeHEAfgAMP0AAAAAAAAx3CAAAABAAAAABcQB+
ALRzcgARamF2YS5sYW5nLkludGVnZXIS4qCk94GHOAIAAUkABXZhbHVleHIAEGphdmEubGFuZy5O
dW1iZXKGrJUdC5TgiwIAAHhwAAAAA3gAcQB+ASpzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAJxAH4A
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrsPerson
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrsPerson 2006-06-25 17:26:27 UTC (rev 4816)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrsPerson 2006-06-26 00:59:51 UTC (rev 4817)
@@ -130,7 +130,7 @@
AAQAAAAAc3EAfgAWAAAAAXcEAAAAAXNxAH4AH3EAfgAmc3EAfgAncQB+AEx0AAR0eXBlc3EAfgAt
dAAEYnJpZXhwc3EAfgAxAAAA0nEAfgBMeHhzcQB+ADtzcQB+ABYAAAACdwQAAAAKc3EAfgAaAAAA
BQAAAABzcQB+ABYAAAABdwQAAAABc3EAfgAfcQB+ACZzcQB+ACdxAH4AK3QACG1lc3NhZ2Uzc3EA
-fgAtcQB+ADB4cHNxAH4AMQAAANJxAH4AK3NxAH4AGgAAAAUAAAAAc3EAfgAWAAAAAXcEAAAAAXNx
+fgAtcQB+ADB4cHNxAH4AMQAAANJxAH4AK3NxAH4AGgAAAAb/////c3EAfgAWAAAAAXcEAAAAAXNx
AH4AH3EAfgAmc3EAfgAncQB+ACt0AAhtZXNzYWdlM3NxAH4ALXQABVRocmVleHBzcQB+ADEAAADS
cQB+ACt4eHQADUhlbGxvIFdvcmxkIDFwdAA4b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19X
b3JsZF8yXzBDb25zZXF1ZW5jZUludm9rZXJzcQB+AAMAAAAAAAAAAAIAAAAAAAFwcQB+AAtzcgA4
@@ -150,13 +150,13 @@
AAF3BAAAAAFzcQB+AB9xAH4AJnNxAH4AJ3EAfgBMdAAEdHlwZXNxAH4ALXEAfgBXeHBzcQB+ADEA
AADScQB+AEx4eHNxAH4AO3NxAH4AFgAAAAJ3BAAAAApzcQB+ABoAAAAFAAAAAHNxAH4AFgAAAAF3
BAAAAAFzcQB+AB9xAH4AJnNxAH4AJ3EAfgArdAAIbWVzc2FnZTNzcQB+AC1xAH4AMHhwc3EAfgAx
-AAAA0nEAfgArc3EAfgAaAAAABQAAAABzcQB+ABYAAAABdwQAAAABc3EAfgAfcQB+ACZzcQB+ACdx
+AAAA0nEAfgArc3EAfgAaAAAABv////9zcQB+ABYAAAABdwQAAAABc3EAfgAfcQB+ACZzcQB+ACdx
AH4AK3QACG1lc3NhZ2Uzc3EAfgAtcQB+AGh4cHNxAH4AMQAAANJxAH4AK3hzcQB+ADtzcQB+ABYA
-AAACdwQAAAAKc3EAfgAaAAAABgAAAABzcQB+ABYAAAABdwQAAAABc3EAfgAfcQB+ACZzcQB+ACd2
+AAACdwQAAAAKc3EAfgAaAAAAB/////9zcQB+ABYAAAABdwQAAAABc3EAfgAfcQB+ACZzcQB+ACd2
cgARb3JnLmRyb29scy5QZXJzb24kpC8CF5+4ZgIACEkAA2FnZVoABWFsaXZlQwADc2V4TAAKYmln
RGVjaW1hbHQAFkxqYXZhL21hdGgvQmlnRGVjaW1hbDtMAApiaWdJbnRlZ2VydAAWTGphdmEvbWF0
aC9CaWdJbnRlZ2VyO0wABWxpa2VzcQB+AARMAARuYW1lcQB+AARMAAZzdGF0dXNxAH4ABHhwdAAE
-bmFtZXNxAH4ALXQABG1hcmt4cHNxAH4AMQAAANJxAH4Au3NxAH4AGgAAAAYAAAAAc3EAfgAWAAAA
+bmFtZXNxAH4ALXQABG1hcmt4cHNxAH4AMQAAANJxAH4Au3NxAH4AGgAAAAj////+c3EAfgAWAAAA
AXcEAAAAAXNyACdvcmcuZHJvb2xzLnJ1bGUuQm91bmRWYXJpYWJsZUNvbnN0cmFpbnRw+tSAX/7W
VwIABUkABmNvbHVtbkwAC2RlY2xhcmF0aW9ucQB+ABtMAAlldmFsdWF0b3JxAH4AIEwADmZpZWxk
RXh0cmFjdG9ycQB+ACFbABRyZXF1aXJlZERlY2xhcmF0aW9uc3EAfgAGeHAAAAAAcQB+AHJxAH4A
@@ -213,7 +213,7 @@
TXNxAH4AGwAAAAQAAAAAc3EAfgAXAAAAAXcEAAAAAXNxAH4AIHEAfgAnc3EAfgAocQB+AE10AAR0
eXBlc3EAfgAudAAEYnJpZXhwc3EAfgAyAAAA0nEAfgBNeHhzcQB+ADxzcQB+ABcAAAACdwQAAAAK
c3EAfgAbAAAABQAAAABzcQB+ABcAAAABdwQAAAABc3EAfgAgcQB+ACdzcQB+AChxAH4ALHQACG1l
-c3NhZ2Uzc3EAfgAucQB+ADF4cHNxAH4AMgAAANJxAH4ALHNxAH4AGwAAAAUAAAAAc3EAfgAXAAAA
+c3NhZ2Uzc3EAfgAucQB+ADF4cHNxAH4AMgAAANJxAH4ALHNxAH4AGwAAAAb/////c3EAfgAXAAAA
AXcEAAAAAXNxAH4AIHEAfgAnc3EAfgAocQB+ACx0AAhtZXNzYWdlM3NxAH4ALnQABVRocmVleHBz
cQB+ADIAAADScQB+ACx4eHEAfgADcHQADUhlbGxvIFdvcmxkIDJzcQB+AAQAAAAAAAAAAAIAAAAA
AAFwcQB+AAxzcgA4b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8yXzBDb25zZXF1
@@ -232,14 +232,14 @@
AAAAAHNxAH4AFwAAAAF3BAAAAAFzcQB+ACBxAH4AJ3NxAH4AKHEAfgBNdAAEdHlwZXNxAH4ALnEA
fgBYeHBzcQB+ADIAAADScQB+AE14eHNxAH4APHNxAH4AFwAAAAJ3BAAAAApzcQB+ABsAAAAFAAAA
AHNxAH4AFwAAAAF3BAAAAAFzcQB+ACBxAH4AJ3NxAH4AKHEAfgAsdAAIbWVzc2FnZTNzcQB+AC5x
-AH4AMXhwc3EAfgAyAAAA0nEAfgAsc3EAfgAbAAAABQAAAABzcQB+ABcAAAABdwQAAAABc3EAfgAg
+AH4AMXhwc3EAfgAyAAAA0nEAfgAsc3EAfgAbAAAABv////9zcQB+ABcAAAABdwQAAAABc3EAfgAg
cQB+ACdzcQB+AChxAH4ALHQACG1lc3NhZ2Uzc3EAfgAucQB+AGl4cHNxAH4AMgAAANJxAH4ALHhz
-cQB+ADxzcQB+ABcAAAACdwQAAAAKc3EAfgAbAAAABgAAAABzcQB+ABcAAAABdwQAAAABc3EAfgAg
+cQB+ADxzcQB+ABcAAAACdwQAAAAKc3EAfgAbAAAAB/////9zcQB+ABcAAAABdwQAAAABc3EAfgAg
cQB+ACdzcQB+ACh2cgARb3JnLmRyb29scy5QZXJzb24kpC8CF5+4ZgIACEkAA2FnZVoABWFsaXZl
QwADc2V4TAAKYmlnRGVjaW1hbHQAFkxqYXZhL21hdGgvQmlnRGVjaW1hbDtMAApiaWdJbnRlZ2Vy
dAAWTGphdmEvbWF0aC9CaWdJbnRlZ2VyO0wABWxpa2VzcQB+AAVMAARuYW1lcQB+AAVMAAZzdGF0
-dXNxAH4ABXhwdAAEbmFtZXNxAH4ALnQABG1hcmt4cHNxAH4AMgAAANJxAH4Au3NxAH4AGwAAAAYA
-AAAAc3EAfgAXAAAAAXcEAAAAAXNyACdvcmcuZHJvb2xzLnJ1bGUuQm91bmRWYXJpYWJsZUNvbnN0
+dXNxAH4ABXhwdAAEbmFtZXNxAH4ALnQABG1hcmt4cHNxAH4AMgAAANJxAH4Au3NxAH4AGwAAAAj/
+///+c3EAfgAXAAAAAXcEAAAAAXNyACdvcmcuZHJvb2xzLnJ1bGUuQm91bmRWYXJpYWJsZUNvbnN0
cmFpbnRw+tSAX/7WVwIABUkABmNvbHVtbkwAC2RlY2xhcmF0aW9ucQB+ABxMAAlldmFsdWF0b3Jx
AH4AIUwADmZpZWxkRXh0cmFjdG9ycQB+ACJbABRyZXF1aXJlZERlY2xhcmF0aW9uc3EAfgAHeHAA
AAAAcQB+AHJxAH4AJ3NxAH4AKHEAfgC7dAAEbmFtZXVxAH4ADwAAAAFxAH4Acnhwc3EAfgAyAAAA
@@ -324,7 +324,7 @@
b2xzLnJldGVvby5CZXRhTm9kZTsKSo6HsmJbAgADTAAOam9pbk5vZGVCaW5kZXJ0ACJMb3JnL2Ry
b29scy9jb21tb24vQmV0YU5vZGVCaW5kZXI7TAAJbGVmdElucHV0dAAfTG9yZy9kcm9vbHMvcmV0
ZW9vL1R1cGxlU291cmNlO0wACnJpZ2h0SW5wdXRxAH4ANnhyAB1vcmcuZHJvb2xzLnJldGVvby5U
-dXBsZVNvdXJjZdneOrjlmo6RAgABTAAKdHVwbGVTaW5rc3EAfgAreHEAfgAhAAAAAAAZAAAAAHNx
+dXBsZVNvdXJjZZ8hF+uqYqOQAgABTAAKdHVwbGVTaW5rc3EAfgAreHEAfgAhAAAAAAAZAAAAAHNx
AH4AJAAAAAF3BAAAAAFzcgAeb3JnLmRyb29scy5yZXRlb28uVGVybWluYWxOb2RlxhfOL18W6tcC
AAJMAARydWxldAAWTG9yZy9kcm9vbHMvcnVsZS9SdWxlO0wAC3R1cGxlU291cmNlcQB+ADx4cQB+
ACEAAAAAABoAAAAAc3IAFG9yZy5kcm9vbHMucnVsZS5SdWxlbl6svvqzc2oCAA5aAAlhdXRvRm9j
@@ -367,14 +367,14 @@
fgBhAAAABAAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBlcQB+AGxzcQB+AFJxAH4AjnQABHR5cGVz
cQB+AG90AARicmlleHBzcQB+AHMAAADScQB+AI54eHNxAH4AfXNxAH4AJAAAAAJ3BAAAAApzcQB+
AGEAAAAFAAAAAHNxAH4AJAAAAAF3BAAAAAFzcQB+AGVxAH4AbHNxAH4AUnEAfgBWdAAIbWVzc2Fn
-ZTNzcQB+AG9xAH4Acnhwc3EAfgBzAAAA0nEAfgBWc3EAfgBhAAAABQAAAABzcQB+ACQAAAABdwQA
+ZTNzcQB+AG9xAH4Acnhwc3EAfgBzAAAA0nEAfgBWc3EAfgBhAAAABv////9zcQB+ACQAAAABdwQA
AAABc3EAfgBlcQB+AGxzcQB+AFJxAH4AVnQACG1lc3NhZ2Uzc3EAfgBvdAAFVGhyZWV4cHNxAH4A
-cwAAANJxAH4AVnhzcQB+AH1zcQB+ACQAAAACdwQAAAAKc3EAfgBhAAAABgAAAABzcQB+ACQAAAAB
+cwAAANJxAH4AVnhzcQB+AH1zcQB+ACQAAAACdwQAAAAKc3EAfgBhAAAAB/////9zcQB+ACQAAAAB
dwQAAAABc3EAfgBlcQB+AGxzcQB+AFJ2cgARb3JnLmRyb29scy5QZXJzb24kpC8CF5+4ZgIACEkA
A2FnZVoABWFsaXZlQwADc2V4TAAKYmlnRGVjaW1hbHQAFkxqYXZhL21hdGgvQmlnRGVjaW1hbDtM
AApiaWdJbnRlZ2VydAAWTGphdmEvbWF0aC9CaWdJbnRlZ2VyO0wABWxpa2VzcQB+AERMAARuYW1l
cQB+AERMAAZzdGF0dXNxAH4ARHhwdAAEbmFtZXNxAH4Ab3EAfgAzeHBzcQB+AHMAAADScQB+ALVz
-cQB+AGEAAAAGAAAAAHNxAH4AJAAAAAF3BAAAAAFzcgAnb3JnLmRyb29scy5ydWxlLkJvdW5kVmFy
+cQB+AGEAAAAI/////nNxAH4AJAAAAAF3BAAAAAFzcgAnb3JnLmRyb29scy5ydWxlLkJvdW5kVmFy
aWFibGVDb25zdHJhaW50cPrUgF/+1lcCAAVJAAZjb2x1bW5MAAtkZWNsYXJhdGlvbnEAfgBiTAAJ
ZXZhbHVhdG9ycQB+AGZMAA5maWVsZEV4dHJhY3RvcnEAfgBnWwAUcmVxdWlyZWREZWNsYXJhdGlv
bnNxAH4ARnhwAAAAAHEAfgBRcQB+AGxzcQB+AFJxAH4AtXQABG5hbWV1cQB+AE0AAAABcQB+AFF4
@@ -396,7 +396,7 @@
AAFzcQB+AGVxAH4AbHNxAH4AUnEAfgCOdAAEdHlwZXNxAH4Ab3EAfgCZeHBzcQB+AHMAAADScQB+
AI54eHNxAH4AfXNxAH4AJAAAAAJ3BAAAAApzcQB+AGEAAAAFAAAAAHNxAH4AJAAAAAF3BAAAAAFz
cQB+AGVxAH4AbHNxAH4AUnEAfgBWdAAIbWVzc2FnZTNzcQB+AG9xAH4Acnhwc3EAfgBzAAAA0nEA
-fgBWc3EAfgBhAAAABQAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBlcQB+AGxzcQB+AFJxAH4AVnQA
+fgBWc3EAfgBhAAAABv////9zcQB+ACQAAAABdwQAAAABc3EAfgBlcQB+AGxzcQB+AFJxAH4AVnQA
CG1lc3NhZ2Uzc3EAfgBvcQB+AKp4cHNxAH4AcwAAANJxAH4AVnh4dAANSGVsbG8gV29ybGQgMXBx
AH4Ax3EAfgA+c3EAfgA5AAAAAAAbAAAAAHNxAH4AJAAAAAF3BAAAAAFzcQB+AEAAAAAAABwAAAAA
cQB+AElxAH4BC3hzcQB+AMJ1cQB+AMUAAAABcQB+ALxxAH4Ax3EAfgApeHNxAH4AwnVxAH4AxQAA
@@ -440,7 +440,7 @@
AAF1cQB+AE0AAAAAcQB+AVdxAH4BcnEAfgFLcQB+ADdxAH4BGnEAfgE+cQB+ASx4cQB+ALBxAH4A
KXhxAH4AsHEAfgAxeHNxAH4AJAAAAAF3BAAAAAFxAH4AN3hxAH4BMHNxAH4AJAAAAAR3BAAAAARx
AH4BC3EAfgEecQB+AUJxAH4BMHhxAH4AuHEAfgAic3EAfgAMP0AAAAAAAAx3CAAAABAAAAADcQB+
-ANlxAH4BTXEAfgC4cQB+AClxAH4A8nEAfgFeeHNyACZvcmcuZHJvb2xzLnNwaS5DbGFzc09iamVj
+ALhxAH4AKXEAfgDycQB+AV5xAH4A2XEAfgFNeHNyACZvcmcuZHJvb2xzLnNwaS5DbGFzc09iamVj
dFR5cGVSZXNvbHZlcgKE2PxwsbDrAgABTAAKb2JqZWN0VHlwZXQAQ0xvcmcvZHJvb2xzL3NwaS9D
bGFzc09iamVjdFR5cGVSZXNvbHZlciRNb2RpZmllYWJsZUNsYXNzT2JqZWN0VHlwZTt4cHNyAEFv
cmcuZHJvb2xzLnNwaS5DbGFzc09iamVjdFR5cGVSZXNvbHZlciRNb2RpZmllYWJsZUNsYXNzT2Jq
@@ -448,12 +448,12 @@
QnVpbGRlchgdWfuPyAPwAgAJSQAXY3VycmVudE9mZnNldEFkanVzdG1lbnRJAAJpZEwADWF0dGFj
aGVkTm9kZXNxAH4AD0wADGRlY2xhcmF0aW9uc3EAfgAPTAAMb2JqZWN0U291cmNlcQB+ADZMAApv
YmplY3RUeXBlcQB+AA9MAAhyZXNvbHZlcnEAfgAeTAAFcnVsZXNxAH4AD0wAC3R1cGxlU291cmNl
-cQB+ADx4cAAAAAAAAAApc3EAfgAMP0AAAAAAADB3CAAAAEAAAAAccQB+AWtxAH4Ba3EAfgA+cQB+
-AD5xAH4BOXEAfgE5cQB+AT5xAH4BPnEAfgFNcQB+AU1xAH4BFXEAfgEVcQB+ARpxAH4BGnEAfgEX
-cQB+ARdxAH4BcnEAfgFycQB+AQtxAH4BC3EAfgFXcQB+AVdxAH4AKXEAfgApcQB+ASlxAH4BKXEA
-fgFZcQB+AVlxAH4AN3EAfgA3cQB+ATBxAH4BMHEAfgFjcQB+AWNxAH4BLHEAfgEscQB+ASdxAH4B
-J3EAfgFLcQB+AUtxAH4BQnEAfgFCcQB+AVxxAH4BXHEAfgFecQB+AV5xAH4BO3EAfgE7cQB+AMdx
-AH4Ax3EAfgFVcQB+AVVxAH4BUnEAfgFScQB+AR5xAH4BHnhzcQB+AAw/QAAAAAAADHcIAAAAEAAA
+cQB+ADx4cAAAAAAAAAApc3EAfgAMP0AAAAAAADB3CAAAAEAAAAAccQB+ATtxAH4BO3EAfgE+cQB+
+AT5xAH4AN3EAfgA3cQB+AV5xAH4BXnEAfgEncQB+ASdxAH4BOXEAfgE5cQB+AWNxAH4BY3EAfgEe
+cQB+AR5xAH4BV3EAfgFXcQB+AUtxAH4BS3EAfgFrcQB+AWtxAH4BF3EAfgEXcQB+AVVxAH4BVXEA
+fgFScQB+AVJxAH4BFXEAfgEVcQB+ARpxAH4BGnEAfgELcQB+AQtxAH4BLHEAfgEscQB+AXJxAH4B
+cnEAfgFCcQB+AUJxAH4BTXEAfgFNcQB+AD5xAH4APnEAfgFZcQB+AVlxAH4BXHEAfgFccQB+ATBx
+AH4BMHEAfgApcQB+AClxAH4BKXEAfgEpcQB+AMdxAH4Ax3hzcQB+AAw/QAAAAAAADHcIAAAAEAAA
AAFxAH4AWHEAfgBReHEAfgApc3IAF2phdmEudXRpbC5MaW5rZWRIYXNoTWFwNMBOXBBswPsCAAFa
AAthY2Nlc3NPcmRlcnhxAH4ADD9AAAAAAAAMdwgAAAAQAAAAA3EAfgB0c3IAEWphdmEubGFuZy5J
bnRlZ2VyEuKgpPeBhzgCAAFJAAV2YWx1ZXhyABBqYXZhLmxhbmcuTnVtYmVyhqyVHQuU4IsCAAB4
Modified: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/ThreeColumnsWithConstraints
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/ThreeColumnsWithConstraints 2006-06-25 17:26:27 UTC (rev 4816)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/ThreeColumnsWithConstraints 2006-06-26 00:59:51 UTC (rev 4817)
@@ -483,7 +483,7 @@
CkqOh7JiWwIAA0wADmpvaW5Ob2RlQmluZGVydAAiTG9yZy9kcm9vbHMvY29tbW9uL0JldGFOb2Rl
QmluZGVyO0wACWxlZnRJbnB1dHQAH0xvcmcvZHJvb2xzL3JldGVvby9UdXBsZVNvdXJjZTtMAApy
aWdodElucHV0dAAgTG9yZy9kcm9vbHMvcmV0ZW9vL09iamVjdFNvdXJjZTt4cgAdb3JnLmRyb29s
-cy5yZXRlb28uVHVwbGVTb3VyY2XZ3jq45ZqOkQIAAUwACnR1cGxlU2lua3NxAH4AK3hxAH4AIQAA
+cy5yZXRlb28uVHVwbGVTb3VyY2WfIRfrqmKjkAIAAUwACnR1cGxlU2lua3NxAH4AK3hxAH4AIQAA
AAAABgAAAABzcQB+ACQAAAABdwQAAAABc3IAHm9yZy5kcm9vbHMucmV0ZW9vLlRlcm1pbmFsTm9k
ZcYXzi9fFurXAgACTAAEcnVsZXQAFkxvcmcvZHJvb2xzL3J1bGUvUnVsZTtMAAt0dXBsZVNvdXJj
ZXEAfgAzeHEAfgAhAAAAAAAHAAAAAHNyABRvcmcuZHJvb2xzLnJ1bGUuUnVsZW5erL76s3NqAgAO
@@ -574,8 +574,8 @@
j8gD8AIACUkAF2N1cnJlbnRPZmZzZXRBZGp1c3RtZW50SQACaWRMAA1hdHRhY2hlZE5vZGVzcQB+
AA9MAAxkZWNsYXJhdGlvbnNxAH4AD0wADG9iamVjdFNvdXJjZXEAfgA0TAAKb2JqZWN0VHlwZXEA
fgAPTAAIcmVzb2x2ZXJxAH4AHkwABXJ1bGVzcQB+AA9MAAt0dXBsZVNvdXJjZXEAfgAzeHAAAAAA
-AAAACXNxAH4ADD9AAAAAAAAMdwgAAAAQAAAABnEAfgApcQB+AClxAH4AznEAfgDOcQB+ANRxAH4A
-1HEAfgDWcQB+ANZxAH4AmXEAfgCZcQB+ADZxAH4ANnhzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAVx
+AAAACXNxAH4ADD9AAAAAAAAMdwgAAAAQAAAABnEAfgApcQB+AClxAH4AmXEAfgCZcQB+AM5xAH4A
+znEAfgDUcQB+ANRxAH4A1nEAfgDWcQB+ADZxAH4ANnhzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAVx
AH4Ao3EAfgCgcQB+AKdxAH4ApHEAfgCrcQB+AKhxAH4Ar3EAfgCscQB+ALNxAH4AsHhxAH4A1nNy
ABdqYXZhLnV0aWwuTGlua2VkSGFzaE1hcDTATlwQbMD7AgABWgALYWNjZXNzT3JkZXJ4cQB+AAw/
QAAAAAAADHcIAAAAEAAAAAFxAH4AsnNyABFqYXZhLmxhbmcuSW50ZWdlchLioKT3gYc4AgABSQAF
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java 2006-06-25 17:26:27 UTC (rev 4816)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleSource.java 2006-06-26 00:59:51 UTC (rev 4817)
@@ -159,6 +159,29 @@
}
}
+ /**
+ * Propagates a new tuple adding the given fact handle to the tuple
+ * before propagating.
+ *
+ * @param tuple The base tuple for propagation
+ * @param handle The handle to add to the tuple when propagating
+ * @param context
+ * @param workingMemory
+ */
+ protected void propagateAssertTuple(final ReteTuple tuple,
+ final DefaultFactHandle handle,
+ final PropagationContext context,
+ final ReteooWorkingMemory workingMemory) {
+ for ( int i = 0, size = getTupleSinks().size(); i < size; i++ ) {
+ final ReteTuple child = new ReteTuple( tuple, handle );
+ // no TupleMatch so instead add as a linked tuple
+ tuple.addLinkedTuple( new LinkedListObjectWrapper( child ) );
+ ((TupleSink) getTupleSinks().get( i )).assertTuple( child,
+ context,
+ workingMemory );
+ }
+ }
+
protected void propagateRetractTuple(final TupleMatch tupleMatch,
final PropagationContext context,
final ReteooWorkingMemory workingMemory) {
|