[jboss-svn-commits] JBL Code SVN: r5498 - in labs/jbossrules/trunk: drools-compiler/src/test/java/org/drools/reteoo drools-compiler/src/test/resources/org/drools/reteoo drools-core/src/main/java/org/drools/rule
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Aug 5 17:46:33 EDT 2006
Author: tirelli
Date: 2006-08-05 17:46:20 -0400 (Sat, 05 Aug 2006)
New Revision: 5498
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderTest.java
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/rule/VariableConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableRestriction.java
Log:
* JBRULES-389
* Removing cache to avoid problems with out-of-date cache value
* Updating testcases
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderTest.java 2006-08-05 16:15:48 UTC (rev 5497)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/reteoo/ReteooBuilderTest.java 2006-08-05 21:46:20 UTC (rev 5498)
@@ -1,9 +1,6 @@
package org.drools.reteoo;
-import java.io.BufferedReader;
import java.io.BufferedWriter;
-import java.io.FileInputStream;
-import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStreamReader;
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-08-05 16:15:48 UTC (rev 5497)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrs 2006-08-05 21:46:20 UTC (rev 5498)
@@ -302,7 +302,7 @@
</org.drools.rule.Package>
</entry>
</map>
- <byte-array>rO0ABXQAJGU4NmYwMWMzLWNiNjgtNDE2Mi1iMmYwLTNhMjE0YTg3OGI3NnNyAClvcmcuZHJvb2xz
+ <byte-array>rO0ABXQAJDgzN2NiM2M0LTMyMmUtNGI0Yi1hODBjLTBhNjFmNmMwZTEzZHNyAClvcmcuZHJvb2xz
LnJldGVvby5SZXRlb29GYWN0SGFuZGxlRmFjdG9yeQAAAAAAAAEsAgAAeHIAK29yZy5kcm9vbHMu
Y29tbW9uLkFic3RyYWN0RmFjdEhhbmRsZUZhY3RvcnlrwcaUre4SdAIAA0oAB2NvdW50ZXJKAAJp
ZEwADmZhY3RIYW5kbGVQb29sdAAkTG9yZy9kcm9vbHMvdXRpbC9QcmltaXRpdmVMb25nU3RhY2s7
@@ -485,10 +485,10 @@
dWlsZGVyGB1Z+4/IA/ACAAlJABdjdXJyZW50T2Zmc2V0QWRqdXN0bWVudEkAAmlkTAANYXR0YWNo
ZWROb2Rlc3EAfgAQTAAMZGVjbGFyYXRpb25zcQB+ABBMAAxvYmplY3RTb3VyY2VxAH4AN0wACm9i
amVjdFR5cGVxAH4AEEwACHJlc29sdmVycQB+AB9MAAVydWxlc3EAfgAQTAALdHVwbGVTb3VyY2Vx
-AH4AQXhwAAAAAAAAABtzcQB+AA0/QAAAAAAAGHcIAAAAIAAAABJxAH4BGHEAfgEYcQB+ARVxAH4B
-FXEAfgEJcQB+AQlxAH4BDHEAfgEMcQB+ADhxAH4AOHEAfgA9cQB+AD1xAH4BB3EAfgEHcQB+AEJx
-AH4AQnEAfgEjcQB+ASNxAH4A/XEAfgD9cQB+ACpxAH4AKnEAfgBEcQB+AERxAH4BE3EAfgETcQB+
-ASlxAH4BKXEAfgEAcQB+AQBxAH4ARnEAfgBGcQB+ALhxAH4AuHEAfgD7cQB+APt4c3EAfgANP0AA
+AH4AQXhwAAAAAAAAABtzcQB+AA0/QAAAAAAAGHcIAAAAIAAAABJxAH4ARnEAfgBGcQB+ASNxAH4B
+I3EAfgETcQB+ARNxAH4BFXEAfgEVcQB+AQlxAH4BCXEAfgEMcQB+AQxxAH4AQnEAfgBCcQB+AERx
+AH4ARHEAfgD7cQB+APtxAH4BGHEAfgEYcQB+AP1xAH4A/XEAfgAqcQB+ACpxAH4BKXEAfgEpcQB+
+ALhxAH4AuHEAfgA4cQB+ADhxAH4APXEAfgA9cQB+AQdxAH4BB3EAfgEAcQB+AQB4c3EAfgANP0AA
AAAAAAx3CAAAABAAAAAAeHEAfgETc3IAF2phdmEudXRpbC5MaW5rZWRIYXNoTWFwNMBOXBBswPsC
AAFaAAthY2Nlc3NPcmRlcnhxAH4ADT9AAAAAAAAMdwgAAAAQAAAAAXEAfgDJc3IAEWphdmEubGFu
Zy5JbnRlZ2VyEuKgpPeBhzgCAAFJAAV2YWx1ZXhyABBqYXZhLmxhbmcuTnVtYmVyhqyVHQuU4IsC
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-08-05 16:15:48 UTC (rev 5497)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrsPerson 2006-08-05 21:46:20 UTC (rev 5498)
@@ -169,9 +169,9 @@
FgAAAAF3BAAAAAFzcgAib3JnLmRyb29scy5ydWxlLlZhcmlhYmxlQ29uc3RyYWludAAAAAAAAAFA
AgACTAAOZmllbGRFeHRyYWN0b3JxAH4AIEwAC3Jlc3RyaWN0aW9udAAlTG9yZy9kcm9vbHMvcnVs
ZS9WYXJpYWJsZVJlc3RyaWN0aW9uO3hwcQB+AMRzcgAjb3JnLmRyb29scy5ydWxlLlZhcmlhYmxl
-UmVzdHJpY3Rpb24AAAAAAAABQAIABEkABmNvbHVtbkwAC2RlY2xhcmF0aW9ucQB+ABtMAAlldmFs
-dWF0b3JxAH4AKlsAFHJlcXVpcmVkRGVjbGFyYXRpb25zcQB+AAZ4cAAAAABxAH4AiHEAfgAxdXEA
-fgAOAAAAAXEAfgCIeHBzcQB+AEFxAH4AyHEAfgBDeHh0AA1IZWxsbyBXb3JsZCAycHg=</byte-array>
+UmVzdHJpY3Rpb24AAAAAAAABQAIAA0wAC2RlY2xhcmF0aW9ucQB+ABtMAAlldmFsdWF0b3JxAH4A
+KlsAFHJlcXVpcmVkRGVjbGFyYXRpb25zcQB+AAZ4cHEAfgCIcQB+ADF1cQB+AA4AAAABcQB+AIh4
+cHNxAH4AQXEAfgDIcQB+AEN4eHQADUhlbGxvIFdvcmxkIDJweA==</byte-array>
</org.drools.rule.PackageCompilationData>
<string>org.drools.reteoo</string>
<list>
@@ -261,13 +261,13 @@
AAAI/////nNxAH4AFwAAAAF3BAAAAAFzcgAib3JnLmRyb29scy5ydWxlLlZhcmlhYmxlQ29uc3Ry
YWludAAAAAAAAAFAAgACTAAOZmllbGRFeHRyYWN0b3JxAH4AIUwAC3Jlc3RyaWN0aW9udAAlTG9y
Zy9kcm9vbHMvcnVsZS9WYXJpYWJsZVJlc3RyaWN0aW9uO3hwcQB+AMRzcgAjb3JnLmRyb29scy5y
-dWxlLlZhcmlhYmxlUmVzdHJpY3Rpb24AAAAAAAABQAIABEkABmNvbHVtbkwAC2RlY2xhcmF0aW9u
-cQB+ABxMAAlldmFsdWF0b3JxAH4AK1sAFHJlcXVpcmVkRGVjbGFyYXRpb25zcQB+AAd4cAAAAABx
-AH4AiHEAfgAydXEAfgAPAAAAAXEAfgCIeHBzcQB+AEJxAH4AyHEAfgBEeHhxAH4AgXB4AA==</byte-array>
+dWxlLlZhcmlhYmxlUmVzdHJpY3Rpb24AAAAAAAABQAIAA0wAC2RlY2xhcmF0aW9ucQB+ABxMAAll
+dmFsdWF0b3JxAH4AK1sAFHJlcXVpcmVkRGVjbGFyYXRpb25zcQB+AAd4cHEAfgCIcQB+ADJ1cQB+
+AA8AAAABcQB+AIh4cHNxAH4AQnEAfgDIcQB+AER4eHEAfgCBcHgA</byte-array>
</org.drools.rule.Package>
</entry>
</map>
- <byte-array>rO0ABXQAJDlkMTRkMGMzLTVlNTUtNGVjYS04NTQ0LTBjNWI5MzFkYzRlMnNyAClvcmcuZHJvb2xz
+ <byte-array>rO0ABXQAJGE0OTY2ODBlLTRkN2MtNDZhYy05MDFlLTJiNjE0MjBkNTg5MXNyAClvcmcuZHJvb2xz
LnJldGVvby5SZXRlb29GYWN0SGFuZGxlRmFjdG9yeQAAAAAAAAEsAgAAeHIAK29yZy5kcm9vbHMu
Y29tbW9uLkFic3RyYWN0RmFjdEhhbmRsZUZhY3RvcnlrwcaUre4SdAIAA0oAB2NvdW50ZXJKAAJp
ZEwADmZhY3RIYW5kbGVQb29sdAAkTG9yZy9kcm9vbHMvdXRpbC9QcmltaXRpdmVMb25nU3RhY2s7
@@ -408,89 +408,88 @@
/////nNxAH4AJQAAAAF3BAAAAAFzcgAib3JnLmRyb29scy5ydWxlLlZhcmlhYmxlQ29uc3RyYWlu
dAAAAAAAAAFAAgACTAAOZmllbGRFeHRyYWN0b3JxAH4AZ0wAC3Jlc3RyaWN0aW9udAAlTG9yZy9k
cm9vbHMvcnVsZS9WYXJpYWJsZVJlc3RyaWN0aW9uO3hwcQB+AMZzcgAjb3JnLmRyb29scy5ydWxl
-LlZhcmlhYmxlUmVzdHJpY3Rpb24AAAAAAAABQAIABEkABmNvbHVtbkwAC2RlY2xhcmF0aW9ucQB+
-AGNMAAlldmFsdWF0b3JxAH4Aa1sAFHJlcXVpcmVkRGVjbGFyYXRpb25zcQB+AEd4cAAAAABxAH4A
-UnEAfgBydXEAfgBOAAAAAXEAfgBSeHBzcQB+AIJxAH4AynEAfgCEeHh0AA1IZWxsbyBXb3JsZCAy
-cHEAfgA/eHNyACBvcmcuZHJvb2xzLmNvbW1vbi5CZXRhTm9kZUJpbmRlctk6TZBB8FqzAgABWwAL
-Y29uc3RyYWludHN0ACFbTG9yZy9kcm9vbHMvc3BpL0ZpZWxkQ29uc3RyYWludDt4cHVyACFbTG9y
-Zy5kcm9vbHMuc3BpLkZpZWxkQ29uc3RyYWludDua9pf2tEoPxgIAAHhwAAAAAHNxAH4AOgAAAAAA
-CQAAAAJzcQB+ACUAAAADdwQAAAAEc3EAfgBBAAAAAAAKAAAAAHNxAH4ARAAAAAAAAAAAAQAAAAAA
-AXBxAH4AS3NyADhvcmcuZHJvb2xzLnJldGVvby5SdWxlX0hlbGxvX1dvcmxkXzFfMENvbnNlcXVl
-bmNlSW52b2tlcm5erL76s3NqAgAAeHB1cQB+AE4AAAAAc3EAfgANP0AAAAAAAAx3CAAAABAAAAAA
-eHBzcQB+AFtzcQB+ACUAAAADdwQAAAAKc3EAfgBbc3EAfgAlAAAAAncEAAAACnNxAH4AYgAAAAAA
-AAAAc3EAfgAlAAAAAXcEAAAAAXNxAH4AZnEAfgBVc3EAfgBqcQB+AHJzcQB+AH5xAH4AgXhwc3EA
-fgCCcQB+AFdxAH4AhHNxAH4AYgAAAAEAAAAAc3EAfgAlAAAAAXcEAAAAAXNxAH4AZnEAfgCNc3EA
-fgBqcQB+AHJzcQB+AH5xAH4AkXhwc3EAfgCCcQB+AFdxAH4AhHhzcQB+AJNzcQB+ACUAAAACdwQA
-AAAKc3EAfgBiAAAAAgAAAABzcQB+ACUAAAABdwQAAAABc3EAfgBmcQB+AI1zcQB+AGpxAH4AcnNx
-AH4AfnEAfgCBeHBzcQB+AIJxAH4AV3EAfgCEc3EAfgBbc3EAfgAlAAAAAncEAAAACnNxAH4AYgAA
-AAMAAAAAc3EAfgAlAAAAAXcEAAAAAXNxAH4AZnEAfgChc3EAfgBqcQB+AHJzcQB+AH5xAH4Ap3hw
-c3EAfgCCcQB+AKNxAH4AhHNxAH4AYgAAAAQAAAAAc3EAfgAlAAAAAXcEAAAAAXNxAH4AZnEAfgCh
-c3EAfgBqcQB+AHJzcQB+AH5xAH4Arnhwc3EAfgCCcQB+AKNxAH4AhHh4c3EAfgCTc3EAfgAlAAAA
-AncEAAAACnNxAH4AYgAAAAUAAAAAc3EAfgAlAAAAAXcEAAAAAXNxAH4AZnEAfgC1c3EAfgBqcQB+
-AHJzcQB+AH5xAH4AgXhwc3EAfgCCcQB+AFdxAH4AhHNxAH4AYgAAAAb/////c3EAfgAlAAAAAXcE
-AAAAAXNxAH4AZnEAfgC1c3EAfgBqcQB+AHJzcQB+AH5xAH4Av3hwc3EAfgCCcQB+AFdxAH4AhHh4
-dAANSGVsbG8gV29ybGQgMXBxAH4A3nEAfgA/c3EAfgA6AAAAAAAbAAAAAHNxAH4AJQAAAAF3BAAA
-AAFzcQB+AEEAAAAAABwAAAAAcQB+AEpxAH4BG3hzcQB+ANl1cQB+ANwAAAABcQB+ANNxAH4A3nEA
-fgAqeHNxAH4A2XVxAH4A3AAAAAFzcgAtb3JnLmRyb29scy5jb21tb24uSW5zdGFuY2VOb3RFcXVh
-bHNDb25zdHJhaW50u86LzZRlbJsCAAJJAAtvdGhlckNvbHVtblsADGRlY2xhcmF0aW9uc3EAfgBH
-eHAAAAACdXEAfgBOAAAAAHNxAH4AOgAAAAAABwAAAAVzcQB+ACUAAAACdwQAAAACcQB+AN5zcQB+
-ADoAAAAAAAwAAAACc3EAfgAlAAAAA3cEAAAABHNxAH4AQQAAAAAADQAAAABxAH4A4XEAfgEnc3EA
-fgA6AAAAAAAdAAAAAHNxAH4AJQAAAAF3BAAAAAFzcQB+AEEAAAAAAB4AAAAAcQB+AEpxAH4BKnhz
-cQB+ANlxAH4A3XEAfgEncQB+ADhzcQB+ADoAAAAAAB8AAAAAc3EAfgAlAAAAAXcEAAAAAXNxAH4A
-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
-fgFOcQB+ATx4cQB+AMVxAH4AKnhxAH4AxXEAfgAyeHNxAH4AJQAAAAF3BAAAAAFxAH4AOHhxAH4B
-QHNxAH4AJQAAAAR3BAAAAARxAH4BG3EAfgEucQB+AVJxAH4BQHhxAH4AznEAfgAjc3EAfgANP0AA
-AAAAAAx3CAAAABAAAAADcQB+AQVxAH4BbnEAfgDOcQB+ACpxAH4A73EAfgFdeHNyACZvcmcuZHJv
-b2xzLnNwaS5DbGFzc09iamVjdFR5cGVSZXNvbHZlcgKE2PxwsbDrAgABTAAKb2JqZWN0VHlwZXQA
-Q0xvcmcvZHJvb2xzL3NwaS9DbGFzc09iamVjdFR5cGVSZXNvbHZlciRNb2RpZmllYWJsZUNsYXNz
-T2JqZWN0VHlwZTt4cHNyAEFvcmcuZHJvb2xzLnNwaS5DbGFzc09iamVjdFR5cGVSZXNvbHZlciRN
-b2RpZmllYWJsZUNsYXNzT2JqZWN0VHlwZUSlq5QCN/s1AgAAeHEAfgCCcHNxAH4AdnBwdAAEbnVs
-bHNyAB9vcmcuZHJvb2xzLnJldGVvby5SZXRlb29CdWlsZGVyGB1Z+4/IA/ACAAlJABdjdXJyZW50
-T2Zmc2V0QWRqdXN0bWVudEkAAmlkTAANYXR0YWNoZWROb2Rlc3EAfgAQTAAMZGVjbGFyYXRpb25z
-cQB+ABBMAAxvYmplY3RTb3VyY2VxAH4AN0wACm9iamVjdFR5cGVxAH4AEEwACHJlc29sdmVycQB+
-AB9MAAVydWxlc3EAfgAQTAALdHVwbGVTb3VyY2VxAH4APXhwAAAAAAAAAClzcQB+AA0/QAAAAAAA
-MHcIAAAAQAAAABxxAH4BLnEAfgEucQB+AD9xAH4AP3EAfgFscQB+AWxxAH4BZ3EAfgFncQB+AWlx
-AH4BaXEAfgFScQB+AVJxAH4BOXEAfgE5cQB+AUtxAH4BS3EAfgE3cQB+ATdxAH4BbnEAfgFucQB+
-ASpxAH4BKnEAfgDecQB+AN5xAH4Bc3EAfgFzcQB+ACpxAH4AKnEAfgFJcQB+AUlxAH4BJ3EAfgEn
-cQB+AUBxAH4BQHEAfgFlcQB+AWVxAH4BYnEAfgFicQB+ATxxAH4BPHEAfgF7cQB+AXtxAH4BXXEA
-fgFdcQB+ASVxAH4BJXEAfgA4cQB+ADhxAH4BG3EAfgEbcQB+AU5xAH4BTnEAfgGAcQB+AYBxAH4B
-W3EAfgFbeHNxAH4ADT9AAAAAAAAMdwgAAAAQAAAAAXEAfgBZcQB+AFJ4cQB+ACpzcgAXamF2YS51
-dGlsLkxpbmtlZEhhc2hNYXA0wE5cEGzA+wIAAVoAC2FjY2Vzc09yZGVyeHEAfgANP0AAAAAAAAx3
-CAAAABAAAAADcQB+AINzcgARamF2YS5sYW5nLkludGVnZXIS4qCk94GHOAIAAUkABXZhbHVleHIA
-EGphdmEubGFuZy5OdW1iZXKGrJUdC5TgiwIAAHhwAAAABXEAfgCoc3EAfgGeAAAABHEAfgDXc3EA
-fgGeAAAABngAcQB+AZNzcQB+AA0/QAAAAAAADHcIAAAAEAAAAAJxAH4A4XVyAB1bTG9yZy5kcm9v
-bHMucmV0ZW9vLkJhc2VOb2RlOwvnyZNDnLPqAgAAeHAAAAAEcQB+AOBxAH4BKXEAfgFNcQB+ATtx
-AH4ASnVxAH4BpAAAAAhxAH4AQ3EAfgEdcQB+ASxxAH4BMHEAfgFQcQB+AVRxAH4BPnEAfgFCeHEA
-fgFA</byte-array>
+LlZhcmlhYmxlUmVzdHJpY3Rpb24AAAAAAAABQAIAA0wAC2RlY2xhcmF0aW9ucQB+AGNMAAlldmFs
+dWF0b3JxAH4Aa1sAFHJlcXVpcmVkRGVjbGFyYXRpb25zcQB+AEd4cHEAfgBScQB+AHJ1cQB+AE4A
+AAABcQB+AFJ4cHNxAH4AgnEAfgDKcQB+AIR4eHQADUhlbGxvIFdvcmxkIDJwcQB+AD94c3IAIG9y
+Zy5kcm9vbHMuY29tbW9uLkJldGFOb2RlQmluZGVy2TpNkEHwWrMCAAFbAAtjb25zdHJhaW50c3QA
+IVtMb3JnL2Ryb29scy9zcGkvRmllbGRDb25zdHJhaW50O3hwdXIAIVtMb3JnLmRyb29scy5zcGku
+RmllbGRDb25zdHJhaW50O5r2l/a0Sg/GAgAAeHAAAAAAc3EAfgA6AAAAAAAJAAAAAnNxAH4AJQAA
+AAN3BAAAAARzcQB+AEEAAAAAAAoAAAAAc3EAfgBEAAAAAAAAAAABAAAAAAABcHEAfgBLc3IAOG9y
+Zy5kcm9vbHMucmV0ZW9vLlJ1bGVfSGVsbG9fV29ybGRfMV8wQ29uc2VxdWVuY2VJbnZva2Vybl6s
+vvqzc2oCAAB4cHVxAH4ATgAAAABzcQB+AA0/QAAAAAAADHcIAAAAEAAAAAB4cHNxAH4AW3NxAH4A
+JQAAAAN3BAAAAApzcQB+AFtzcQB+ACUAAAACdwQAAAAKc3EAfgBiAAAAAAAAAABzcQB+ACUAAAAB
+dwQAAAABc3EAfgBmcQB+AFVzcQB+AGpxAH4AcnNxAH4AfnEAfgCBeHBzcQB+AIJxAH4AV3EAfgCE
+c3EAfgBiAAAAAQAAAABzcQB+ACUAAAABdwQAAAABc3EAfgBmcQB+AI1zcQB+AGpxAH4AcnNxAH4A
+fnEAfgCReHBzcQB+AIJxAH4AV3EAfgCEeHNxAH4Ak3NxAH4AJQAAAAJ3BAAAAApzcQB+AGIAAAAC
+AAAAAHNxAH4AJQAAAAF3BAAAAAFzcQB+AGZxAH4AjXNxAH4AanEAfgByc3EAfgB+cQB+AIF4cHNx
+AH4AgnEAfgBXcQB+AIRzcQB+AFtzcQB+ACUAAAACdwQAAAAKc3EAfgBiAAAAAwAAAABzcQB+ACUA
+AAABdwQAAAABc3EAfgBmcQB+AKFzcQB+AGpxAH4AcnNxAH4AfnEAfgCneHBzcQB+AIJxAH4Ao3EA
+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
+T2JqZWN0VHlwZVJlc29sdmVyAoTY/HCxsOsCAAFMAApvYmplY3RUeXBldABDTG9yZy9kcm9vbHMv
+c3BpL0NsYXNzT2JqZWN0VHlwZVJlc29sdmVyJE1vZGlmaWVhYmxlQ2xhc3NPYmplY3RUeXBlO3hw
+c3IAQW9yZy5kcm9vbHMuc3BpLkNsYXNzT2JqZWN0VHlwZVJlc29sdmVyJE1vZGlmaWVhYmxlQ2xh
+c3NPYmplY3RUeXBlRKWrlAI3+zUCAAB4cQB+AIJwc3EAfgB2cHB0AARudWxsc3IAH29yZy5kcm9v
+bHMucmV0ZW9vLlJldGVvb0J1aWxkZXIYHVn7j8gD8AIACUkAF2N1cnJlbnRPZmZzZXRBZGp1c3Rt
+ZW50SQACaWRMAA1hdHRhY2hlZE5vZGVzcQB+ABBMAAxkZWNsYXJhdGlvbnNxAH4AEEwADG9iamVj
+dFNvdXJjZXEAfgA3TAAKb2JqZWN0VHlwZXEAfgAQTAAIcmVzb2x2ZXJxAH4AH0wABXJ1bGVzcQB+
+ABBMAAt0dXBsZVNvdXJjZXEAfgA9eHAAAAAAAAAAKXNxAH4ADT9AAAAAAAAwdwgAAABAAAAAHHEA
+fgDecQB+AN5xAH4BJ3EAfgEncQB+ADhxAH4AOHEAfgE8cQB+ATxxAH4BQHEAfgFAcQB+AYBxAH4B
+gHEAfgFzcQB+AXNxAH4BZXEAfgFlcQB+AWJxAH4BYnEAfgFJcQB+AUlxAH4BG3EAfgEbcQB+AWlx
+AH4BaXEAfgEqcQB+ASpxAH4AKnEAfgAqcQB+AW5xAH4BbnEAfgF7cQB+AXtxAH4BS3EAfgFLcQB+
+ATdxAH4BN3EAfgFncQB+AWdxAH4BUnEAfgFScQB+AVtxAH4BW3EAfgElcQB+ASVxAH4BLnEAfgEu
+cQB+AU5xAH4BTnEAfgFdcQB+AV1xAH4BOXEAfgE5cQB+AD9xAH4AP3EAfgFscQB+AWx4c3EAfgAN
+P0AAAAAAAAx3CAAAABAAAAABcQB+AFlxAH4AUnhxAH4AKnNyABdqYXZhLnV0aWwuTGlua2VkSGFz
+aE1hcDTATlwQbMD7AgABWgALYWNjZXNzT3JkZXJ4cQB+AA0/QAAAAAAADHcIAAAAEAAAAANxAH4A
+g3NyABFqYXZhLmxhbmcuSW50ZWdlchLioKT3gYc4AgABSQAFdmFsdWV4cgAQamF2YS5sYW5nLk51
+bWJlcoaslR0LlOCLAgAAeHAAAAAFcQB+AKhzcQB+AZ4AAAAEcQB+ANdzcQB+AZ4AAAAGeABxAH4B
+k3NxAH4ADT9AAAAAAAAMdwgAAAAQAAAAAnEAfgDhdXIAHVtMb3JnLmRyb29scy5yZXRlb28uQmFz
+ZU5vZGU7C+fJk0Ocs+oCAAB4cAAAAARxAH4A4HEAfgEpcQB+AU1xAH4BO3EAfgBKdXEAfgGkAAAA
+CHEAfgBDcQB+AR1xAH4BLHEAfgEwcQB+AVBxAH4BVHEAfgE+cQB+AUJ4cQB+AUA=</byte-array>
</org.drools.reteoo.ReteooRuleBase>
\ No newline at end of file
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-08-05 16:15:48 UTC (rev 5497)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/ThreeColumnsWithConstraints 2006-08-05 21:46:20 UTC (rev 5498)
@@ -323,26 +323,26 @@
c3EAfgBLAAAAA3cEAAAABHNyACJvcmcuZHJvb2xzLnJ1bGUuVmFyaWFibGVDb25zdHJhaW50AAAA
AAAAAUACAAJMAA5maWVsZEV4dHJhY3RvcnEAfgBRTAALcmVzdHJpY3Rpb250ACVMb3JnL2Ryb29s
cy9ydWxlL1ZhcmlhYmxlUmVzdHJpY3Rpb247eHBxAH4APnNyACNvcmcuZHJvb2xzLnJ1bGUuVmFy
-aWFibGVSZXN0cmljdGlvbgAAAAAAAAFAAgAESQAGY29sdW1uTAALZGVjbGFyYXRpb25xAH4ABEwA
-CWV2YWx1YXRvcnEAfgBVWwAUcmVxdWlyZWREZWNsYXJhdGlvbnNxAH4ABnhwAAAAAHEAfgA9cQB+
-AFt1cQB+ABUAAAABcQB+AD1xAH4AC3EAfgAHeHEAfgAtcQB+ADNzcQB+AE0AAAACAAAAAHNxAH4A
-SwAAAAF3BAAAAAFzcQB+AGtzcQB+AAx2cgARb3JnLmRyb29scy5QZXJzb24kpC8CF5+4ZgIACUkA
-A2FnZVoABWFsaXZlQwADc2V4TAAKYmlnRGVjaW1hbHQAFkxqYXZhL21hdGgvQmlnRGVjaW1hbDtM
-AApiaWdJbnRlZ2VydAAWTGphdmEvbWF0aC9CaWdJbnRlZ2VyO0wABGhhaXJxAH4ACkwABWxpa2Vz
-cQB+AApMAARuYW1lcQB+AApMAAZzdGF0dXNxAH4ACnhwdAAEbmFtZXNxAH4AbgAAAABxAH4APXEA
-fgBbdXEAfgAVAAAAAXEAfgA9eHBzcQB+ADFxAH4AeHEAfgA2eHQAIHRocmVlIGNvbHVtbnMgd2l0
-aCBjb25zdHJhaW50cyAxcHQATW9yZy5kcm9vbHMuY29tcGlsZXIuUnVsZV90aHJlZV9jb2x1bW5z
-X3dpdGhfY29uc3RyYWludHNfMl8wQ29uc2VxdWVuY2VJbnZva2Vyc3EAfgAjAAAAAAAAAAACAAAA
-AAABcHEAfgApc3IATW9yZy5kcm9vbHMuY29tcGlsZXIuUnVsZV90aHJlZV9jb2x1bW5zX3dpdGhf
-Y29uc3RyYWludHNfMl8wQ29uc2VxdWVuY2VJbnZva2Vybl6svvqzc2oCAAB4cHVxAH4AFQAAAAVx
-AH4AIHNxAH4ACAAAAAFzcQB+AC5zcQB+ADFxAH4AEHEAfgA2dAAIJGNoZWVzZTJzcQB+AAgAAAAA
-cQB+AD50AAUkdHlwZXEAfgAbc3EAfgAIAAAAAHNxAH4ALnNxAH4AMXEAfgAQcQB+ADZ0AAgkY2hl
-ZXNlMXNxAH4AAD9AAAAAAAAMdwgAAAAQAAAABXEAfgAhcQB+ACBxAH4AhnEAfgCDcQB+AIhxAH4A
-h3EAfgAccQB+ABtxAH4AjHEAfgCJeHBzcQB+AEZzcQB+AEsAAAACdwQAAAAKc3EAfgBNAAAAAAAA
-AABzcQB+AEsAAAADdwQAAAAEcQB+AIdzcQB+AFBxAH4APnNxAH4AVHEAfgBbc3EAfgBlcQB+AGhx
-AH4AIHhxAH4AiXEAfgCLc3EAfgBNAAAAAQAAAABzcQB+AEsAAAADdwQAAAAEc3EAfgBrcQB+AD5z
-cQB+AG4AAAAAcQB+AIdxAH4AW3VxAH4AFQAAAAFxAH4Ah3EAfgAbcQB+ABp4cQB+AINxAH4AhXh0
-ACB0aHJlZSBjb2x1bW5zIHdpdGggY29uc3RyYWludHMgMnB4</byte-array>
+aWFibGVSZXN0cmljdGlvbgAAAAAAAAFAAgADTAALZGVjbGFyYXRpb25xAH4ABEwACWV2YWx1YXRv
+cnEAfgBVWwAUcmVxdWlyZWREZWNsYXJhdGlvbnNxAH4ABnhwcQB+AD1xAH4AW3VxAH4AFQAAAAFx
+AH4APXEAfgALcQB+AAd4cQB+AC1xAH4AM3NxAH4ATQAAAAIAAAAAc3EAfgBLAAAAAXcEAAAAAXNx
+AH4Aa3NxAH4ADHZyABFvcmcuZHJvb2xzLlBlcnNvbiSkLwIXn7hmAgAJSQADYWdlWgAFYWxpdmVD
+AANzZXhMAApiaWdEZWNpbWFsdAAWTGphdmEvbWF0aC9CaWdEZWNpbWFsO0wACmJpZ0ludGVnZXJ0
+ABZMamF2YS9tYXRoL0JpZ0ludGVnZXI7TAAEaGFpcnEAfgAKTAAFbGlrZXNxAH4ACkwABG5hbWVx
+AH4ACkwABnN0YXR1c3EAfgAKeHB0AARuYW1lc3EAfgBucQB+AD1xAH4AW3VxAH4AFQAAAAFxAH4A
+PXhwc3EAfgAxcQB+AHhxAH4ANnh0ACB0aHJlZSBjb2x1bW5zIHdpdGggY29uc3RyYWludHMgMXB0
+AE1vcmcuZHJvb2xzLmNvbXBpbGVyLlJ1bGVfdGhyZWVfY29sdW1uc193aXRoX2NvbnN0cmFpbnRz
+XzJfMENvbnNlcXVlbmNlSW52b2tlcnNxAH4AIwAAAAAAAAAAAgAAAAAAAXBxAH4AKXNyAE1vcmcu
+ZHJvb2xzLmNvbXBpbGVyLlJ1bGVfdGhyZWVfY29sdW1uc193aXRoX2NvbnN0cmFpbnRzXzJfMENv
+bnNlcXVlbmNlSW52b2tlcm5erL76s3NqAgAAeHB1cQB+ABUAAAAFcQB+ACBzcQB+AAgAAAABc3EA
+fgAuc3EAfgAxcQB+ABBxAH4ANnQACCRjaGVlc2Uyc3EAfgAIAAAAAHEAfgA+dAAFJHR5cGVxAH4A
+G3NxAH4ACAAAAABzcQB+AC5zcQB+ADFxAH4AEHEAfgA2dAAIJGNoZWVzZTFzcQB+AAA/QAAAAAAA
+DHcIAAAAEAAAAAVxAH4AIXEAfgAgcQB+AIZxAH4Ag3EAfgCIcQB+AIdxAH4AHHEAfgAbcQB+AIxx
+AH4AiXhwc3EAfgBGc3EAfgBLAAAAAncEAAAACnNxAH4ATQAAAAAAAAAAc3EAfgBLAAAAA3cEAAAA
+BHEAfgCHc3EAfgBQcQB+AD5zcQB+AFRxAH4AW3NxAH4AZXEAfgBocQB+ACB4cQB+AIlxAH4Ai3Nx
+AH4ATQAAAAEAAAAAc3EAfgBLAAAAA3cEAAAABHNxAH4Aa3EAfgA+c3EAfgBucQB+AIdxAH4AW3Vx
+AH4AFQAAAAFxAH4Ah3EAfgAbcQB+ABp4cQB+AINxAH4AhXh0ACB0aHJlZSBjb2x1bW5zIHdpdGgg
+Y29uc3RyYWludHMgMnB4</byte-array>
</org.drools.rule.PackageCompilationData>
<string>org.drools.compiler</string>
<list>
@@ -404,36 +404,35 @@
ADsAAAADdwQAAAAEc3IAIm9yZy5kcm9vbHMucnVsZS5WYXJpYWJsZUNvbnN0cmFpbnQAAAAAAAAB
QAIAAkwADmZpZWxkRXh0cmFjdG9ycQB+AEJMAAtyZXN0cmljdGlvbnQAJUxvcmcvZHJvb2xzL3J1
bGUvVmFyaWFibGVSZXN0cmljdGlvbjt4cHEAfgAsc3IAI29yZy5kcm9vbHMucnVsZS5WYXJpYWJs
-ZVJlc3RyaWN0aW9uAAAAAAAAAUACAARJAAZjb2x1bW5MAAtkZWNsYXJhdGlvbnEAfgA+TAAJZXZh
-bHVhdG9ycQB+AEZbABRyZXF1aXJlZERlY2xhcmF0aW9uc3EAfgAHeHAAAAAAcQB+ACtxAH4ATHVx
-AH4ADwAAAAFxAH4AK3EAfgAvc3IAI29yZy5kcm9vbHMucnVsZS5QcmVkaWNhdGVDb25zdHJhaW50
-/pCPpiJbhzgCAANMAAtkZWNsYXJhdGlvbnEAfgA+TAAKZXhwcmVzc2lvbnQAJExvcmcvZHJvb2xz
-L3NwaS9QcmVkaWNhdGVFeHByZXNzaW9uO1sAFHJlcXVpcmVkRGVjbGFyYXRpb25zcQB+AAd4cHEA
-fgAvc3IATG9yZy5kcm9vbHMuY29tcGlsZXIuUnVsZV90aHJlZV9jb2x1bW5zX3dpdGhfY29uc3Ry
-YWludHNfMV8wUHJlZGljYXRlMEludm9rZXJuXqy++rNzagIAAHhwdXEAfgAPAAAAAXEAfgATeHEA
-fgAbcQB+ACFzcQB+AD0AAAACAAAAAHNxAH4AOwAAAAF3BAAAAAFzcQB+AFxzcQB+ABR2cgARb3Jn
-LmRyb29scy5QZXJzb24kpC8CF5+4ZgIACUkAA2FnZVoABWFsaXZlQwADc2V4TAAKYmlnRGVjaW1h
-bHQAFkxqYXZhL21hdGgvQmlnRGVjaW1hbDtMAApiaWdJbnRlZ2VydAAWTGphdmEvbWF0aC9CaWdJ
-bnRlZ2VyO0wABGhhaXJxAH4ABUwABWxpa2VzcQB+AAVMAARuYW1lcQB+AAVMAAZzdGF0dXNxAH4A
-BXhwdAAEbmFtZXNxAH4AXwAAAABxAH4AK3EAfgBMdXEAfgAPAAAAAXEAfgAreHBzcQB+AB9xAH4A
-b3EAfgAkeHEAfgADcHQAIHRocmVlIGNvbHVtbnMgd2l0aCBjb25zdHJhaW50cyAyc3EAfgAEAAAA
-AAAAAAACAAAAAAABcHEAfgAMc3IATW9yZy5kcm9vbHMuY29tcGlsZXIuUnVsZV90aHJlZV9jb2x1
-bW5zX3dpdGhfY29uc3RyYWludHNfMl8wQ29uc2VxdWVuY2VJbnZva2Vybl6svvqzc2oCAAB4cHVx
-AH4ADwAAAAVzcQB+ABEAAAAAcQB+ABZ0AAckcHJpY2Uxc3EAfgARAAAAAXNxAH4AHHNxAH4AH3EA
-fgAYcQB+ACR0AAgkY2hlZXNlMnNxAH4AEQAAAABxAH4ALHQABSR0eXBlc3EAfgARAAAAAXEAfgAW
-dAAHJHByaWNlMnNxAH4AEQAAAABzcQB+ABxzcQB+AB9xAH4AGHEAfgAkdAAIJGNoZWVzZTFzcQB+
-AAE/QAAAAAAADHcIAAAAEAAAAAVxAH4AenEAfgB5cQB+AH5xAH4Ae3EAfgCAcQB+AH9xAH4AgnEA
-fgCBcQB+AIZxAH4Ag3hwc3EAfgA2c3EAfgA7AAAAAncEAAAACnNxAH4APQAAAAAAAAAAc3EAfgA7
-AAAAA3cEAAAABHEAfgB/c3EAfgBBcQB+ACxzcQB+AEVxAH4ATHNxAH4AVnEAfgBZcQB+AHl4cQB+
-AINxAH4AhXNxAH4APQAAAAEAAAAAc3EAfgA7AAAAA3cEAAAABHNxAH4AXHEAfgAsc3EAfgBfAAAA
-AHEAfgB/cQB+AEx1cQB+AA8AAAABcQB+AH9xAH4AgXNxAH4AYnEAfgCBc3IATG9yZy5kcm9vbHMu
-Y29tcGlsZXIuUnVsZV90aHJlZV9jb2x1bW5zX3dpdGhfY29uc3RyYWludHNfMl8wUHJlZGljYXRl
-MEludm9rZXJuXqy++rNzagIAAHhwdXEAfgAPAAAAAXEAfgB5eHEAfgB7cQB+AH14cQB+AHRweAA=
-</byte-array>
+ZVJlc3RyaWN0aW9uAAAAAAAAAUACAANMAAtkZWNsYXJhdGlvbnEAfgA+TAAJZXZhbHVhdG9ycQB+
+AEZbABRyZXF1aXJlZERlY2xhcmF0aW9uc3EAfgAHeHBxAH4AK3EAfgBMdXEAfgAPAAAAAXEAfgAr
+cQB+AC9zcgAjb3JnLmRyb29scy5ydWxlLlByZWRpY2F0ZUNvbnN0cmFpbnT+kI+mIluHOAIAA0wA
+C2RlY2xhcmF0aW9ucQB+AD5MAApleHByZXNzaW9udAAkTG9yZy9kcm9vbHMvc3BpL1ByZWRpY2F0
+ZUV4cHJlc3Npb247WwAUcmVxdWlyZWREZWNsYXJhdGlvbnNxAH4AB3hwcQB+AC9zcgBMb3JnLmRy
+b29scy5jb21waWxlci5SdWxlX3RocmVlX2NvbHVtbnNfd2l0aF9jb25zdHJhaW50c18xXzBQcmVk
+aWNhdGUwSW52b2tlcm5erL76s3NqAgAAeHB1cQB+AA8AAAABcQB+ABN4cQB+ABtxAH4AIXNxAH4A
+PQAAAAIAAAAAc3EAfgA7AAAAAXcEAAAAAXNxAH4AXHNxAH4AFHZyABFvcmcuZHJvb2xzLlBlcnNv
+biSkLwIXn7hmAgAJSQADYWdlWgAFYWxpdmVDAANzZXhMAApiaWdEZWNpbWFsdAAWTGphdmEvbWF0
+aC9CaWdEZWNpbWFsO0wACmJpZ0ludGVnZXJ0ABZMamF2YS9tYXRoL0JpZ0ludGVnZXI7TAAEaGFp
+cnEAfgAFTAAFbGlrZXNxAH4ABUwABG5hbWVxAH4ABUwABnN0YXR1c3EAfgAFeHB0AARuYW1lc3EA
+fgBfcQB+ACtxAH4ATHVxAH4ADwAAAAFxAH4AK3hwc3EAfgAfcQB+AG9xAH4AJHhxAH4AA3B0ACB0
+aHJlZSBjb2x1bW5zIHdpdGggY29uc3RyYWludHMgMnNxAH4ABAAAAAAAAAAAAgAAAAAAAXBxAH4A
+DHNyAE1vcmcuZHJvb2xzLmNvbXBpbGVyLlJ1bGVfdGhyZWVfY29sdW1uc193aXRoX2NvbnN0cmFp
+bnRzXzJfMENvbnNlcXVlbmNlSW52b2tlcm5erL76s3NqAgAAeHB1cQB+AA8AAAAFc3EAfgARAAAA
+AHEAfgAWdAAHJHByaWNlMXNxAH4AEQAAAAFzcQB+ABxzcQB+AB9xAH4AGHEAfgAkdAAIJGNoZWVz
+ZTJzcQB+ABEAAAAAcQB+ACx0AAUkdHlwZXNxAH4AEQAAAAFxAH4AFnQAByRwcmljZTJzcQB+ABEA
+AAAAc3EAfgAcc3EAfgAfcQB+ABhxAH4AJHQACCRjaGVlc2Uxc3EAfgABP0AAAAAAAAx3CAAAABAA
+AAAFcQB+AHpxAH4AeXEAfgB+cQB+AHtxAH4AgHEAfgB/cQB+AIJxAH4AgXEAfgCGcQB+AIN4cHNx
+AH4ANnNxAH4AOwAAAAJ3BAAAAApzcQB+AD0AAAAAAAAAAHNxAH4AOwAAAAN3BAAAAARxAH4Af3Nx
+AH4AQXEAfgAsc3EAfgBFcQB+AExzcQB+AFZxAH4AWXEAfgB5eHEAfgCDcQB+AIVzcQB+AD0AAAAB
+AAAAAHNxAH4AOwAAAAN3BAAAAARzcQB+AFxxAH4ALHNxAH4AX3EAfgB/cQB+AEx1cQB+AA8AAAAB
+cQB+AH9xAH4AgXNxAH4AYnEAfgCBc3IATG9yZy5kcm9vbHMuY29tcGlsZXIuUnVsZV90aHJlZV9j
+b2x1bW5zX3dpdGhfY29uc3RyYWludHNfMl8wUHJlZGljYXRlMEludm9rZXJuXqy++rNzagIAAHhw
+dXEAfgAPAAAAAXEAfgB5eHEAfgB7cQB+AH14cQB+AHRweAA=</byte-array>
</org.drools.rule.Package>
</entry>
</map>
- <byte-array>rO0ABXQAJGFlNmQ1ODA3LTk5NTctNDIzYS04ODRjLWUzMzlhOGU5ODNkZHNyAClvcmcuZHJvb2xz
+ <byte-array>rO0ABXQAJDVhODhmNjhkLThlZmUtNDRiMC1iNGEwLTUxMjM1YjgyYzViOXNyAClvcmcuZHJvb2xz
LnJldGVvby5SZXRlb29GYWN0SGFuZGxlRmFjdG9yeQAAAAAAAAEsAgAAeHIAK29yZy5kcm9vbHMu
Y29tbW9uLkFic3RyYWN0RmFjdEhhbmRsZUZhY3RvcnlrwcaUre4SdAIAA0oAB2NvdW50ZXJKAAJp
ZEwADmZhY3RIYW5kbGVQb29sdAAkTG9yZy9kcm9vbHMvdXRpbC9QcmltaXRpdmVMb25nU3RhY2s7
@@ -556,64 +555,64 @@
fgBKeHEAfgBncQB+AGlzcQB+AHEAAAABAAAAAHNxAH4AJQAAAAN3BAAAAARzcgAib3JnLmRyb29s
cy5ydWxlLlZhcmlhYmxlQ29uc3RyYWludAAAAAAAAAFAAgACTAAOZmllbGRFeHRyYWN0b3JxAH4A
dkwAC3Jlc3RyaWN0aW9udAAlTG9yZy9kcm9vbHMvcnVsZS9WYXJpYWJsZVJlc3RyaWN0aW9uO3hw
-cQB+AGJzcgAjb3JnLmRyb29scy5ydWxlLlZhcmlhYmxlUmVzdHJpY3Rpb24AAAAAAAABQAIABEkA
-BmNvbHVtbkwAC2RlY2xhcmF0aW9ucQB+AHJMAAlldmFsdWF0b3JxAH4AelsAFHJlcXVpcmVkRGVj
-bGFyYXRpb25zcQB+AD94cAAAAABxAH4AYXEAfgCAdXEAfgBGAAAAAXEAfgBhcQB+AGVzcgAjb3Jn
-LmRyb29scy5ydWxlLlByZWRpY2F0ZUNvbnN0cmFpbnT+kI+mIluHOAIAA0wAC2RlY2xhcmF0aW9u
-cQB+AHJMAApleHByZXNzaW9udAAkTG9yZy9kcm9vbHMvc3BpL1ByZWRpY2F0ZUV4cHJlc3Npb247
-WwAUcmVxdWlyZWREZWNsYXJhdGlvbnNxAH4AP3hwcQB+AGVzcgBMb3JnLmRyb29scy5jb21waWxl
-ci5SdWxlX3RocmVlX2NvbHVtbnNfd2l0aF9jb25zdHJhaW50c18xXzBQcmVkaWNhdGUwSW52b2tl
-cm5erL76s3NqAgAAeHB1cQB+AEYAAAABcQB+AEp4cQB+AFJxAH4AV3NxAH4AcQAAAAIAAAAAc3EA
-fgAlAAAAAXcEAAAAAXNxAH4AkHNxAH4AS3ZyABFvcmcuZHJvb2xzLlBlcnNvbiSkLwIXn7hmAgAJ
-SQADYWdlWgAFYWxpdmVDAANzZXhMAApiaWdEZWNpbWFsdAAWTGphdmEvbWF0aC9CaWdEZWNpbWFs
-O0wACmJpZ0ludGVnZXJ0ABZMamF2YS9tYXRoL0JpZ0ludGVnZXI7TAAEaGFpcnEAfgA9TAAFbGlr
-ZXNxAH4APUwABG5hbWVxAH4APUwABnN0YXR1c3EAfgA9eHB0AARuYW1lc3EAfgCTAAAAAHEAfgBh
-cQB+AIB1cQB+AEYAAAABcQB+AGF4cHNxAH4AVXEAfgCjcQB+AFp4dAAgdGhyZWUgY29sdW1ucyB3
-aXRoIGNvbnN0cmFpbnRzIDFwcQB+ADd4c3IAIG9yZy5kcm9vbHMuY29tbW9uLkJldGFOb2RlQmlu
-ZGVy2TpNkEHwWrMCAAFbAAtjb25zdHJhaW50c3QAIVtMb3JnL2Ryb29scy9zcGkvRmllbGRDb25z
-dHJhaW50O3hwdXIAIVtMb3JnLmRyb29scy5zcGkuRmllbGRDb25zdHJhaW50O5r2l/a0Sg/GAgAA
-eHAAAAABcQB+AJ5zcQB+ADEAAAAAAAQAAAABc3EAfgAlAAAAAncEAAAAAnEAfgA3c3EAfgA5AAAA
-AAAIAAAAAHNxAH4APAAAAAAAAAAAAgAAAAAAAXBxAH4AQ3NyAE1vcmcuZHJvb2xzLmNvbXBpbGVy
-LlJ1bGVfdGhyZWVfY29sdW1uc193aXRoX2NvbnN0cmFpbnRzXzJfMENvbnNlcXVlbmNlSW52b2tl
-cm5erL76s3NqAgAAeHB1cQB+AEYAAAAFc3EAfgBIAAAAAHEAfgBNdAAHJHByaWNlMXNxAH4ASAAA
-AAFzcQB+AFNzcQB+AFVxAH4AT3EAfgBadAAIJGNoZWVzZTJzcQB+AEgAAAAAcQB+AGJ0AAUkdHlw
-ZXNxAH4ASAAAAAFxAH4ATXQAByRwcmljZTJzcQB+AEgAAAAAc3EAfgBTc3EAfgBVcQB+AE9xAH4A
-WnQACCRjaGVlc2Uxc3EAfgANP0AAAAAAAAx3CAAAABAAAAAFcQB+ALZxAH4AtXEAfgC6cQB+ALdx
-AH4AvHEAfgC7cQB+AL5xAH4AvXEAfgDCcQB+AL94cHNxAH4AbHNxAH4AJQAAAAJ3BAAAAApzcQB+
-AHEAAAAAAAAAAHNxAH4AJQAAAAN3BAAAAARxAH4Au3NxAH4AdXEAfgBic3EAfgB5cQB+AIBzcQB+
-AIpxAH4AjXEAfgC1eHEAfgC/cQB+AMFzcQB+AHEAAAABAAAAAHNxAH4AJQAAAAN3BAAAAARzcQB+
-AJBxAH4AYnNxAH4AkwAAAABxAH4Au3EAfgCAdXEAfgBGAAAAAXEAfgC7cQB+AL1zcQB+AJZxAH4A
-vXNyAExvcmcuZHJvb2xzLmNvbXBpbGVyLlJ1bGVfdGhyZWVfY29sdW1uc193aXRoX2NvbnN0cmFp
-bnRzXzJfMFByZWRpY2F0ZTBJbnZva2Vybl6svvqzc2oCAAB4cHVxAH4ARgAAAAFxAH4AtXhxAH4A
-t3EAfgC5eHQAIHRocmVlIGNvbHVtbnMgd2l0aCBjb25zdHJhaW50cyAycHEAfgCueHNxAH4AqXVx
-AH4ArAAAAANzcgAtb3JnLmRyb29scy5jb21tb24uSW5zdGFuY2VOb3RFcXVhbHNDb25zdHJhaW50
-u86LzZRlbJsCAAJJAAtvdGhlckNvbHVtblsADGRlY2xhcmF0aW9uc3EAfgA/eHAAAAAAdXEAfgBG
-AAAAAHEAfgCScQB+AJhzcgAmb3JnLmRyb29scy5yZXRlb28uTGVmdElucHV0QWRhcHRlck5vZGVm
-Ybm/CjpSNAIAAkwABmJpbmRlcnEAfgAzTAAMb2JqZWN0U291cmNlcQB+ADV4cQB+ADYAAQAAAAMA
-AAABc3EAfgAlAAAAAXcEAAAAAXEAfgCueHNxAH4AqXVxAH4ArAAAAABzcgAbb3JnLmRyb29scy5y
-ZXRlb28uQWxwaGFOb2RlfATd0T3MWuYCAAJMAApjb25zdHJhaW50dAAgTG9yZy9kcm9vbHMvc3Bp
-L0ZpZWxkQ29uc3RyYWludDtMAAxvYmplY3RTb3VyY2VxAH4ANXhxAH4AIAABAAAAAgAAAAFzcQB+
-ACQAAAABdwQAAAABcQB+ANt4cQB+AHhzcQB+ACcAAQAAAAEAAAADc3EAfgArc3EAfgANP0AAAAAA
-AAx3CAAAABAAAAABc3IAIW9yZy5kcm9vbHMucmV0ZW9vLkFscGhhTm9kZVN3aXRjaDGboVVzvIvy
-AgACTAALYWxwaGFTd2l0Y2hxAH4AEEwACmNvbnN0cmFpbnR0ACNMb3JnL2Ryb29scy9ydWxlL0xp
-dGVyYWxDb25zdHJhaW50O3hwc3EAfgANP0AAAAAAAAx3CAAAABAAAAABcQB+AI1xAH4A4XhxAH4A
-eHEAfgDoeHNxAH4AJQAAAAF3BAAAAAFxAH4A4XhxAH4ArnNxAH4AJQAAAAF3BAAAAAFxAH4Arnhx
-AH4AaXEAfgAjcQB+AONxAH4AKnNxAH4AJQAAAAF3BAAAAAFxAH4AN3hxAH4Ap3EAfgAjc3EAfgAN
-P0AAAAAAAAx3CAAAABAAAAACcQB+AGlxAH4A43EAfgCncQB+ACp4c3IAJm9yZy5kcm9vbHMuc3Bp
-LkNsYXNzT2JqZWN0VHlwZVJlc29sdmVyAoTY/HCxsOsCAAFMAApvYmplY3RUeXBldABDTG9yZy9k
-cm9vbHMvc3BpL0NsYXNzT2JqZWN0VHlwZVJlc29sdmVyJE1vZGlmaWVhYmxlQ2xhc3NPYmplY3RU
-eXBlO3hwc3IAQW9yZy5kcm9vbHMuc3BpLkNsYXNzT2JqZWN0VHlwZVJlc29sdmVyJE1vZGlmaWVh
-YmxlQ2xhc3NPYmplY3RUeXBlRKWrlAI3+zUCAAB4cQB+AFVwc3EAfgBYcHB0AARudWxsc3IAH29y
-Zy5kcm9vbHMucmV0ZW9vLlJldGVvb0J1aWxkZXIYHVn7j8gD8AIACUkAF2N1cnJlbnRPZmZzZXRB
-ZGp1c3RtZW50SQACaWRMAA1hdHRhY2hlZE5vZGVzcQB+ABBMAAxkZWNsYXJhdGlvbnNxAH4AEEwA
-DG9iamVjdFNvdXJjZXEAfgA1TAAKb2JqZWN0VHlwZXEAfgAQTAAIcmVzb2x2ZXJxAH4AH0wABXJ1
-bGVzcQB+ABBMAAt0dXBsZVNvdXJjZXEAfgA0eHAAAAAAAAAACXNxAH4ADT9AAAAAAAAMdwgAAAAQ
-AAAABnEAfgA3cQB+ADdxAH4A43EAfgDjcQB+AK5xAH4ArnEAfgAqcQB+ACpxAH4A23EAfgDbcQB+
-AOFxAH4A4XhzcQB+AA0/QAAAAAAADHcIAAAAEAAAAAVxAH4AtnEAfgC1cQB+ALpxAH4At3EAfgC8
-cQB+ALtxAH4AvnEAfgC9cQB+AMJxAH4Av3hxAH4A43NyABdqYXZhLnV0aWwuTGlua2VkSGFzaE1h
-cDTATlwQbMD7AgABWgALYWNjZXNzT3JkZXJ4cQB+AA0/QAAAAAAADHcIAAAAEAAAAAFxAH4AwXNy
-ABFqYXZhLmxhbmcuSW50ZWdlchLioKT3gYc4AgABSQAFdmFsdWV4cgAQamF2YS5sYW5nLk51bWJl
-coaslR0LlOCLAgAAeHAAAAABeABxAH4A8HNxAH4ADT9AAAAAAAAMdwgAAAAQAAAAAnEAfgBCdXIA
-HVtMb3JnLmRyb29scy5yZXRlb28uQmFzZU5vZGU7C+fJk0Ocs+oCAAB4cAAAAAFxAH4AO3EAfgCx
-dXEAfgD/AAAAAXEAfgCweHEAfgCu</byte-array>
+cQB+AGJzcgAjb3JnLmRyb29scy5ydWxlLlZhcmlhYmxlUmVzdHJpY3Rpb24AAAAAAAABQAIAA0wA
+C2RlY2xhcmF0aW9ucQB+AHJMAAlldmFsdWF0b3JxAH4AelsAFHJlcXVpcmVkRGVjbGFyYXRpb25z
+cQB+AD94cHEAfgBhcQB+AIB1cQB+AEYAAAABcQB+AGFxAH4AZXNyACNvcmcuZHJvb2xzLnJ1bGUu
+UHJlZGljYXRlQ29uc3RyYWludP6Qj6YiW4c4AgADTAALZGVjbGFyYXRpb25xAH4AckwACmV4cHJl
+c3Npb250ACRMb3JnL2Ryb29scy9zcGkvUHJlZGljYXRlRXhwcmVzc2lvbjtbABRyZXF1aXJlZERl
+Y2xhcmF0aW9uc3EAfgA/eHBxAH4AZXNyAExvcmcuZHJvb2xzLmNvbXBpbGVyLlJ1bGVfdGhyZWVf
+Y29sdW1uc193aXRoX2NvbnN0cmFpbnRzXzFfMFByZWRpY2F0ZTBJbnZva2Vybl6svvqzc2oCAAB4
+cHVxAH4ARgAAAAFxAH4ASnhxAH4AUnEAfgBXc3EAfgBxAAAAAgAAAABzcQB+ACUAAAABdwQAAAAB
+c3EAfgCQc3EAfgBLdnIAEW9yZy5kcm9vbHMuUGVyc29uJKQvAhefuGYCAAlJAANhZ2VaAAVhbGl2
+ZUMAA3NleEwACmJpZ0RlY2ltYWx0ABZMamF2YS9tYXRoL0JpZ0RlY2ltYWw7TAAKYmlnSW50ZWdl
+cnQAFkxqYXZhL21hdGgvQmlnSW50ZWdlcjtMAARoYWlycQB+AD1MAAVsaWtlc3EAfgA9TAAEbmFt
+ZXEAfgA9TAAGc3RhdHVzcQB+AD14cHQABG5hbWVzcQB+AJNxAH4AYXEAfgCAdXEAfgBGAAAAAXEA
+fgBheHBzcQB+AFVxAH4Ao3EAfgBaeHQAIHRocmVlIGNvbHVtbnMgd2l0aCBjb25zdHJhaW50cyAx
+cHEAfgA3eHNyACBvcmcuZHJvb2xzLmNvbW1vbi5CZXRhTm9kZUJpbmRlctk6TZBB8FqzAgABWwAL
+Y29uc3RyYWludHN0ACFbTG9yZy9kcm9vbHMvc3BpL0ZpZWxkQ29uc3RyYWludDt4cHVyACFbTG9y
+Zy5kcm9vbHMuc3BpLkZpZWxkQ29uc3RyYWludDua9pf2tEoPxgIAAHhwAAAAAXEAfgCec3EAfgAx
+AAAAAAAEAAAAAXNxAH4AJQAAAAJ3BAAAAAJxAH4AN3NxAH4AOQAAAAAACAAAAABzcQB+ADwAAAAA
+AAAAAAIAAAAAAAFwcQB+AENzcgBNb3JnLmRyb29scy5jb21waWxlci5SdWxlX3RocmVlX2NvbHVt
+bnNfd2l0aF9jb25zdHJhaW50c18yXzBDb25zZXF1ZW5jZUludm9rZXJuXqy++rNzagIAAHhwdXEA
+fgBGAAAABXNxAH4ASAAAAABxAH4ATXQAByRwcmljZTFzcQB+AEgAAAABc3EAfgBTc3EAfgBVcQB+
+AE9xAH4AWnQACCRjaGVlc2Uyc3EAfgBIAAAAAHEAfgBidAAFJHR5cGVzcQB+AEgAAAABcQB+AE10
+AAckcHJpY2Uyc3EAfgBIAAAAAHNxAH4AU3NxAH4AVXEAfgBPcQB+AFp0AAgkY2hlZXNlMXNxAH4A
+DT9AAAAAAAAMdwgAAAAQAAAABXEAfgC2cQB+ALVxAH4AunEAfgC3cQB+ALxxAH4Au3EAfgC+cQB+
+AL1xAH4AwnEAfgC/eHBzcQB+AGxzcQB+ACUAAAACdwQAAAAKc3EAfgBxAAAAAAAAAABzcQB+ACUA
+AAADdwQAAAAEcQB+ALtzcQB+AHVxAH4AYnNxAH4AeXEAfgCAc3EAfgCKcQB+AI1xAH4AtXhxAH4A
+v3EAfgDBc3EAfgBxAAAAAQAAAABzcQB+ACUAAAADdwQAAAAEc3EAfgCQcQB+AGJzcQB+AJNxAH4A
+u3EAfgCAdXEAfgBGAAAAAXEAfgC7cQB+AL1zcQB+AJZxAH4AvXNyAExvcmcuZHJvb2xzLmNvbXBp
+bGVyLlJ1bGVfdGhyZWVfY29sdW1uc193aXRoX2NvbnN0cmFpbnRzXzJfMFByZWRpY2F0ZTBJbnZv
+a2Vybl6svvqzc2oCAAB4cHVxAH4ARgAAAAFxAH4AtXhxAH4At3EAfgC5eHQAIHRocmVlIGNvbHVt
+bnMgd2l0aCBjb25zdHJhaW50cyAycHEAfgCueHNxAH4AqXVxAH4ArAAAAANzcgAtb3JnLmRyb29s
+cy5jb21tb24uSW5zdGFuY2VOb3RFcXVhbHNDb25zdHJhaW50u86LzZRlbJsCAAJJAAtvdGhlckNv
+bHVtblsADGRlY2xhcmF0aW9uc3EAfgA/eHAAAAAAdXEAfgBGAAAAAHEAfgCScQB+AJhzcgAmb3Jn
+LmRyb29scy5yZXRlb28uTGVmdElucHV0QWRhcHRlck5vZGVmYbm/CjpSNAIAAkwABmJpbmRlcnEA
+fgAzTAAMb2JqZWN0U291cmNlcQB+ADV4cQB+ADYAAQAAAAMAAAABc3EAfgAlAAAAAXcEAAAAAXEA
+fgCueHNxAH4AqXVxAH4ArAAAAABzcgAbb3JnLmRyb29scy5yZXRlb28uQWxwaGFOb2RlfATd0T3M
+WuYCAAJMAApjb25zdHJhaW50dAAgTG9yZy9kcm9vbHMvc3BpL0ZpZWxkQ29uc3RyYWludDtMAAxv
+YmplY3RTb3VyY2VxAH4ANXhxAH4AIAABAAAAAgAAAAFzcQB+ACQAAAABdwQAAAABcQB+ANt4cQB+
+AHhzcQB+ACcAAQAAAAEAAAADc3EAfgArc3EAfgANP0AAAAAAAAx3CAAAABAAAAABc3IAIW9yZy5k
+cm9vbHMucmV0ZW9vLkFscGhhTm9kZVN3aXRjaDGboVVzvIvyAgACTAALYWxwaGFTd2l0Y2hxAH4A
+EEwACmNvbnN0cmFpbnR0ACNMb3JnL2Ryb29scy9ydWxlL0xpdGVyYWxDb25zdHJhaW50O3hwc3EA
+fgANP0AAAAAAAAx3CAAAABAAAAABcQB+AI1xAH4A4XhxAH4AeHEAfgDoeHNxAH4AJQAAAAF3BAAA
+AAFxAH4A4XhxAH4ArnNxAH4AJQAAAAF3BAAAAAFxAH4ArnhxAH4AaXEAfgAjcQB+AONxAH4AKnNx
+AH4AJQAAAAF3BAAAAAFxAH4AN3hxAH4Ap3EAfgAjc3EAfgANP0AAAAAAAAx3CAAAABAAAAACcQB+
+AKdxAH4AKnEAfgBpcQB+AON4c3IAJm9yZy5kcm9vbHMuc3BpLkNsYXNzT2JqZWN0VHlwZVJlc29s
+dmVyAoTY/HCxsOsCAAFMAApvYmplY3RUeXBldABDTG9yZy9kcm9vbHMvc3BpL0NsYXNzT2JqZWN0
+VHlwZVJlc29sdmVyJE1vZGlmaWVhYmxlQ2xhc3NPYmplY3RUeXBlO3hwc3IAQW9yZy5kcm9vbHMu
+c3BpLkNsYXNzT2JqZWN0VHlwZVJlc29sdmVyJE1vZGlmaWVhYmxlQ2xhc3NPYmplY3RUeXBlRKWr
+lAI3+zUCAAB4cQB+AFVwc3EAfgBYcHB0AARudWxsc3IAH29yZy5kcm9vbHMucmV0ZW9vLlJldGVv
+b0J1aWxkZXIYHVn7j8gD8AIACUkAF2N1cnJlbnRPZmZzZXRBZGp1c3RtZW50SQACaWRMAA1hdHRh
+Y2hlZE5vZGVzcQB+ABBMAAxkZWNsYXJhdGlvbnNxAH4AEEwADG9iamVjdFNvdXJjZXEAfgA1TAAK
+b2JqZWN0VHlwZXEAfgAQTAAIcmVzb2x2ZXJxAH4AH0wABXJ1bGVzcQB+ABBMAAt0dXBsZVNvdXJj
+ZXEAfgA0eHAAAAAAAAAACXNxAH4ADT9AAAAAAAAMdwgAAAAQAAAABnEAfgDbcQB+ANtxAH4A4XEA
+fgDhcQB+ADdxAH4AN3EAfgAqcQB+ACpxAH4ArnEAfgCucQB+AONxAH4A43hzcQB+AA0/QAAAAAAA
+DHcIAAAAEAAAAAVxAH4AtnEAfgC1cQB+ALpxAH4At3EAfgC8cQB+ALtxAH4AvnEAfgC9cQB+AMJx
+AH4Av3hxAH4A43NyABdqYXZhLnV0aWwuTGlua2VkSGFzaE1hcDTATlwQbMD7AgABWgALYWNjZXNz
+T3JkZXJ4cQB+AA0/QAAAAAAADHcIAAAAEAAAAAFxAH4AwXNyABFqYXZhLmxhbmcuSW50ZWdlchLi
+oKT3gYc4AgABSQAFdmFsdWV4cgAQamF2YS5sYW5nLk51bWJlcoaslR0LlOCLAgAAeHAAAAABeABx
+AH4A8HNxAH4ADT9AAAAAAAAMdwgAAAAQAAAAAnEAfgBCdXIAHVtMb3JnLmRyb29scy5yZXRlb28u
+QmFzZU5vZGU7C+fJk0Ocs+oCAAB4cAAAAAFxAH4AO3EAfgCxdXEAfgD/AAAAAXEAfgCweHEAfgCu
+</byte-array>
</org.drools.reteoo.ReteooRuleBase>
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java 2006-08-05 16:15:48 UTC (rev 5497)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java 2006-08-05 21:46:20 UTC (rev 5498)
@@ -16,8 +16,6 @@
* limitations under the License.
*/
-import java.util.Arrays;
-
import org.drools.WorkingMemory;
import org.drools.common.InternalFactHandle;
import org.drools.spi.Evaluator;
@@ -66,15 +64,6 @@
public boolean isAllowed(final InternalFactHandle handle,
final Tuple tuple,
final WorkingMemory workingMemory) {
- //can't do this as null indexing breaks.
- // Object left = workingMemory.getObject( tuple.get( this.declaration ) );
- // Object right = workingMemory.getObject( handle );
- // if ( left == right ) {
- // return false;
- // } else {
- // return evaluator.evaluate( this.fieldExtractor.getValue( right ),
- // declaration.getValue( left ) );
- // }
return this.restriction.isAllowed( this.fieldExtractor.getValue( handle.getObject() ),
handle,
tuple,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableRestriction.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableRestriction.java 2006-08-05 16:15:48 UTC (rev 5497)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableRestriction.java 2006-08-05 21:46:20 UTC (rev 5498)
@@ -26,7 +26,9 @@
import org.drools.spi.Restriction;
import org.drools.spi.Tuple;
-public class VariableRestriction implements Restriction {
+public class VariableRestriction
+ implements
+ Restriction {
/**
*
@@ -35,8 +37,6 @@
private final Declaration declaration;
- private final int column;
-
private final Declaration[] requiredDeclarations;
private final Evaluator evaluator;
@@ -44,7 +44,6 @@
public VariableRestriction(final Declaration declaration,
final Evaluator evaluator) {
this.declaration = declaration;
- this.column = declaration.getColumn();
this.requiredDeclarations = new Declaration[]{declaration};
this.evaluator = evaluator;
}
@@ -61,15 +60,6 @@
final InternalFactHandle handle,
final Tuple tuple,
final WorkingMemory workingMemory) {
- //can't do this as null indexing breaks.
- // Object left = workingMemory.getObject( tuple.get( this.declaration ) );
- // Object right = workingMemory.getObject( handle );
- // if ( left == right ) {
- // return false;
- // } else {
- // return evaluator.evaluate( this.fieldExtractor.getValue( right ),
- // declaration.getValue( left ) );
- // }
return this.evaluator.evaluate( object,
this.declaration.getValue( tuple.get( this.declaration ).getObject() ) );
}
@@ -84,7 +74,6 @@
public int hashCode() {
final int PRIME = 31;
int result = 1;
- result = PRIME * result + this.column;
result = PRIME * result + ((this.declaration == null) ? 0 : this.declaration.hashCode());
result = PRIME * result + ((this.evaluator == null) ? 0 : this.evaluator.hashCode());
result = PRIME * result + this.requiredDeclarations[0].hashCode();
@@ -102,8 +91,8 @@
final VariableRestriction other = (VariableRestriction) object;
- return (this.column == other.column) && this.declaration.equals( other.declaration ) && this.evaluator.equals( other.evaluator ) && Arrays.equals( this.requiredDeclarations,
- other.requiredDeclarations );
+ return this.declaration.equals( other.declaration ) && this.evaluator.equals( other.evaluator ) && Arrays.equals( this.requiredDeclarations,
+ other.requiredDeclarations );
}
}
\ No newline at end of file
More information about the jboss-svn-commits
mailing list