Menu
▾
▴
jboss-svn-commits — JBoss SVN commit notifications
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(233) |
Sep
(199) |
Oct
(206) |
Nov
(185) |
Dec
(270) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(232) |
Feb
(426) |
Mar
(623) |
Apr
(592) |
May
(506) |
Jun
(389) |
Jul
(160) |
Aug
(3) |
Sep
(1) |
Oct
(1) |
Nov
(2) |
Dec
(5) |
| 2007 |
Jan
(1) |
Feb
(1) |
Mar
(2) |
Apr
(2) |
May
(4) |
Jun
(2) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(9) |
Nov
(6) |
Dec
(6) |
| 2008 |
Jan
(3) |
Feb
|
Mar
(1) |
Apr
(3) |
May
(3) |
Jun
(5) |
Jul
(10) |
Aug
(2) |
Sep
(12) |
Oct
(10) |
Nov
(54) |
Dec
(49) |
| 2009 |
Jan
(19) |
Feb
(13) |
Mar
(20) |
Apr
(24) |
May
(44) |
Jun
(29) |
Jul
(32) |
Aug
(10) |
Sep
(7) |
Oct
(10) |
Nov
(4) |
Dec
(17) |
| 2010 |
Jan
(14) |
Feb
(5) |
Mar
(23) |
Apr
(50) |
May
(31) |
Jun
(9) |
Jul
(5) |
Aug
(4) |
Sep
(7) |
Oct
(5) |
Nov
(2) |
Dec
(3) |
| 2011 |
Jan
(12) |
Feb
(5) |
Mar
(5) |
Apr
(3) |
May
(4) |
Jun
(3) |
Jul
(2) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2012 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(4) |
Aug
(1) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(2) |
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2015 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <jbo...@li...> - 2006-06-26 07:09:41
|
Author: mar...@jb... Date: 2006-06-26 03:09:37 -0400 (Mon, 26 Jun 2006) New Revision: 4822 Added: labs/jbossesb/tags/4_0_Alpha_1/ Log: Initial Rosetta codebase. Copied: labs/jbossesb/tags/4_0_Alpha_1 (from rev 4821, labs/jbossesb/trunk) |
|
From: <jbo...@li...> - 2006-06-26 07:08:44
|
Author: mar...@jb... Date: 2006-06-26 03:08:41 -0400 (Mon, 26 Jun 2006) New Revision: 4821 Removed: labs/jbossesb/trunk/ESBCore/EsbCommon/.settings/ Log: |
|
From: <jbo...@li...> - 2006-06-26 05:48:07
|
Author: mic...@jb... Date: 2006-06-26 01:48:01 -0400 (Mon, 26 Jun 2006) New Revision: 4819 Modified: labs/jbossrules/trunk/documentation/training/developers-course/Module 4 - Rule Engine Concepts 2.odp labs/jbossrules/trunk/documentation/training/developers-course/course_outline.odt Log: finished module 4 Modified: labs/jbossrules/trunk/documentation/training/developers-course/Module 4 - Rule Engine Concepts 2.odp =================================================================== (Binary files differ) Modified: labs/jbossrules/trunk/documentation/training/developers-course/course_outline.odt =================================================================== (Binary files differ) |
|
From: <jbo...@li...> - 2006-06-26 03:26:20
|
Author: mic...@jb...
Date: 2006-06-25 23:26:15 -0400 (Sun, 25 Jun 2006)
New Revision: 4818
Modified:
labs/jbossrules/trunk/README_DEPENDENCIES.txt
Log:
corrected a system property typo
Modified: labs/jbossrules/trunk/README_DEPENDENCIES.txt
===================================================================
--- labs/jbossrules/trunk/README_DEPENDENCIES.txt 2006-06-26 00:59:51 UTC (rev 4817)
+++ labs/jbossrules/trunk/README_DEPENDENCIES.txt 2006-06-26 03:26:15 UTC (rev 4818)
@@ -20,7 +20,7 @@
* commons-jci-core
o This also requires only one pair out of:
+ commons-jci-eclipse, core-3.2 - for eclipse JDT to compile the java semantics (this is default)
- + commons-jci-janino, janino - for janino. To use this option, set -Ddrools.compiler=true or use PackageBuilderConfiguration? class.
+ + commons-jci-janino, janino - for janino. To use this option, set -Ddrools.compiler=JANINO or use PackageBuilderConfiguration? class.
* commons-logging - used by various dependencies.
* commons-lang - used for string manipulation in various dependencies.
* stringtemplate, anlr-2.7.6 - used in generating semantic code.
@@ -38,7 +38,12 @@
* drools-decisiontables - contains the spreadsheet compiler for both XLS and CSV
* poi - for parsing Excel spreadsheets. If you are only using CSV, can skip this.
-The most common use case is for COMPILER - this allows rules to be loaded from their source form, and includes the runtime engine of course. For example, if you wanted to be able to load rules from a drl source you would need: drools-core and the COMPILER jars mentioned above (not xerces, and not xml-apis), and commons-jar-eclipse, core-3.2. You will only need optional core jars if you are using those features.
+The most common use case is for COMPILER - this allows rules to be loaded from their source form,
+and includes the runtime engine of course.
+For example, if you wanted to be able to load rules from a drl source you would need: drools-core and the COMPILER jars mentioned above
+(not xerces, and not xml-apis), and commons-jar-eclipse, core-3.2.
+You will only need optional core jars if you are using those features.
-When building from source, the dependencies are managed by maven. In each module, there is a pom.xml file that lists the exact dependencies and exact version numbers.
-Even if you use ant to build, the dependencies will be downloaded for you based on those pom.xml files.
\ No newline at end of file
+When building from source, the dependencies are managed by maven.
+In each module, there is a pom.xml file that lists the exact dependencies and exact version numbers.
+Even if you use ant to build, the dependencies will be downloaded for you based on those pom.xml files.
\ No newline at end of file
|
|
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) {
|
|
From: <jbo...@li...> - 2006-06-25 17:26:30
|
Author: KrisVerlaenen
Date: 2006-06-25 13:26:27 -0400 (Sun, 25 Jun 2006)
New Revision: 4816
Modified:
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/LocationDeterminator.java
Log:
JBRULES-320: IDE LocationDeterminator to use latest RuleParser
- only end of column is registered now, logic of whether higher level PatternDescrs
have ended is refactored in LocationDeterminator andReached method
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/LocationDeterminator.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/LocationDeterminator.java 2006-06-24 22:21:31 UTC (rev 4815)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/LocationDeterminator.java 2006-06-25 17:26:27 UTC (rev 4816)
@@ -10,6 +10,7 @@
import org.drools.compiler.DroolsParserException;
import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.ColumnDescr;
+import org.drools.lang.descr.EvalDescr;
import org.drools.lang.descr.ExistsDescr;
import org.drools.lang.descr.NotDescr;
import org.drools.lang.descr.OrDescr;
@@ -106,7 +107,7 @@
}
return new Location(LOCATION_BEGIN_OF_CONDITION);
}
- if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
+ if (endReached(subDescr)) {
return new Location(LOCATION_BEGIN_OF_CONDITION);
}
return determineLocationForDescr(subDescr, backText);
@@ -175,10 +176,6 @@
if (subDescr == null) {
return new Location(LOCATION_BEGIN_OF_CONDITION_EXISTS);
}
- // not needed because an exist description is ended if subdescr is ended
- // if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
- // return new Location(LOCATION_BEGIN_OF_CONDITION);
- // }
return determineLocationForDescr(subDescr, backText);
}
return determineLocationForDescr(descr, backText);
@@ -192,10 +189,6 @@
if (subDescr == null) {
return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
}
- // not needed because a not description is ended if subdescr is ended
- // if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
- // return new Location(LOCATION_BEGIN_OF_CONDITION);
- // }
Location location = determineLocationForDescr(subDescr, backText);
if (location.getType() == LOCATION_BEGIN_OF_CONDITION) {
return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
@@ -218,9 +211,6 @@
return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
}
return new Location(LOCATION_BEGIN_OF_CONDITION_AND_OR);
- // not needed because an and description is ended if subdescr is ended
- // } else if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
- // return new Location(LOCATION_BEGIN_OF_CONDITION);
} else {
Location location = determineLocationForDescr(subDescr, backText);
if (location.getType() == LOCATION_BEGIN_OF_CONDITION) {
@@ -244,9 +234,6 @@
if (matcher.matches()) {
return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
}return new Location(LOCATION_BEGIN_OF_CONDITION_AND_OR);
- // not needed because an or description is ended if subdescr is ended
- // } else if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
- // return new Location(LOCATION_BEGIN_OF_CONDITION);
} else {
Location location = determineLocationForDescr(subDescr, backText);
if (location.getType() == LOCATION_BEGIN_OF_CONDITION) {
@@ -260,4 +247,46 @@
return new Location(LOCATION_UNKNOWN);
}
+
+ private static boolean endReached(PatternDescr descr) {
+ if (descr instanceof ColumnDescr) {
+ return (descr.getEndLine() != 0 || descr.getEndColumn() != 0);
+ } else if (descr instanceof ExistsDescr) {
+ List descrs = ((ExistsDescr) descr).getDescrs();
+ if (descrs.isEmpty()) {
+ return false;
+ }
+ return endReached((PatternDescr) descrs.get(0));
+ } else if (descr instanceof NotDescr) {
+ List descrs = ((NotDescr) descr).getDescrs();
+ if (descrs.isEmpty()) {
+ return false;
+ }
+ return endReached((PatternDescr) descrs.get(0));
+ } else if (descr instanceof NotDescr) {
+ List descrs = ((NotDescr) descr).getDescrs();
+ if (descrs.isEmpty()) {
+ return false;
+ }
+ return endReached((PatternDescr) descrs.get(0));
+ } else if (descr instanceof AndDescr) {
+ List descrs = ((AndDescr) descr).getDescrs();
+ if (descrs.size() != 2) {
+ return false;
+ }
+ return endReached((PatternDescr) descrs.get(0))
+ && endReached((PatternDescr) descrs.get(1));
+ } else if (descr instanceof OrDescr) {
+ List descrs = ((OrDescr) descr).getDescrs();
+ if (descrs.size() != 2) {
+ return false;
+ }
+ return endReached((PatternDescr) descrs.get(0))
+ && endReached((PatternDescr) descrs.get(1));
+ } if (descr instanceof EvalDescr) {
+ // EvalDescr are only added once the end has been reached
+ return true;
+ }
+ return false;
+ }
}
|
|
From: <jbo...@li...> - 2006-06-24 22:21:41
|
Author: tirelli
Date: 2006-06-24 18:21:31 -0400 (Sat, 24 Jun 2006)
New Revision: 4815
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
Log:
JBRULES-319:
* Fixing bindings for OR
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java 2006-06-24 18:53:00 UTC (rev 4814)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java 2006-06-24 22:21:31 UTC (rev 4815)
@@ -223,8 +223,8 @@
build( this.rule,
(ConditionalElementDescr) object,
and,
- false,
- false );
+ false, // do not decrement offset
+ false ); // do not decrement first offset
this.rule.addPattern( and );
} else if ( object instanceof OrDescr ) {
final Or or = new Or();
@@ -232,8 +232,8 @@
build( this.rule,
(ConditionalElementDescr) object,
or,
- false,
- false );
+ true, // when OR is used, offset MUST be decremented
+ false ); // do not decrement first offset
this.rule.addPattern( or );
} else if ( object instanceof NotDescr ) {
// We cannot have declarations created inside a not visible outside it, so track no declarations so they can be removed
@@ -243,8 +243,8 @@
build( this.rule,
(ConditionalElementDescr) object,
not,
- true,
- true );
+ true, // when NOT is used, offset MUST be decremented
+ true ); // when NOT is used, offset MUST be decremented for first column
this.rule.addPattern( not );
// remove declarations bound inside not node
@@ -261,8 +261,8 @@
build( this.rule,
(ConditionalElementDescr) object,
exists,
- true,
- true );
+ true, // when EXIST is used, offset MUST be decremented
+ true ); // when EXIST is used, offset MUST be decremented for first column
// remove declarations bound inside not node
for ( final Iterator notIt = this.notDeclarations.keySet().iterator(); notIt.hasNext(); ) {
this.declarations.remove( notIt.next() );
@@ -307,8 +307,8 @@
build( rule,
(ConditionalElementDescr) object,
and,
- false,
- false );
+ false, // do not decrement offset
+ false ); // do not decrement first offset
ce.addChild( and );
} else if ( object instanceof OrDescr ) {
final Or or = new Or();
@@ -316,8 +316,8 @@
build( rule,
(ConditionalElementDescr) object,
or,
- false,
- false );
+ true, // when OR is used, offset MUST be decremented
+ false ); // do not decrement first offset
ce.addChild( or );
} else if ( object instanceof NotDescr ) {
final Not not = new Not();
@@ -325,8 +325,8 @@
build( rule,
(ConditionalElementDescr) object,
not,
- true,
- true );
+ true, // when NOT is used, offset MUST be decremented
+ true ); // when NOT is used, offset MUST be decremented for first column
ce.addChild( not );
} else if ( object instanceof ExistsDescr ) {
final Exists exists = new Exists();
@@ -334,8 +334,8 @@
build( rule,
(ConditionalElementDescr) object,
exists,
- true,
- true );
+ true, // when EXIST is used, offset MUST be decremented
+ true ); // when EXIST is used, offset MUST be decremented for first column
ce.addChild( exists );
} else if ( object instanceof EvalDescr ) {
final EvalCondition eval = build( (EvalDescr) object );
@@ -983,26 +983,14 @@
// we start with -1 so that we can ++this.value - otherwise the first element has a lower value than the second in an 'or'
private int value = -1;
- private boolean orCheck;
-
private GroupElement ge;
public void setParent(final GroupElement ge) {
this.ge = ge;
- this.orCheck = false;
}
public int getNext() {
- if ( this.ge != null && this.ge.getClass() == Or.class ) {
- if ( !this.orCheck ) {
- this.orCheck = true;
- return ++this.value;
- } else {
- return this.value;
- }
- } else {
- return ++this.value;
- }
+ return ++this.value;
}
}
}
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-06-24 18:53:00 UTC (rev 4814)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-06-24 22:21:31 UTC (rev 4815)
@@ -37,6 +37,7 @@
import org.drools.CheeseEqual;
import org.drools.Cheesery;
import org.drools.FactHandle;
+import org.drools.IndexedNumber;
import org.drools.Person;
import org.drools.PersonInterface;
import org.drools.QueryResults;
@@ -45,7 +46,7 @@
import org.drools.State;
import org.drools.TestParam;
import org.drools.WorkingMemory;
-import org.drools.common.ObjectInputStreamWithLoader;
+import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsError;
import org.drools.compiler.DroolsParserException;
@@ -57,6 +58,8 @@
import org.drools.event.AfterActivationFiredEvent;
import org.drools.event.AgendaEventListener;
import org.drools.event.BeforeActivationFiredEvent;
+import org.drools.event.DebugAgendaEventListener;
+import org.drools.event.DebugWorkingMemoryEventListener;
import org.drools.event.DefaultAgendaEventListener;
import org.drools.integrationtests.helloworld.Message;
import org.drools.lang.descr.PackageDescr;
@@ -64,7 +67,6 @@
import org.drools.rule.Rule;
import org.drools.spi.ActivationGroup;
import org.drools.spi.AgendaGroup;
-import org.drools.util.PrimitiveLongMap;
/**
* This contains the test cases for each engines implementation to execute.
@@ -2331,7 +2333,7 @@
assertTrue( list.contains( "fired3" ) );
}
- public void FIXME_testOrWithBinding() throws Exception {
+ public void testOrWithBinding() throws Exception {
final PackageBuilder builder = new PackageBuilder();
builder.addPackageFromDrl( new InputStreamReader(
@@ -2375,4 +2377,40 @@
return bytes;
}
+ public void FIXME_testEval2() throws Exception {
+ final Reader reader = new InputStreamReader( getClass().getResourceAsStream( "test_Eval.drl" ) );
+
+ WorkingMemoryFileLogger logger = null;
+ try {
+ final PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( reader );
+ final Package pkg1 = builder.getPackage();
+
+ final RuleBase ruleBase = getRuleBase();
+ ruleBase.addPackage( pkg1 );
+ final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+
+// logger = new WorkingMemoryFileLogger(workingMemory);
+// logger.setFileName( "logger.log" );
+// DebugWorkingMemoryEventListener l1 = new DebugWorkingMemoryEventListener();
+// workingMemory.addEventListener( l1 );
+// DebugAgendaEventListener l2 = new DebugAgendaEventListener();
+// workingMemory.addEventListener( l2 );
+
+ final int MAX = 3;
+ for (int i=1 ; i<=MAX; i++) {
+ IndexedNumber n = new IndexedNumber(i, MAX - i + 1);
+ workingMemory.assertObject(n);
+ }
+ workingMemory.fireAllRules();
+
+ } catch ( RuntimeException e ) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } finally {
+// logger.writeToDisk();
+ }
+
+ }
+
}
|
|
From: <jbo...@li...> - 2006-06-24 18:53:05
|
Author: KrisVerlaenen
Date: 2006-06-24 14:53:00 -0400 (Sat, 24 Jun 2006)
New Revision: 4814
Modified:
labs/jbossrules/trunk/build.xml
Log:
JBRULES-321: IDE should reuse the eclipse jdt core jar and not include its own
- the jdt core jar should no longer be copied to the drools-ide
Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml 2006-06-24 18:50:50 UTC (rev 4813)
+++ labs/jbossrules/trunk/build.xml 2006-06-24 18:53:00 UTC (rev 4814)
@@ -136,7 +136,7 @@
<copy todir="drools-ide/lib"
flatten="true">
- <fileset dir="repository" includes="**/*.jar" excludes="**/jsr94-sigtest-1.1.jar **/jsr94-tck-1.0.3.jar **/drools-*.jar" />
+ <fileset dir="repository" includes="**/*.jar" excludes="**/jsr94-sigtest-1.1.jar **/jsr94-tck-1.0.3.jar **/drools-*.jar **/core-*.jar" />
</copy>
<!-- copy the drools module jars for the plug in. We will remove the version number from them -->
|
|
From: <jbo...@li...> - 2006-06-24 18:50:54
|
Author: KrisVerlaenen
Date: 2006-06-24 14:50:50 -0400 (Sat, 24 Jun 2006)
New Revision: 4813
Modified:
labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/util/DroolsClasspathContainer.java
Log:
JBRULES-321: IDE should reuse the eclipse jdt core jar and not include its own
- IDE now includes the jdt-core jar inside eclipse in its library (=classpath container)
Modified: labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF
===================================================================
--- labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF 2006-06-24 11:24:17 UTC (rev 4812)
+++ labs/jbossrules/trunk/drools-ide/META-INF/MANIFEST.MF 2006-06-24 18:50:50 UTC (rev 4813)
@@ -47,7 +47,6 @@
lib/xpp3-1.1.3.4.O.jar,
lib/xstream-1.1.3.jar,
lib/jsr94-1.1.jar,
- lib/core-3.2.0.666.jar,
lib/commons-jci-core-1.0-406301.jar,
lib/commons-jci-eclipse-3.2.0.666.jar,
lib/commons-jci-janino-2.4.3.jar,
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/util/DroolsClasspathContainer.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/util/DroolsClasspathContainer.java 2006-06-24 11:24:17 UTC (rev 4812)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/util/DroolsClasspathContainer.java 2006-06-24 18:50:50 UTC (rev 4813)
@@ -2,6 +2,7 @@
import java.io.File;
import java.io.IOException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -14,6 +15,7 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
+import org.osgi.framework.Bundle;
public class DroolsClasspathContainer implements IClasspathContainer {
@@ -54,6 +56,16 @@
list.add(JavaCore.newLibraryEntry(
path, path, null));
}
+ // also add jdt core jar from eclipse itself
+ String pluginRootString = Platform.getInstallLocation().getURL().getPath() + "plugins/";
+ File pluginRoot = new Path(pluginRootString).toFile();
+ File[] files = pluginRoot.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ if (files[i].getAbsolutePath().contains("org.eclipse.jdt.core_")) {
+ Path path = new Path(files[i].getAbsolutePath());
+ list.add(JavaCore.newLibraryEntry(path, path, null));
+ }
+ }
return (IClasspathEntry[]) list.toArray(new IClasspathEntry[list.size()]);
}
|
|
From: <jbo...@li...> - 2006-06-24 11:24:23
|
Author: wrzep
Date: 2006-06-24 07:24:17 -0400 (Sat, 24 Jun 2006)
New Revision: 4812
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Removed MDB.
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -97,13 +97,6 @@
PluginsValues pluginsValues;
- // Compute and save current scores
- try {
- ScoresManager.save(projects, pluginsConf);
- } catch (ScoresSaveException e) {
- log.error("Saving scores failed ", e);
- }
-
// Get latest available scores
try {
ScoresManager.init(portalName, serviceConf);
@@ -214,33 +207,29 @@
/**
* @return true iff updated scores are available
*/
- public boolean needsUpdate() {
+ public synchronized boolean needsUpdate() {
log.info("Checking for updated scores.");
PluginsValues pluginsValues = null;
- // Check for updated scores
- try {
- pluginsValues = ScoresManager.getLatestScores();
- } catch (GetScoresException e) {
- log.warn("Failed to get lates scores.");
- }
-
- // Perform save if needed
- if ((pluginsValues == null) || needsSave(pluginsValues.getDate())){
-
+ if (needsSave(updateDate)) {
+
try {
ScoresManager.save(projects, pluginsConf);
+
+ pluginsValues = ScoresManager.getLatestScores();
+
} catch (ScoresSaveException e) {
- log.warn("Sending \"save\" request failed.");
+ log.warn("Saving scores failed.");
+ } catch (GetScoresException e) {
+ log.warn("Failed to get lates scores.");
}
}
- // Refresh if scores are new
- if ((pluginsValues != null) &&
- (pluginsValues.getDate() != updateDate)) {
+ if (pluginsValues != null) {
+ log.info("Refreshing scores...");
refreshScores(pluginsValues);
}
@@ -256,14 +245,10 @@
private void refreshScores(PluginsValues pluginsValues) {
- log.info("Refreshing scores...");
-
mainPageColumns.update(pluginsValues);
matrixTemplate.update(pluginsValues);
updateDate = pluginsValues.getDate();
-
- log.info("Finished refreshing scores.");
}
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -68,12 +68,14 @@
/* Called only when some of the watched resources changes. */
public void update(String key, StatusDescriptor currentObject,
Map<String, ChangeType> changes) {
+ System.out.println("update/resource");
put(key, getDesc(key));
}
@Override
/* Called to check if updated scores are available. */
public void update(String key, StatusDescriptor desc) {
+ System.out.println("update/timeout");
desc.update();
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -94,6 +94,7 @@
if (status != null) {
+ context = new DelegateContext();
status.fillContext(context);
projectContexts = status.getProjectContexts();
@@ -103,7 +104,6 @@
public DelegateContext getContext() {
- update();
return context;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -7,14 +7,9 @@
public static final int MAX_ATTEMPTS = 10;
- public static final String QUEUE_NAME = "queue/jmm";
-
- public static final String NAME_PROPERTY = "name";
- public static final String SAVE_MESSAGE = "save";
+ public static final String STATUS_LOCAL_SERVICE = "java:/Status/LocalScoresService";
+ public static final String STATUS_REMOTE_SERVICE = "java:/Status/RemoteScoresService";
- public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService";
- public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService";
-
public static final long CACHE_INTERVAL = 5*60*1000; /* milliseconds */
/**
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -1,97 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.forge.status.service.impl;
-
-import java.util.List;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-
-import org.jboss.forge.common.projects.Projects;
-
-import org.jboss.forge.status.common.Constants;
-import org.jboss.forge.status.exceptions.ScoresSaveException;
-import org.jboss.forge.status.service.protocol.PluginConf;
-import org.jboss.forge.status.service.protocol.SaveRequest;
-
-import org.jboss.forge.status.tools.ScoresManager;
-import org.jboss.logging.Logger;
-
-
-/**
-* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
-*/
-
-@MessageDriven(activateConfig =
-{
- @ActivationConfigProperty(propertyName="destinationType",
- propertyValue="javax.jms.Queue"),
- @ActivationConfigProperty(propertyName="destination",
- propertyValue=Constants.QUEUE_NAME)
-})
-public class ScoresMDB implements MessageListener {
-
- private static Logger log = Logger.getLogger(ScoresMDB.class);
-
- synchronized public void onMessage(Message msg) {
-
- ObjectMessage message = (ObjectMessage) msg;
-
- String requestName = null;
-
- try {
- requestName = message.getStringProperty(Constants.NAME_PROPERTY);
- log.info("Request name: " + requestName);
-
- if (requestName.equals(Constants.SAVE_MESSAGE)) {
-
- SaveRequest saveRequest = (SaveRequest) message.getObject();
- handleRequest(saveRequest);
- } else {
- log.info("Unknown request: " + requestName);
- }
-
- log.info("Finished processing request: " + requestName);
-
- } catch (JMSException e) {
- log.warn("Error processing request: " + requestName, e);
- }
- }
-
- private static void handleRequest(SaveRequest saveRequest) {
-
- Projects projects = saveRequest.getProjects();
- List<PluginConf> pluginsConf = saveRequest.getPluginsConf();
-
- try {
- ScoresManager.saveSync(projects, pluginsConf);
- } catch (ScoresSaveException e) {
- log.warn("Error processing save request.", e);
- }
- }
-
-}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -136,7 +136,7 @@
* @param pluginsValues PluginsValues to save
* @throws ScoresSaveException
*/
- private void save(Node node, PluginsValuesImpl pluginsValues)
+ private synchronized void save(Node node, PluginsValuesImpl pluginsValues)
throws ScoresSaveException {
try {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-24 10:04:17 UTC (rev 4811)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-06-24 11:24:17 UTC (rev 4812)
@@ -22,18 +22,10 @@
package org.jboss.forge.status.tools;
-import java.io.Serializable;
import java.util.Calendar;
import java.util.List;
import java.util.Properties;
-import javax.jms.JMSException;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
@@ -45,10 +37,8 @@
import org.jboss.forge.status.service.ScoresService;
import org.jboss.forge.status.service.ScoresServiceLocal;
import org.jboss.forge.status.service.ScoresServiceRemote;
-import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl;
import org.jboss.forge.status.service.protocol.PluginConf;
import org.jboss.forge.status.service.protocol.PluginsValues;
-import org.jboss.forge.status.service.protocol.SaveRequest;
import org.jboss.forge.status.service.protocol.ServiceConf;
import org.jboss.forge.status.common.Constants;
@@ -69,21 +59,8 @@
properties = serviceConf.getProperties();
isRemote = serviceConf.isRemote();
}
-
- public static void save(Projects projects, List<PluginConf> pluginsConf)
- throws ScoresSaveException {
- SaveRequest saveRequest = new SaveRequestImpl(pluginsConf, projects);
-
- // Send message
- try {
- sendMessage(Constants.SAVE_MESSAGE, saveRequest);
- } catch (Exception e) {
- throw new ScoresSaveException(e);
- }
- }
-
- public static void saveSync(Projects projects,
+ public static void save(Projects projects,
List<PluginConf> pluginsConf)
throws ScoresSaveException {
@@ -218,37 +195,5 @@
return service;
}
-
- private static void sendMessage(String name, Serializable request) throws
- NamingException, JMSException {
-
- Queue queue = null;
- QueueConnection connection = null;
- QueueSession session = null;
- QueueSender sender = null;
-
- Context context = null;
- if (isRemote) {
- context = new InitialContext(properties);
- } else {
- context = new InitialContext();
- }
-
- queue = (Queue) context.lookup(Constants.QUEUE_NAME);
- QueueConnectionFactory factory =
- (QueueConnectionFactory) context.lookup("java:/ConnectionFactory");
- connection = factory.createQueueConnection();
- session = connection.createQueueSession(false,
- QueueSession.AUTO_ACKNOWLEDGE);
-
- // Create a message
- ObjectMessage message = session.createObjectMessage();
- message.setStringProperty("name", name);
- message.setObject(request);
-
- sender = session.createSender(queue);
- sender.send(message);
- session.close ();
- }
}
|
|
From: <jbo...@li...> - 2006-06-24 10:04:24
|
Author: unibrew
Date: 2006-06-24 06:04:17 -0400 (Sat, 24 Jun 2006)
New Revision: 4811
Modified:
labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
Log:
[JBFORUMS-44] Working on pagination, bundle issues, authorization.
Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java 2006-06-24 10:04:17 UTC (rev 4811)
@@ -170,6 +170,7 @@
{
JSFUtil.handleException(e);
}
+ System.out.println("HEEEEEELLLLLLLLLLOOOOOOOOOOOOO");
return "success";
}
@@ -263,6 +264,7 @@
FacesContext.getCurrentInstance().addMessage("message",
new FacesMessage(FacesMessage.SEVERITY_INFO,message, "moderate"));
this.forum = BaseController.getForumsModule().findForumById(forum.getId());
+
checkboxes=new HashMap();
} catch (Exception e)
{
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/WEB-INF/forums-config.xml 2006-06-24 10:04:17 UTC (rev 4811)
@@ -78,7 +78,11 @@
<key>message</key>
<value>/views/profile/usermessage_body.jsf</value>
</map-entry>
- </map-entries>
+ <map-entry>
+ <key>moderator</key>
+ <value>/views/moderator/modcp_body.jsf</value>
+ </map-entry>
+ </map-entries>
</managed-property>
</managed-bean>
@@ -280,7 +284,12 @@
<managed-bean-name>moderator</managed-bean-name>
<managed-bean-class>org.jboss.portlet.forums.ui.action.ModeratorAction</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
- </managed-bean>
+ <managed-property>
+ <property-name>userPreferences</property-name>
+ <property-class>org.jboss.portlet.forums.ui.action.PreferenceController</property-class>
+ <value>#{prefController}</value>
+ </managed-property>
+ </managed-bean>
<navigation-rule>
<from-view-id>/views/moderator/modcp_body.xhtml</from-view-id>
<navigation-case>
@@ -289,7 +298,7 @@
</navigation-case>
<navigation-case>
<from-outcome>confirmMove</from-outcome>
- <to-view-id>/views/moderator/move_topic.xhtml</to-view-id>
+ <to-view-id>/views/moderator/modcp_move.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
<navigation-rule>
@@ -366,13 +375,27 @@
<to-view-id>/views/admin/index.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
-
+ <navigation-rule>
+ <from-view-id>/views/pref/index.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+ <to-view-id>/views/category/viewcategory_body.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
+
+ <navigation-rule>
+ <from-view-id>/views/moderator/modcp_move.xhtml</from-view-id>
+ <navigation-case>
+ <from-outcome>success</from-outcome>
+ <to-view-id>/views/moderator/modcp_body.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
<!-- managedBean for the user preference usecase -->
<managed-bean>
<managed-bean-name>prefController</managed-bean-name>
<managed-bean-class>org.jboss.portlet.forums.ui.action.PreferenceController</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
+ <managed-bean-scope>session</managed-bean-scope>
<managed-property>
<property-name>defaultPreferences</property-name>
<map-entries>
@@ -428,19 +451,4 @@
</map-entries>
</managed-property>
</managed-bean>
- <navigation-rule>
- <from-view-id>/views/pref/index.xhtml</from-view-id>
- <navigation-case>
- <from-outcome>success</from-outcome>
- <to-view-id>/views/category/viewcategory_body.xhtml</to-view-id>
- </navigation-case>
- </navigation-rule>
-
-
- <managed-bean>
- <managed-bean-name>deleteTopic</managed-bean-name>
- <managed-bean-class>org.jboss.portlet.forums.ui.action.DeleteTopic</managed-bean-class>
- <managed-bean-scope>request</managed-bean-scope>
- </managed-bean>
-
</faces-config>
\ No newline at end of file
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/forums/viewforum_body.xhtml 2006-06-24 10:04:17 UTC (rev 4811)
@@ -98,14 +98,14 @@
<td align="right" valign="middle" nowrap="nowrap">
<span class="gensmall"></span><br/>
<span class="nav">
- Goto page
+ {resource.Goto_page}
<!-- previous link -->
<c:if test="#{forum.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
<f:param name="f" value="#{forum.forum.id}"/>
<f:param name="page" value="#{forum.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -133,7 +133,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
<f:param name="f" value="#{forum.forum.id}"/>
<f:param name="page" value="#{forum.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -522,14 +522,14 @@
<td align="right" valign="middle" nowrap="nowrap">
<span class="gensmall"></span><br/>
<span class="nav">
- Goto page
+ ${resource.Goto_page}
<!-- previous link -->
<c:if test="#{forum.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
<f:param name="f" value="#{forum.forum.id}"/>
<f:param name="page" value="#{forum.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -557,7 +557,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}">
<f:param name="f" value="#{forum.forum.id}"/>
<f:param name="page" value="#{forum.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -573,7 +573,12 @@
<tr>
<td align="left" colspan="3">
<span class="nav">
- Page <b>#{forum.pageNavigator.pageNumber}</b> of <b>#{forum.pageNavigator.totalPages}</b>
+ <b>
+ <h:outputFormat value="#{resource.PageNumber}">
+ <f:param value="${forum.pageNavigator.pageNumber}"/>
+ <f:param value="${forum.pageNavigator.totalPages}"/>
+ </h:outputFormat>
+ </b>
</span>
</td>
</tr>
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2006-06-24 10:04:17 UTC (rev 4811)
@@ -33,6 +33,8 @@
<ui:define name="mainContent">
<c:choose>
<c:when test="#{moderator.initialized && moderator.forum!=null && moderator.forum.id!=-1}">
+
+<forums:isAllowed fragment="acl://moderateForum" contextData="#{moderator.forum}">
<h:messages layout="table" infoStyle="color:green"
warnStyle="color:red"/>
<h:form>
@@ -49,14 +51,12 @@
</h:outputLink>
</span>
</td>
- </tr>
- <tr>
<!-- page navigation -->
<c:if test="#{moderator.pageNavigator.totalPages gt 1}">
<td align="right" valign="middle" nowrap="nowrap">
<br/>
<span class="nav">
- Goto page
+ ${resource.Goto_page}
<!-- previous link -->
<c:if test="#{moderator.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
@@ -64,7 +64,7 @@
<f:param name="f" value="#{moderator.forum.id}"/>
<f:param name="page"
value="#{moderator.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -95,7 +95,7 @@
<f:param name="f" value="#{moderator.forum.id}"/>
<f:param name="page"
value="#{moderator.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -158,44 +158,102 @@
<h:commandButton action="#{moderator.deleteConfirm}"
class="liteoption"
value="${resource.Delete}">
- <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
&nbsp;
<h:commandButton action="#{moderator.moveConfirm}"
class="liteoption"
value="${resource.Move}">
- <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
&nbsp;
<h:commandButton action="#{moderator.lockTopic}"
class="liteoption"
value="${resource.Lock}">
- <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
&nbsp;
<h:commandButton action="#{moderator.unlockTopic}"
class="liteoption"
value="${resource.Unlock}">
- <f:param name="f" value="#{forum.forum.id}"/>
+ <f:param name="f" value="#{moderator.forum.id}"/>
</h:commandButton>
</td>
</tr>
</table>
- <table width="100%" cellspacing="2" border="0" align="center"
- cellpadding="2">
- <!--<tr>
- <td align="left" valign="middle">
- <span class="nav">
- <b>#{moderator.pagination}</b>
- </span>
- </td>
- <td align="right" valign="top" nowrap="nowrap">
- <br/>
- <span class="nav">#{moderator.pageNumber}</span>
- </td>
- </tr>-->
- </table>
- </h:form>
+ <table width="100%" cellspacing="2" border="0" align="center"
+ cellpadding="2">
+ <tr>
+ <!-- the current page number information -->
+ <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
+ <td align="left" colspan="3">
+ <span class="nav">
+ <b>
+ <h:outputFormat value="#{resource.PageNumber}">
+ <f:param value="${moderator.pageNavigator.pageNumber}"/>
+ <f:param value="${moderator.pageNavigator.totalPages}"/>
+ </h:outputFormat>
+ </b>
+ </span>
+ </td>
+ </c:if>
+ <!-- page navigation -->
+ <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
+ <td align="right" valign="middle" nowrap="nowrap">
+ <br/>
+ <span class="nav">
+ ${resource.Goto_page}
+ <!-- previous link -->
+ <c:if test="#{moderator.pageNavigator.pageNumber gt 1}">
+ &nbsp;&nbsp;
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f"
+ value="#{moderator.forum.id}"/>
+ <f:param name="page"
+ value="#{moderator.pageNavigator.currentPage-1}"/>
+ <h:outputText value="${resource.Previous}"/>
+ </h:outputLink>
+ &nbsp;&nbsp;
+ </c:if>
+ <!-- actual pages -->
+ <c:forEach items="#{moderator.pageNavigator.pages}"
+ var="page" varStatus="idx">
+ <c:choose>
+ <c:when test="#{moderator.pageNavigator.pageNumber==page}">
+ <b>${page}</b>
+ </c:when>
+ <c:otherwise>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f"
+ value="#{moderator.forum.id}"/>
+ <f:param name="page"
+ value="#{page-1}"/>
+ <h:outputText value="${page}"/>
+ </h:outputLink>
+ </c:otherwise>
+ </c:choose>
+ <c:if test="${idx.index-1 ne moderator.pageNavigator.totalPages-1}">
+ <f:verbatim>,</f:verbatim>
+ </c:if>
+ </c:forEach>
+ <!-- Next link -->
+ <c:if test="#{moderator.pageNavigator.pageNumber lt moderator.pageNavigator.totalPages}">
+ &nbsp;&nbsp;
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f"
+ value="#{moderator.forum.id}"/>
+ <f:param name="page"
+ value="#{moderator.pageNavigator.currentPage+1}"/>
+ <h:outputText value="${resource.Next}"/>
+ </h:outputLink>
+ &nbsp;&nbsp;
+ </c:if>
+ </span>
+ </td>
+ </c:if>
+ </tr>
+ </table>
+ </h:form>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="right">
@@ -203,29 +261,9 @@
</td>
</tr>
</table>
- </c:when>
- <c:otherwise>
- <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
- <tr>
- <td>
- <table width="100%" cellspacing="0" cellpadding="1" border="0">
- <tr>
- <td>&nbsp;</td>
- </tr>
- <tr>
- <td align="center">
- <span class="gen">This forum has no posts....</span>
- </td>
- </tr>
- <tr>
- <td>&nbsp;</td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </c:otherwise>
- </c:choose>
+ </forums:isAllowed>
+</c:when>
+</c:choose>
</ui:define>
</ui:composition>
</div>
\ No newline at end of file
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-06-23 05:35:41 UTC (rev 4810)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/topics/viewtopic_body.xhtml 2006-06-24 10:04:17 UTC (rev 4811)
@@ -52,14 +52,14 @@
<td align="right" valign="middle" nowrap="nowrap">
<span class="gensmall"></span><br/>
<span class="nav">
- Goto page
+ ${resource.Goto_page}
<!-- previous link -->
<c:if test="#{topic.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topic.topic.id}"/>
<f:param name="page" value="#{topic.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -87,7 +87,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topic.topic.id}"/>
<f:param name="page" value="#{topic.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -614,14 +614,14 @@
<td align="right" valign="middle" nowrap="nowrap">
<span class="gensmall"></span><br/>
<span class="nav">
- Goto page
+ ${resource.Goto_page}
<!-- previous link -->
<c:if test="#{topic.pageNavigator.pageNumber gt 1}">
&nbsp;&nbsp;
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topic.topic.id}"/>
<f:param name="page" value="#{topic.pageNavigator.currentPage-1}"/>
- <h:outputText value="Previous"/>
+ <h:outputText value="${resource.Previous}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -649,7 +649,7 @@
<h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}">
<f:param name="t" value="#{topic.topic.id}"/>
<f:param name="page" value="#{topic.pageNavigator.currentPage+1}"/>
- <h:outputText value="Next"/>
+ <h:outputText value="${resource.Next}"/>
</h:outputLink>
&nbsp;&nbsp;
</c:if>
@@ -665,7 +665,12 @@
<tr>
<td align="left" colspan="3">
<span class="nav">
- Page <b>#{topic.pageNavigator.pageNumber}</b> of <b>#{topic.pageNavigator.totalPages}</b>
+ <b>
+ <h:outputFormat value="#{resource.PageNumber}">
+ <f:param value="${topic.pageNavigator.pageNumber}"/>
+ <f:param value="${topic.pageNavigator.totalPages}"/>
+ </h:outputFormat>
+ </b>
</span>
</td>
</tr>
@@ -777,7 +782,7 @@
</tr>
<tr>
<td align="center">
- <span class="gen">This topic has no posts....</span>
+ <span class="gen">${resource.No_posts_topic}</span>
</td>
</tr>
<tr>
|
|
From: <jbo...@li...> - 2006-06-23 16:01:49
|
Author: tom...@jb... Date: 2006-06-23 12:01:42 -0400 (Fri, 23 Jun 2006) New Revision: 501 Modified: trunk/docs/wscompileIssues.txt Log: testing notification Modified: trunk/docs/wscompileIssues.txt =================================================================== --- trunk/docs/wscompileIssues.txt 2006-06-22 09:26:14 UTC (rev 500) +++ trunk/docs/wscompileIssues.txt 2006-06-23 16:01:42 UTC (rev 501) @@ -7,3 +7,4 @@ 5. When <xsd:anyAttribute/> is added to a schema type, wscompile will not generate the java type for that schema type. It generates a literalserializer class instead. 6. When <xsd:element name="street" substitutionGroup="avenue"/> substitutionGroup will make wscompile to not generate a Java class but a literalserializer class. 7. Noticed an issue with Nillable Types where wscompile does not generate accessors for byte. This is the reason for the sole failure in XSDToJavaTestCase. + |
|
From: <jbo...@li...> - 2006-06-23 05:35:49
|
Author: mic...@jb... Date: 2006-06-23 01:35:41 -0400 (Fri, 23 Jun 2006) New Revision: 4810 Modified: labs/jbossrules/trunk/documentation/training/developers-course/Module 4 - Rule Engine Concepts 2.odp Log: almost no progress today Modified: labs/jbossrules/trunk/documentation/training/developers-course/Module 4 - Rule Engine Concepts 2.odp =================================================================== (Binary files differ) |
|
From: <jbo...@li...> - 2006-06-23 04:09:49
|
Author: mic...@jb...
Date: 2006-06-23 00:09:45 -0400 (Fri, 23 Jun 2006)
New Revision: 4809
Modified:
labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-Rete_Algorithm.xml
Log:
corrected typo
Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-Rete_Algorithm.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-Rete_Algorithm.xml 2006-06-23 01:55:08 UTC (rev 4808)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Rule_Engine/Section-Rete_Algorithm.xml 2006-06-23 04:09:45 UTC (rev 4809)
@@ -154,7 +154,7 @@
Cheese( $chedddar : name == "cheddar" )
$person : Person( favouriteCheese != $cheddar )
then
- System.out.println( $person.getName() + " does likes cheddar" );
+ System.out.println( $person.getName() + " does not like cheddar" );
end</programlisting>
<para>As you can see the compiled Rete network shows the alpha node is
|
|
From: <jbo...@li...> - 2006-06-23 01:55:16
|
Author: mic...@jb...
Date: 2006-06-22 21:55:08 -0400 (Thu, 22 Jun 2006)
New Revision: 4808
Added:
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_OrWithBindings.drl
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
Log:
JBRULES-319 - not fixed, just tests.
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-06-23 00:47:08 UTC (rev 4807)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-06-23 01:55:08 UTC (rev 4808)
@@ -2330,7 +2330,31 @@
assertTrue( list.contains( "fired1" ) );
assertTrue( list.contains( "fired3" ) );
}
+
+ public void FIXME_testOrWithBinding() throws Exception {
+ final PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( new InputStreamReader(
+ getClass().getResourceAsStream( "test_OrWithBindings.drl" ) ) );
+ final Package pkg = builder.getPackage();
+
+ final RuleBase ruleBase = getRuleBase();
+ ruleBase.addPackage( pkg );
+ final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+
+ final List list = new ArrayList();
+ workingMemory.setGlobal( "results",
+ list );
+
+ workingMemory.assertObject( new Integer(42) );
+ workingMemory.assertObject( "hola" );
+ workingMemory.fireAllRules();
+
+ assertTrue( list.contains( "hola" ) );
+ assertEquals(1, list.size() );
+
+ }
+
protected Object serializeIn(final byte[] bytes) throws IOException,
ClassNotFoundException {
final ObjectInput in = new ObjectInputStream( new ByteArrayInputStream( bytes ) );
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_OrWithBindings.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_OrWithBindings.drl 2006-06-23 00:47:08 UTC (rev 4807)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_OrWithBindings.drl 2006-06-23 01:55:08 UTC (rev 4808)
@@ -0,0 +1,13 @@
+package com.sample
+
+global java.util.List results
+
+rule "MyRule"
+ when
+ (Integer() ||
+ Long())
+ s: String()
+ then
+ System.out.println("result is " + s);
+ results.add(s);
+end
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_OrWithBindings.drl
___________________________________________________________________
Name: svn:eol-style
+ native
|
Author: mic...@jb...
Date: 2006-06-22 20:47:08 -0400 (Thu, 22 Jun 2006)
New Revision: 4807
Added:
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/test_EndPosition.drl
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParserLexer.java
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/lang/drl.g
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
Log:
records end position of ColumnDescrs
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java 2006-06-22 07:57:57 UTC (rev 4806)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java 2006-06-23 00:47:08 UTC (rev 4807)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-06-02 15:44:54
+// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-06-23 10:19:38
package org.drools.lang;
import java.util.List;
@@ -3307,10 +3307,11 @@
// $ANTLR start fact
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:666:1: fact returns [PatternDescr d] : id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol ')' opt_eol ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:666:1: fact returns [PatternDescr d] : id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol ;
public PatternDescr fact() throws RecognitionException {
PatternDescr d;
Token loc=null;
+ Token endLoc=null;
String id = null;
List c = null;
@@ -3320,8 +3321,8 @@
d=null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:670:17: (id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol ')' opt_eol )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:670:17: id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol ')' opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:670:17: (id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:670:17: id= dotted_name opt_eol loc= '(' opt_eol (c= constraints )? opt_eol endLoc= ')' opt_eol
{
following.push(FOLLOW_dotted_name_in_fact1614);
id=dotted_name();
@@ -3369,13 +3370,16 @@
opt_eol();
following.pop();
- match(input,25,FOLLOW_25_in_fact1660);
- following.push(FOLLOW_opt_eol_in_fact1662);
+ endLoc=(Token)input.LT(1);
+ match(input,25,FOLLOW_25_in_fact1662);
+ following.push(FOLLOW_opt_eol_in_fact1664);
opt_eol();
following.pop();
- Token end = input.LT(-1);
- d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
+
+ d.setEndLocation( offset(endLoc.getLine()), endLoc.getCharPositionInLine() );
+
+
}
}
@@ -3391,21 +3395,21 @@
// $ANTLR start constraints
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:687:1: constraints returns [List constraints] : opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:690:1: constraints returns [List constraints] : opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol ;
public List constraints() throws RecognitionException {
List constraints;
constraints = new ArrayList();
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:691:17: ( opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:691:17: opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:694:17: ( opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:694:17: opt_eol ( constraint[constraints] | predicate[constraints] ) ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )* opt_eol
{
- following.push(FOLLOW_opt_eol_in_constraints1687);
+ following.push(FOLLOW_opt_eol_in_constraints1696);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:692:17: ( constraint[constraints] | predicate[constraints] )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:695:17: ( constraint[constraints] | predicate[constraints] )
int alt48=2;
int LA48_0 = input.LA(1);
if ( LA48_0==EOL||LA48_0==15 ) {
@@ -3425,7 +3429,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("692:17: ( constraint[constraints] | predicate[constraints] )", 48, 8, input);
+ new NoViableAltException("695:17: ( constraint[constraints] | predicate[constraints] )", 48, 8, input);
throw nvae;
}
@@ -3435,7 +3439,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("692:17: ( constraint[constraints] | predicate[constraints] )", 48, 3, input);
+ new NoViableAltException("695:17: ( constraint[constraints] | predicate[constraints] )", 48, 3, input);
throw nvae;
}
@@ -3445,22 +3449,22 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("692:17: ( constraint[constraints] | predicate[constraints] )", 48, 2, input);
+ new NoViableAltException("695:17: ( constraint[constraints] | predicate[constraints] )", 48, 2, input);
throw nvae;
}
}
else {
NoViableAltException nvae =
- new NoViableAltException("692:17: ( constraint[constraints] | predicate[constraints] )", 48, 0, input);
+ new NoViableAltException("695:17: ( constraint[constraints] | predicate[constraints] )", 48, 0, input);
throw nvae;
}
switch (alt48) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:692:18: constraint[constraints]
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:695:18: constraint[constraints]
{
- following.push(FOLLOW_constraint_in_constraints1692);
+ following.push(FOLLOW_constraint_in_constraints1701);
constraint(constraints);
following.pop();
@@ -3468,9 +3472,9 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:692:42: predicate[constraints]
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:695:42: predicate[constraints]
{
- following.push(FOLLOW_predicate_in_constraints1695);
+ following.push(FOLLOW_predicate_in_constraints1704);
predicate(constraints);
following.pop();
@@ -3480,25 +3484,25 @@
}
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:17: ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:17: ( opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] ) )*
loop50:
do {
int alt50=2;
alt50 = dfa50.predict(input);
switch (alt50) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:19: opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:19: opt_eol ',' opt_eol ( constraint[constraints] | predicate[constraints] )
{
- following.push(FOLLOW_opt_eol_in_constraints1703);
+ following.push(FOLLOW_opt_eol_in_constraints1712);
opt_eol();
following.pop();
- match(input,24,FOLLOW_24_in_constraints1705);
- following.push(FOLLOW_opt_eol_in_constraints1707);
+ match(input,24,FOLLOW_24_in_constraints1714);
+ following.push(FOLLOW_opt_eol_in_constraints1716);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:39: ( constraint[constraints] | predicate[constraints] )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:39: ( constraint[constraints] | predicate[constraints] )
int alt49=2;
int LA49_0 = input.LA(1);
if ( LA49_0==EOL||LA49_0==15 ) {
@@ -3518,7 +3522,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("693:39: ( constraint[constraints] | predicate[constraints] )", 49, 8, input);
+ new NoViableAltException("696:39: ( constraint[constraints] | predicate[constraints] )", 49, 8, input);
throw nvae;
}
@@ -3528,7 +3532,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("693:39: ( constraint[constraints] | predicate[constraints] )", 49, 3, input);
+ new NoViableAltException("696:39: ( constraint[constraints] | predicate[constraints] )", 49, 3, input);
throw nvae;
}
@@ -3538,22 +3542,22 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("693:39: ( constraint[constraints] | predicate[constraints] )", 49, 2, input);
+ new NoViableAltException("696:39: ( constraint[constraints] | predicate[constraints] )", 49, 2, input);
throw nvae;
}
}
else {
NoViableAltException nvae =
- new NoViableAltException("693:39: ( constraint[constraints] | predicate[constraints] )", 49, 0, input);
+ new NoViableAltException("696:39: ( constraint[constraints] | predicate[constraints] )", 49, 0, input);
throw nvae;
}
switch (alt49) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:40: constraint[constraints]
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:40: constraint[constraints]
{
- following.push(FOLLOW_constraint_in_constraints1710);
+ following.push(FOLLOW_constraint_in_constraints1719);
constraint(constraints);
following.pop();
@@ -3561,9 +3565,9 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:693:64: predicate[constraints]
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:696:64: predicate[constraints]
{
- following.push(FOLLOW_predicate_in_constraints1713);
+ following.push(FOLLOW_predicate_in_constraints1722);
predicate(constraints);
following.pop();
@@ -3582,7 +3586,7 @@
}
} while (true);
- following.push(FOLLOW_opt_eol_in_constraints1721);
+ following.push(FOLLOW_opt_eol_in_constraints1730);
opt_eol();
following.pop();
@@ -3602,7 +3606,7 @@
// $ANTLR start constraint
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:697:1: constraint[List constraints] : opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:700:1: constraint[List constraints] : opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol ;
public void constraint(List constraints) throws RecognitionException {
Token fb=null;
Token f=null;
@@ -3617,28 +3621,28 @@
PatternDescr d = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:701:17: ( opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:701:17: opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:704:17: ( opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:704:17: opt_eol (fb= ID opt_eol ':' opt_eol )? f= ID opt_eol (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )? opt_eol
{
- following.push(FOLLOW_opt_eol_in_constraint1740);
+ following.push(FOLLOW_opt_eol_in_constraint1749);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:702:17: (fb= ID opt_eol ':' opt_eol )?
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:705:17: (fb= ID opt_eol ':' opt_eol )?
int alt51=2;
alt51 = dfa51.predict(input);
switch (alt51) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:702:19: fb= ID opt_eol ':' opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:705:19: fb= ID opt_eol ':' opt_eol
{
fb=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_constraint1748);
- following.push(FOLLOW_opt_eol_in_constraint1750);
+ match(input,ID,FOLLOW_ID_in_constraint1757);
+ following.push(FOLLOW_opt_eol_in_constraint1759);
opt_eol();
following.pop();
- match(input,32,FOLLOW_32_in_constraint1752);
- following.push(FOLLOW_opt_eol_in_constraint1754);
+ match(input,32,FOLLOW_32_in_constraint1761);
+ following.push(FOLLOW_opt_eol_in_constraint1763);
opt_eol();
following.pop();
@@ -3649,7 +3653,7 @@
}
f=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_constraint1764);
+ match(input,ID,FOLLOW_ID_in_constraint1773);
if ( fb != null ) {
//System.err.println( "fb: " + fb.getText() );
@@ -3661,11 +3665,11 @@
constraints.add( d );
}
- following.push(FOLLOW_opt_eol_in_constraint1774);
+ following.push(FOLLOW_opt_eol_in_constraint1783);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:715:33: (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )?
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:718:33: (op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )?
int alt53=2;
int LA53_0 = input.LA(1);
if ( (LA53_0>=43 && LA53_0<=51) ) {
@@ -3676,13 +3680,13 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("715:33: (op= (\'==\'|\'>\'|\'>=\'|\'<\'|\'<=\'|\'!=\'|\'contains\'|\'matches\'|\'excludes\') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )?", 53, 0, input);
+ new NoViableAltException("718:33: (op= (\'==\'|\'>\'|\'>=\'|\'<\'|\'<=\'|\'!=\'|\'contains\'|\'matches\'|\'excludes\') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint ) )?", 53, 0, input);
throw nvae;
}
switch (alt53) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:715:41: op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:718:41: op= ('=='|'>'|'>='|'<'|'<='|'!='|'contains'|'matches'|'excludes') opt_eol (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
{
op=(Token)input.LT(1);
if ( (input.LA(1)>=43 && input.LA(1)<=51) ) {
@@ -3692,14 +3696,14 @@
else {
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint1782); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_constraint1791); throw mse;
}
- following.push(FOLLOW_opt_eol_in_constraint1869);
+ following.push(FOLLOW_opt_eol_in_constraint1878);
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:726:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:729:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )
int alt52=4;
switch ( input.LA(1) ) {
case ID:
@@ -3712,7 +3716,7 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("726:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 52, 1, input);
+ new NoViableAltException("729:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 52, 1, input);
throw nvae;
}
@@ -3729,17 +3733,17 @@
break;
default:
NoViableAltException nvae =
- new NoViableAltException("726:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 52, 0, input);
+ new NoViableAltException("729:41: (bvc= ID | lc= enum_constraint | lc= literal_constraint | rvc= retval_constraint )", 52, 0, input);
throw nvae;
}
switch (alt52) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:726:49: bvc= ID
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:729:49: bvc= ID
{
bvc=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_constraint1887);
+ match(input,ID,FOLLOW_ID_in_constraint1896);
d = new BoundVariableDescr( f.getText(), op.getText(), bvc.getText() );
d.setLocation( offset(f.getLine()), f.getCharPositionInLine() );
@@ -3749,9 +3753,9 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:733:49: lc= enum_constraint
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:736:49: lc= enum_constraint
{
- following.push(FOLLOW_enum_constraint_in_constraint1912);
+ following.push(FOLLOW_enum_constraint_in_constraint1921);
lc=enum_constraint();
following.pop();
@@ -3764,9 +3768,9 @@
}
break;
case 3 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:740:49: lc= literal_constraint
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:743:49: lc= literal_constraint
{
- following.push(FOLLOW_literal_constraint_in_constraint1944);
+ following.push(FOLLOW_literal_constraint_in_constraint1953);
lc=literal_constraint();
following.pop();
@@ -3779,9 +3783,9 @@
}
break;
case 4 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:746:49: rvc= retval_constraint
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:749:49: rvc= retval_constraint
{
- following.push(FOLLOW_retval_constraint_in_constraint1964);
+ following.push(FOLLOW_retval_constraint_in_constraint1973);
rvc=retval_constraint();
following.pop();
@@ -3802,7 +3806,7 @@
}
- following.push(FOLLOW_opt_eol_in_constraint1997);
+ following.push(FOLLOW_opt_eol_in_constraint2006);
opt_eol();
following.pop();
@@ -3822,7 +3826,7 @@
// $ANTLR start literal_constraint
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:757:1: literal_constraint returns [String text] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:760:1: literal_constraint returns [String text] : (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) ;
public String literal_constraint() throws RecognitionException {
String text;
Token t=null;
@@ -3831,10 +3835,10 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:761:17: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:761:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:17: ( (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' ) )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:761:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= 'null' )
int alt54=5;
switch ( input.LA(1) ) {
case STRING:
@@ -3854,53 +3858,53 @@
break;
default:
NoViableAltException nvae =
- new NoViableAltException("761:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= \'null\' )", 54, 0, input);
+ new NoViableAltException("764:17: (t= STRING | t= INT | t= FLOAT | t= BOOL | t= \'null\' )", 54, 0, input);
throw nvae;
}
switch (alt54) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:761:25: t= STRING
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:25: t= STRING
{
t=(Token)input.LT(1);
- match(input,STRING,FOLLOW_STRING_in_literal_constraint2024);
+ match(input,STRING,FOLLOW_STRING_in_literal_constraint2033);
text = getString( t );
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:762:25: t= INT
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:765:25: t= INT
{
t=(Token)input.LT(1);
- match(input,INT,FOLLOW_INT_in_literal_constraint2035);
+ match(input,INT,FOLLOW_INT_in_literal_constraint2044);
text = t.getText();
}
break;
case 3 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:763:25: t= FLOAT
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:766:25: t= FLOAT
{
t=(Token)input.LT(1);
- match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint2048);
+ match(input,FLOAT,FOLLOW_FLOAT_in_literal_constraint2057);
text = t.getText();
}
break;
case 4 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:764:25: t= BOOL
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:767:25: t= BOOL
{
t=(Token)input.LT(1);
- match(input,BOOL,FOLLOW_BOOL_in_literal_constraint2059);
+ match(input,BOOL,FOLLOW_BOOL_in_literal_constraint2068);
text = t.getText();
}
break;
case 5 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:765:25: t= 'null'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:768:25: t= 'null'
{
t=(Token)input.LT(1);
- match(input,52,FOLLOW_52_in_literal_constraint2071);
+ match(input,52,FOLLOW_52_in_literal_constraint2080);
text = null;
}
@@ -3924,7 +3928,7 @@
// $ANTLR start enum_constraint
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:769:1: enum_constraint returns [String text] : (cls= ID '.' en= ID ) ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:772:1: enum_constraint returns [String text] : (cls= ID '.' en= ID ) ;
public String enum_constraint() throws RecognitionException {
String text;
Token cls=null;
@@ -3934,17 +3938,17 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:773:17: ( (cls= ID '.' en= ID ) )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:773:17: (cls= ID '.' en= ID )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:17: ( (cls= ID '.' en= ID ) )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:17: (cls= ID '.' en= ID )
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:773:17: (cls= ID '.' en= ID )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:773:18: cls= ID '.' en= ID
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:17: (cls= ID '.' en= ID )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:18: cls= ID '.' en= ID
{
cls=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_enum_constraint2102);
- match(input,18,FOLLOW_18_in_enum_constraint2104);
+ match(input,ID,FOLLOW_ID_in_enum_constraint2111);
+ match(input,18,FOLLOW_18_in_enum_constraint2113);
en=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_enum_constraint2108);
+ match(input,ID,FOLLOW_ID_in_enum_constraint2117);
}
@@ -3965,7 +3969,7 @@
// $ANTLR start retval_constraint
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:776:1: retval_constraint returns [String text] : '(' c= paren_chunk ')' ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:779:1: retval_constraint returns [String text] : '(' c= paren_chunk ')' ;
public String retval_constraint() throws RecognitionException {
String text;
String c = null;
@@ -3975,15 +3979,15 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:781:17: ( '(' c= paren_chunk ')' )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:781:17: '(' c= paren_chunk ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:784:17: ( '(' c= paren_chunk ')' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:784:17: '(' c= paren_chunk ')'
{
- match(input,23,FOLLOW_23_in_retval_constraint2137);
- following.push(FOLLOW_paren_chunk_in_retval_constraint2141);
+ match(input,23,FOLLOW_23_in_retval_constraint2146);
+ following.push(FOLLOW_paren_chunk_in_retval_constraint2150);
c=paren_chunk();
following.pop();
- match(input,25,FOLLOW_25_in_retval_constraint2143);
+ match(input,25,FOLLOW_25_in_retval_constraint2152);
text = c;
}
@@ -4001,7 +4005,7 @@
// $ANTLR start predicate
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:784:1: predicate[List constraints] : decl= ID ':' field= ID '->' '(' text= paren_chunk ')' ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:787:1: predicate[List constraints] : decl= ID ':' field= ID '->' '(' text= paren_chunk ')' ;
public void predicate(List constraints) throws RecognitionException {
Token decl=null;
Token field=null;
@@ -4009,21 +4013,21 @@
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:786:17: (decl= ID ':' field= ID '->' '(' text= paren_chunk ')' )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:786:17: decl= ID ':' field= ID '->' '(' text= paren_chunk ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:789:17: (decl= ID ':' field= ID '->' '(' text= paren_chunk ')' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:789:17: decl= ID ':' field= ID '->' '(' text= paren_chunk ')'
{
decl=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_predicate2161);
- match(input,32,FOLLOW_32_in_predicate2163);
+ match(input,ID,FOLLOW_ID_in_predicate2170);
+ match(input,32,FOLLOW_32_in_predicate2172);
field=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_predicate2167);
- match(input,53,FOLLOW_53_in_predicate2169);
- match(input,23,FOLLOW_23_in_predicate2171);
- following.push(FOLLOW_paren_chunk_in_predicate2175);
+ match(input,ID,FOLLOW_ID_in_predicate2176);
+ match(input,53,FOLLOW_53_in_predicate2178);
+ match(input,23,FOLLOW_23_in_predicate2180);
+ following.push(FOLLOW_paren_chunk_in_predicate2184);
text=paren_chunk();
following.pop();
- match(input,25,FOLLOW_25_in_predicate2177);
+ match(input,25,FOLLOW_25_in_predicate2186);
PredicateDescr d = new PredicateDescr(field.getText(), decl.getText(), text );
constraints.add( d );
@@ -4044,7 +4048,7 @@
// $ANTLR start paren_chunk
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:793:1: paren_chunk returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:796:1: paren_chunk returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* ;
public String paren_chunk() throws RecognitionException {
String text;
Token any=null;
@@ -4055,10 +4059,10 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:799:18: ( ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:799:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:802:18: ( ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:802:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:799:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:802:18: ( options {greedy=false; } : '(' c= paren_chunk ')' | any= . )*
loop55:
do {
int alt55=3;
@@ -4134,14 +4138,14 @@
switch (alt55) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:800:25: '(' c= paren_chunk ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:803:25: '(' c= paren_chunk ')'
{
- match(input,23,FOLLOW_23_in_paren_chunk2223);
- following.push(FOLLOW_paren_chunk_in_paren_chunk2227);
+ match(input,23,FOLLOW_23_in_paren_chunk2232);
+ following.push(FOLLOW_paren_chunk_in_paren_chunk2236);
c=paren_chunk();
following.pop();
- match(input,25,FOLLOW_25_in_paren_chunk2229);
+ match(input,25,FOLLOW_25_in_paren_chunk2238);
if ( c == null ) {
c = "";
@@ -4156,7 +4160,7 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:811:19: any= .
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:814:19: any= .
{
any=(Token)input.LT(1);
matchAny(input);
@@ -4192,7 +4196,7 @@
// $ANTLR start paren_chunk2
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:823:1: paren_chunk2 returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:826:1: paren_chunk2 returns [String text] : ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* ;
public String paren_chunk2() throws RecognitionException {
String text;
Token any=null;
@@ -4203,10 +4207,10 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:829:18: ( ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:829:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:832:18: ( ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:832:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:829:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:832:18: ( options {greedy=false; } : '(' c= paren_chunk2 ')' | any= . )*
loop56:
do {
int alt56=3;
@@ -4280,14 +4284,14 @@
switch (alt56) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:830:25: '(' c= paren_chunk2 ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:833:25: '(' c= paren_chunk2 ')'
{
- match(input,23,FOLLOW_23_in_paren_chunk22300);
- following.push(FOLLOW_paren_chunk2_in_paren_chunk22304);
+ match(input,23,FOLLOW_23_in_paren_chunk22309);
+ following.push(FOLLOW_paren_chunk2_in_paren_chunk22313);
c=paren_chunk2();
following.pop();
- match(input,25,FOLLOW_25_in_paren_chunk22306);
+ match(input,25,FOLLOW_25_in_paren_chunk22315);
if ( c == null ) {
c = "";
@@ -4302,7 +4306,7 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:841:19: any= .
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:844:19: any= .
{
any=(Token)input.LT(1);
matchAny(input);
@@ -4338,7 +4342,7 @@
// $ANTLR start curly_chunk
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:852:1: curly_chunk returns [String text] : ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:855:1: curly_chunk returns [String text] : ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* ;
public String curly_chunk() throws RecognitionException {
String text;
Token any=null;
@@ -4349,10 +4353,10 @@
text = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:858:17: ( ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:858:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:861:17: ( ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:861:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:858:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:861:17: ( options {greedy=false; } : '{' c= curly_chunk '}' | any= . )*
loop57:
do {
int alt57=3;
@@ -4426,14 +4430,14 @@
switch (alt57) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:859:25: '{' c= curly_chunk '}'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:862:25: '{' c= curly_chunk '}'
{
- match(input,26,FOLLOW_26_in_curly_chunk2375);
- following.push(FOLLOW_curly_chunk_in_curly_chunk2379);
+ match(input,26,FOLLOW_26_in_curly_chunk2384);
+ following.push(FOLLOW_curly_chunk_in_curly_chunk2388);
c=curly_chunk();
following.pop();
- match(input,27,FOLLOW_27_in_curly_chunk2381);
+ match(input,27,FOLLOW_27_in_curly_chunk2390);
//System.err.println( "chunk [" + c + "]" );
if ( c == null ) {
@@ -4449,7 +4453,7 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:871:19: any= .
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:874:19: any= .
{
any=(Token)input.LT(1);
matchAny(input);
@@ -4486,7 +4490,7 @@
// $ANTLR start lhs_or
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:883:1: lhs_or returns [PatternDescr d] : left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:886:1: lhs_or returns [PatternDescr d] : left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* ;
public PatternDescr lhs_or() throws RecognitionException {
PatternDescr d;
PatternDescr left = null;
@@ -4498,16 +4502,16 @@
d = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:888:17: (left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:888:17: left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:891:17: (left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:891:17: left= lhs_and ( ('or'|'||') opt_eol right= lhs_and )*
{
OrDescr or = null;
- following.push(FOLLOW_lhs_and_in_lhs_or2439);
+ following.push(FOLLOW_lhs_and_in_lhs_or2448);
left=lhs_and();
following.pop();
d = left;
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:890:17: ( ('or'|'||') opt_eol right= lhs_and )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:893:17: ( ('or'|'||') opt_eol right= lhs_and )*
loop58:
do {
int alt58=2;
@@ -4519,7 +4523,7 @@
switch (alt58) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:890:19: ('or'|'||') opt_eol right= lhs_and
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:893:19: ('or'|'||') opt_eol right= lhs_and
{
if ( (input.LA(1)>=41 && input.LA(1)<=42) ) {
input.consume();
@@ -4528,14 +4532,14 @@
else {
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or2448); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_or2457); throw mse;
}
- following.push(FOLLOW_opt_eol_in_lhs_or2453);
+ following.push(FOLLOW_opt_eol_in_lhs_or2462);
opt_eol();
following.pop();
- following.push(FOLLOW_lhs_and_in_lhs_or2460);
+ following.push(FOLLOW_lhs_and_in_lhs_or2469);
right=lhs_and();
following.pop();
@@ -4560,17 +4564,6 @@
}
- if (d instanceof OrDescr) {
- List l = ((OrDescr) d).getDescrs();
- if (l != null && l.size() == 2) {
- PatternDescr subDescr = (PatternDescr) l.get(1);
- if (subDescr != null && (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0)) {
- Token end = input.LT(-1);
- d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
- }
- }
- }
-
}
catch (RecognitionException re) {
reportError(re);
@@ -4584,7 +4577,7 @@
// $ANTLR start lhs_and
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:904:1: lhs_and returns [PatternDescr d] : left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:907:1: lhs_and returns [PatternDescr d] : left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* ;
public PatternDescr lhs_and() throws RecognitionException {
PatternDescr d;
PatternDescr left = null;
@@ -4596,16 +4589,16 @@
d = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:909:17: (left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:909:17: left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:912:17: (left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:912:17: left= lhs_unary ( ('and'|'&&') opt_eol right= lhs_unary )*
{
AndDescr and = null;
- following.push(FOLLOW_lhs_unary_in_lhs_and2500);
+ following.push(FOLLOW_lhs_unary_in_lhs_and2509);
left=lhs_unary();
following.pop();
d = left;
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:911:17: ( ('and'|'&&') opt_eol right= lhs_unary )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:914:17: ( ('and'|'&&') opt_eol right= lhs_unary )*
loop59:
do {
int alt59=2;
@@ -4617,7 +4610,7 @@
switch (alt59) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:911:19: ('and'|'&&') opt_eol right= lhs_unary
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:914:19: ('and'|'&&') opt_eol right= lhs_unary
{
if ( (input.LA(1)>=54 && input.LA(1)<=55) ) {
input.consume();
@@ -4626,14 +4619,14 @@
else {
MismatchedSetException mse =
new MismatchedSetException(null,input);
- recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and2509); throw mse;
+ recoverFromMismatchedSet(input,mse,FOLLOW_set_in_lhs_and2518); throw mse;
}
- following.push(FOLLOW_opt_eol_in_lhs_and2514);
+ following.push(FOLLOW_opt_eol_in_lhs_and2523);
opt_eol();
following.pop();
- following.push(FOLLOW_lhs_unary_in_lhs_and2521);
+ following.push(FOLLOW_lhs_unary_in_lhs_and2530);
right=lhs_unary();
following.pop();
@@ -4657,18 +4650,7 @@
}
-
- if (d instanceof AndDescr) {
- List l = ((AndDescr) d).getDescrs();
- if (l != null && l.size() == 2) {
- PatternDescr subDescr = (PatternDescr) l.get(1);
- if (subDescr != null && (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0)) {
- Token end = input.LT(-1);
- d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
- }
- }
- }
-
+
}
catch (RecognitionException re) {
reportError(re);
@@ -4682,7 +4664,7 @@
// $ANTLR start lhs_unary
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:925:1: lhs_unary returns [PatternDescr d] : (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' ) ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:928:1: lhs_unary returns [PatternDescr d] : (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' ) ;
public PatternDescr lhs_unary() throws RecognitionException {
PatternDescr d;
PatternDescr u = null;
@@ -4692,10 +4674,10 @@
d = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:929:17: ( (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' ) )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:929:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:17: ( (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' ) )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' )
{
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:929:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | '(' u= lhs ')' )
int alt60=5;
switch ( input.LA(1) ) {
case 56:
@@ -4715,16 +4697,16 @@
break;
default:
NoViableAltException nvae =
- new NoViableAltException("929:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | \'(\' u= lhs \')\' )", 60, 0, input);
+ new NoViableAltException("932:17: (u= lhs_exist | u= lhs_not | u= lhs_eval | u= lhs_column | \'(\' u= lhs \')\' )", 60, 0, input);
throw nvae;
}
switch (alt60) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:929:25: u= lhs_exist
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:25: u= lhs_exist
{
- following.push(FOLLOW_lhs_exist_in_lhs_unary2559);
+ following.push(FOLLOW_lhs_exist_in_lhs_unary2568);
u=lhs_exist();
following.pop();
@@ -4732,9 +4714,9 @@
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:930:25: u= lhs_not
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:933:25: u= lhs_not
{
- following.push(FOLLOW_lhs_not_in_lhs_unary2567);
+ following.push(FOLLOW_lhs_not_in_lhs_unary2576);
u=lhs_not();
following.pop();
@@ -4742,9 +4724,9 @@
}
break;
case 3 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:931:25: u= lhs_eval
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:934:25: u= lhs_eval
{
- following.push(FOLLOW_lhs_eval_in_lhs_unary2575);
+ following.push(FOLLOW_lhs_eval_in_lhs_unary2584);
u=lhs_eval();
following.pop();
@@ -4752,9 +4734,9 @@
}
break;
case 4 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:932:25: u= lhs_column
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:935:25: u= lhs_column
{
- following.push(FOLLOW_lhs_column_in_lhs_unary2583);
+ following.push(FOLLOW_lhs_column_in_lhs_unary2592);
u=lhs_column();
following.pop();
@@ -4762,14 +4744,14 @@
}
break;
case 5 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:933:25: '(' u= lhs ')'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:936:25: '(' u= lhs ')'
{
- match(input,23,FOLLOW_23_in_lhs_unary2589);
- following.push(FOLLOW_lhs_in_lhs_unary2593);
+ match(input,23,FOLLOW_23_in_lhs_unary2598);
+ following.push(FOLLOW_lhs_in_lhs_unary2602);
u=lhs();
following.pop();
- match(input,25,FOLLOW_25_in_lhs_unary2595);
+ match(input,25,FOLLOW_25_in_lhs...
[truncated message content] |
|
From: <jbo...@li...> - 2006-06-22 07:58:04
|
Author: mic...@jb... Date: 2006-06-22 03:57:57 -0400 (Thu, 22 Jun 2006) New Revision: 4806 Modified: labs/jbossrules/trunk/documentation/training/developers-course/Module 4 - Rule Engine Concepts 2.odp Log: nearly done. Modified: labs/jbossrules/trunk/documentation/training/developers-course/Module 4 - Rule Engine Concepts 2.odp =================================================================== (Binary files differ) |
|
From: <jbo...@li...> - 2006-06-22 06:02:47
|
Author: szimano
Date: 2006-06-22 02:02:40 -0400 (Thu, 22 Jun 2006)
New Revision: 4805
Modified:
labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
Log:
utf-8 role problmes
Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2006-06-22 04:07:32 UTC (rev 4804)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java 2006-06-22 06:02:40 UTC (rev 4805)
@@ -394,7 +394,7 @@
if (fileName == null)
return null;
- File rolesFile = new File(pathToMedia + "/OLD/" + uid + "/" + fileName
+ File rolesFile = new File(pathToMedia + "/OLD/" + FileDSCommons.translateToFileName(uid) + "/" + fileName
+ ".properties");
if (!rolesFile.exists()) {
@@ -718,19 +718,19 @@
}
public int getPageMod(String pageName) {
- if (pageModProps.getProperty(pageName) == null) {
+ if (pageModProps.getProperty(FileDSCommons.translateToFileName(pageName)) == null) {
return (EDITABLE + VIEWABLE);
} else {
- return Integer.valueOf(pageModProps.getProperty(pageName));
+ return Integer.valueOf(pageModProps.getProperty(FileDSCommons.translateToFileName(pageName)));
}
}
public synchronized void setPageMod(String pageName, int mods) {
if (mods != (EDITABLE + VIEWABLE)) {
- pageModProps.setProperty(pageName, String.valueOf(mods));
+ pageModProps.setProperty(FileDSCommons.translateToFileName(pageName), String.valueOf(mods));
} else {
- pageModProps.remove(pageName);
+ pageModProps.remove(FileDSCommons.translateToFileName(pageName));
}
FileOutputStream fos = null;
@@ -887,7 +887,7 @@
public void saveMetadataProps(String uid, Properties props) {
getMetadataProps(uid); // this will create file if needed.
- File propsFile = new File(pathToMedia + "/OLD/" + uid
+ File propsFile = new File(pathToMedia + "/OLD/" + FileDSCommons.translateToFileName(uid)
+ "/metadata.properties");
FileOutputStream fos = null;
|
|
From: <jbo...@li...> - 2006-06-22 04:07:50
|
Author: mic...@jb...
Date: 2006-06-22 00:07:32 -0400 (Thu, 22 Jun 2006)
New Revision: 4804
Added:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/CompiledInvoker.java
Removed:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/CompiledInvoker.java
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.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
Log:
JBRULES-303 Moved CompiledInvoker interface to core so runtime can used serialized rules stand alone
Deleted: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/CompiledInvoker.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/CompiledInvoker.java 2006-06-22 02:27:59 UTC (rev 4803)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/CompiledInvoker.java 2006-06-22 04:07:32 UTC (rev 4804)
@@ -1,11 +0,0 @@
-package org.drools.semantics.java;
-
-import java.util.List;
-
-import org.drools.spi.Invoker;
-
-public interface CompiledInvoker
- extends
- Invoker {
- public List getMethodBytecode();
-}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg 2006-06-22 02:27:59 UTC (rev 4803)
+++ labs/jbossrules/trunk/drools-compiler/src/main/resources/org/drools/semantics/java/javaInvokers.stg 2006-06-22 04:07:32 UTC (rev 4804)
@@ -37,11 +37,11 @@
return true;
}
- if ( ! (object instanceof org.drools.semantics.java.CompiledInvoker) ) {
+ if ( ! (object instanceof org.drools.spi.CompiledInvoker) ) {
return false;
}
- org.drools.semantics.java.CompiledInvoker other = ( org.drools.semantics.java.CompiledInvoker ) object;
+ org.drools.spi.CompiledInvoker other = ( org.drools.spi.CompiledInvoker ) object;
return org.drools.util.asm.MethodComparator.compareBytecode( getMethodBytecode(), other.getMethodBytecode() );
}
@@ -56,7 +56,7 @@
returnValueInvoker(package, invokerClassName, ruleClassName, methodName, declarations, declarationTypes, globals, globalTypes, hashCode) ::= <<
package <package>;
-public class <invokerClassName> implements org.drools.spi.ReturnValueExpression, org.drools.semantics.java.CompiledInvoker
+public class <invokerClassName> implements org.drools.spi.ReturnValueExpression, org.drools.spi.CompiledInvoker
{
private static final long serialVersionUID = 7952983928232702826L;
@@ -84,7 +84,7 @@
declarations, declarationTypes, globals, globalTypes, hashCode) ::= <<
package <package>;
-public class <invokerClassName> implements org.drools.spi.PredicateExpression, org.drools.semantics.java.CompiledInvoker
+public class <invokerClassName> implements org.drools.spi.PredicateExpression, org.drools.spi.CompiledInvoker
{
private static final long serialVersionUID = 7952983928232702826L;
@@ -119,7 +119,7 @@
import org.drools.asm.util.TraceMethodVisitor;
import org.drools.util.asm.MethodComparator.Tracer;
-public class <invokerClassName> implements org.drools.spi.EvalExpression, org.drools.semantics.java.CompiledInvoker
+public class <invokerClassName> implements org.drools.spi.EvalExpression, org.drools.spi.CompiledInvoker
{
private static final long serialVersionUID = 7952983928232702826L;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2006-06-22 02:27:59 UTC (rev 4803)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2006-06-22 04:07:32 UTC (rev 4804)
@@ -63,7 +63,7 @@
import org.drools.rule.PredicateConstraint;
import org.drools.rule.ReturnValueConstraint;
import org.drools.rule.Rule;
-import org.drools.semantics.java.CompiledInvoker;
+import org.drools.spi.CompiledInvoker;
import org.drools.spi.Activation;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.PropagationContext;
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-22 02:27:59 UTC (rev 4803)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrs 2006-06-22 04:07:32 UTC (rev 4804)
@@ -7,144 +7,150 @@
<map>
<entry>
<string>org/drools/reteoo/Rule_Hello_World_2_0.class</string>
- <byte-array>yv66vgAAADAAJwcAAgEAJm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wBwAE
-AQAQamF2YS9sYW5nL09iamVjdAEABjxpbml0PgEAAygpVgEABENvZGUKAAMACQwABQAGAQAPTGlu
-ZU51bWJlclRhYmxlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAEdGhpcwEAKExvcmcvZHJvb2xzL3Jl
-dGVvby9SdWxlX0hlbGxvX1dvcmxkXzJfMDsBAAVldmFsMAEAAygpWgEACkV4Y2VwdGlvbnMHABIB
-ABNqYXZhL2xhbmcvRXhjZXB0aW9uAQALY29uc2VxdWVuY2UBACMoTG9yZy9kcm9vbHMvc3BpL0tu
-b3dsZWRnZUhlbHBlcjspVgkAFgAYBwAXAQAQamF2YS9sYW5nL1N5c3RlbQwAGQAaAQADb3V0AQAV
-TGphdmEvaW8vUHJpbnRTdHJlYW07CAAcAQAGZG9uZSAyCgAeACAHAB8BABNqYXZhL2lvL1ByaW50
-U3RyZWFtDAAhACIBAAdwcmludGxuAQAVKExqYXZhL2xhbmcvU3RyaW5nOylWAQAGZHJvb2xzAQAg
-TG9yZy9kcm9vbHMvc3BpL0tub3dsZWRnZUhlbHBlcjsBAApTb3VyY2VGaWxlAQAZUnVsZV9IZWxs
-b19Xb3JsZF8yXzAuamF2YQAhAAEAAwAAAAAAAwABAAUABgABAAcAAAAvAAEAAQAAAAUqtwAIsQAA
-AAIACgAAAAYAAQAAAAUACwAAAAwAAQAAAAUADAANAAAACQAOAA8AAgAQAAAABAABABEABwAAACIA
-AQAAAAAAAgSsAAAAAgAKAAAABgABAAAABwALAAAAAgAAAAkAEwAUAAIAEAAAAAQAAQARAAcAAAA3
-AAIAAQAAAAmyABUSG7YAHbEAAAACAAoAAAAKAAIAAAAKAAgADAALAAAADAABAAAACQAjACQAAAAB
-ACUAAAACACY=</byte-array>
+ <byte-array>yv66vgAAADAALAcAAgEAJm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wBwAE
+AQAQamF2YS9sYW5nL09iamVjdAEAEHNlcmlhbFZlcnNpb25VSUQBAAFKAQANQ29uc3RhbnRWYWx1
+ZQVuXqy++rNzagEABjxpbml0PgEAAygpVgEABENvZGUKAAMADgwACgALAQAPTGluZU51bWJlclRh
+YmxlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAEdGhpcwEAKExvcmcvZHJvb2xzL3JldGVvby9SdWxl
+X0hlbGxvX1dvcmxkXzJfMDsBAAVldmFsMAEAAygpWgEACkV4Y2VwdGlvbnMHABcBABNqYXZhL2xh
+bmcvRXhjZXB0aW9uAQALY29uc2VxdWVuY2UBACMoTG9yZy9kcm9vbHMvc3BpL0tub3dsZWRnZUhl
+bHBlcjspVgkAGwAdBwAcAQAQamF2YS9sYW5nL1N5c3RlbQwAHgAfAQADb3V0AQAVTGphdmEvaW8v
+UHJpbnRTdHJlYW07CAAhAQAGZG9uZSAyCgAjACUHACQBABNqYXZhL2lvL1ByaW50U3RyZWFtDAAm
+ACcBAAdwcmludGxuAQAVKExqYXZhL2xhbmcvU3RyaW5nOylWAQAGZHJvb2xzAQAgTG9yZy9kcm9v
+bHMvc3BpL0tub3dsZWRnZUhlbHBlcjsBAApTb3VyY2VGaWxlAQAZUnVsZV9IZWxsb19Xb3JsZF8y
+XzAuamF2YQAhAAEAAwAAAAEAGgAFAAYAAQAHAAAAAgAIAAMAAQAKAAsAAQAMAAAALwABAAEAAAAF
+KrcADbEAAAACAA8AAAAGAAEAAAAFABAAAAAMAAEAAAAFABEAEgAAAAkAEwAUAAIAFQAAAAQAAQAW
+AAwAAAAiAAEAAAAAAAIErAAAAAIADwAAAAYAAQAAAAgAEAAAAAIAAAAJABgAGQACABUAAAAEAAEA
+FgAMAAAANwACAAEAAAAJsgAaEiC2ACKxAAAAAgAPAAAACgACAAAACwAIAA0AEAAAAAwAAQAAAAkA
+KAApAAAAAQAqAAAAAgAr</byte-array>
</entry>
<entry>
<string>org/drools/reteoo/Rule_Hello_World_1_0.class</string>
- <byte-array>yv66vgAAADAAJQcAAgEAJm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMV8wBwAE
-AQAQamF2YS9sYW5nL09iamVjdAEABjxpbml0PgEAAygpVgEABENvZGUKAAMACQwABQAGAQAPTGlu
-ZU51bWJlclRhYmxlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAEdGhpcwEAKExvcmcvZHJvb2xzL3Jl
-dGVvby9SdWxlX0hlbGxvX1dvcmxkXzFfMDsBAAtjb25zZXF1ZW5jZQEAIyhMb3JnL2Ryb29scy9z
-cGkvS25vd2xlZGdlSGVscGVyOylWAQAKRXhjZXB0aW9ucwcAEgEAE2phdmEvbGFuZy9FeGNlcHRp
-b24JABQAFgcAFQEAEGphdmEvbGFuZy9TeXN0ZW0MABcAGAEAA291dAEAFUxqYXZhL2lvL1ByaW50
-U3RyZWFtOwgAGgEABmRvbmUgMQoAHAAeBwAdAQATamF2YS9pby9QcmludFN0cmVhbQwAHwAgAQAH
-cHJpbnRsbgEAFShMamF2YS9sYW5nL1N0cmluZzspVgEABmRyb29scwEAIExvcmcvZHJvb2xzL3Nw
-aS9Lbm93bGVkZ2VIZWxwZXI7AQAKU291cmNlRmlsZQEAGVJ1bGVfSGVsbG9fV29ybGRfMV8wLmph
-dmEAIQABAAMAAAAAAAIAAQAFAAYAAQAHAAAALwABAAEAAAAFKrcACLEAAAACAAoAAAAGAAEAAAAF
-AAsAAAAMAAEAAAAFAAwADQAAAAkADgAPAAIAEAAAAAQAAQARAAcAAAA3AAIAAQAAAAmyABMSGbYA
-G7EAAAACAAoAAAAKAAIAAAAHAAgACQALAAAADAABAAAACQAhACIAAAABACMAAAACACQ=</byte-array>
+ <byte-array>yv66vgAAADAAKgcAAgEAJm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMV8wBwAE
+AQAQamF2YS9sYW5nL09iamVjdAEAEHNlcmlhbFZlcnNpb25VSUQBAAFKAQANQ29uc3RhbnRWYWx1
+ZQVuXqy++rNzagEABjxpbml0PgEAAygpVgEABENvZGUKAAMADgwACgALAQAPTGluZU51bWJlclRh
+YmxlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAEdGhpcwEAKExvcmcvZHJvb2xzL3JldGVvby9SdWxl
+X0hlbGxvX1dvcmxkXzFfMDsBAAtjb25zZXF1ZW5jZQEAIyhMb3JnL2Ryb29scy9zcGkvS25vd2xl
+ZGdlSGVscGVyOylWAQAKRXhjZXB0aW9ucwcAFwEAE2phdmEvbGFuZy9FeGNlcHRpb24JABkAGwcA
+GgEAEGphdmEvbGFuZy9TeXN0ZW0MABwAHQEAA291dAEAFUxqYXZhL2lvL1ByaW50U3RyZWFtOwgA
+HwEABmRvbmUgMQoAIQAjBwAiAQATamF2YS9pby9QcmludFN0cmVhbQwAJAAlAQAHcHJpbnRsbgEA
+FShMamF2YS9sYW5nL1N0cmluZzspVgEABmRyb29scwEAIExvcmcvZHJvb2xzL3NwaS9Lbm93bGVk
+Z2VIZWxwZXI7AQAKU291cmNlRmlsZQEAGVJ1bGVfSGVsbG9fV29ybGRfMV8wLmphdmEAIQABAAMA
+AAABABoABQAGAAEABwAAAAIACAACAAEACgALAAEADAAAAC8AAQABAAAABSq3AA2xAAAAAgAPAAAA
+BgABAAAABQAQAAAADAABAAAABQARABIAAAAJABMAFAACABUAAAAEAAEAFgAMAAAANwACAAEAAAAJ
+sgAYEh62ACCxAAAAAgAPAAAACgACAAAACAAIAAoAEAAAAAwAAQAAAAkAJgAnAAAAAQAoAAAAAgAp
+</byte-array>
</entry>
<entry>
<string>org/drools/reteoo/Rule_Hello_World_2_0ConsequenceInvoker.class</string>
- <byte-array>yv66vgAAADAAMwcAAgEAOG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wQ29u
+ <byte-array>yv66vgAAADAAOAcAAgEAOG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wQ29u
c2VxdWVuY2VJbnZva2VyBwAEAQAQamF2YS9sYW5nL09iamVjdAcABgEAGm9yZy9kcm9vbHMvc3Bp
-L0NvbnNlcXVlbmNlAQAGPGluaXQ+AQADKClWAQAEQ29kZQoAAwALDAAHAAgBAA9MaW5lTnVtYmVy
-VGFibGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQA6TG9yZy9kcm9vbHMvcmV0ZW9vL1J1
-bGVfSGVsbG9fV29ybGRfMl8wQ29uc2VxdWVuY2VJbnZva2VyOwEACGV2YWx1YXRlAQA9KExvcmcv
-ZHJvb2xzL3NwaS9Lbm93bGVkZ2VIZWxwZXI7TG9yZy9kcm9vbHMvV29ya2luZ01lbW9yeTspVgEA
-CkV4Y2VwdGlvbnMHABQBABNqYXZhL2xhbmcvRXhjZXB0aW9uCwAWABgHABcBAB5vcmcvZHJvb2xz
-L3NwaS9Lbm93bGVkZ2VIZWxwZXIMABkAGgEACGdldFR1cGxlAQAYKClMb3JnL2Ryb29scy9zcGkv
-VHVwbGU7CwAWABwMAB0AHgEAB2dldFJ1bGUBABgoKUxvcmcvZHJvb2xzL3J1bGUvUnVsZTsKACAA
-IgcAIQEAFG9yZy9kcm9vbHMvcnVsZS9SdWxlDAAjACQBAA9nZXREZWNsYXJhdGlvbnMBACAoKVtM
-b3JnL2Ryb29scy9ydWxlL0RlY2xhcmF0aW9uOwoAJgAoBwAnAQAmb3JnL2Ryb29scy9yZXRlb28v
-UnVsZV9IZWxsb19Xb3JsZF8yXzAMACkAKgEAC2NvbnNlcXVlbmNlAQAjKExvcmcvZHJvb2xzL3Nw
-aS9Lbm93bGVkZ2VIZWxwZXI7KVYBAA9rbm93bGVkZ2VIZWxwZXIBACBMb3JnL2Ryb29scy9zcGkv
-S25vd2xlZGdlSGVscGVyOwEADXdvcmtpbmdNZW1vcnkBABpMb3JnL2Ryb29scy9Xb3JraW5nTWVt
-b3J5OwEABHJ1bGUBABZMb3JnL2Ryb29scy9ydWxlL1J1bGU7AQAKU291cmNlRmlsZQEAK1J1bGVf
-SGVsbG9fV29ybGRfMl8wQ29uc2VxdWVuY2VJbnZva2VyLmphdmEAIQABAAMAAQAFAAAAAgABAAcA
-CAABAAkAAAAvAAEAAQAAAAUqtwAKsQAAAAIADAAAAAYAAQAAAAMADQAAAAwAAQAAAAUADgAPAAAA
-AQAQABEAAgASAAAABAABABMACQAAAHQAAQAEAAAAGCu5ABUBAFcruQAbAQBOLbYAH1cruAAlsQAA
-AAIADAAAABoABgAAAAgABwAJAA4ACgATABEAFAAQABcAFAANAAAAKgAEAAAAGAAOAA8AAAAAABgA
-KwAsAAEAAAAYAC0ALgACAA4ACgAvADAAAwABADEAAAACADI=</byte-array>
+L0NvbnNlcXVlbmNlAQAQc2VyaWFsVmVyc2lvblVJRAEAAUoBAA1Db25zdGFudFZhbHVlBW5erL76
+s3NqAQAGPGluaXQ+AQADKClWAQAEQ29kZQoAAwAQDAAMAA0BAA9MaW5lTnVtYmVyVGFibGUBABJM
+b2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQA6TG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9f
+V29ybGRfMl8wQ29uc2VxdWVuY2VJbnZva2VyOwEACGV2YWx1YXRlAQA9KExvcmcvZHJvb2xzL3Nw
+aS9Lbm93bGVkZ2VIZWxwZXI7TG9yZy9kcm9vbHMvV29ya2luZ01lbW9yeTspVgEACkV4Y2VwdGlv
+bnMHABkBABNqYXZhL2xhbmcvRXhjZXB0aW9uCwAbAB0HABwBAB5vcmcvZHJvb2xzL3NwaS9Lbm93
+bGVkZ2VIZWxwZXIMAB4AHwEACGdldFR1cGxlAQAYKClMb3JnL2Ryb29scy9zcGkvVHVwbGU7CwAb
+ACEMACIAIwEAB2dldFJ1bGUBABgoKUxvcmcvZHJvb2xzL3J1bGUvUnVsZTsKACUAJwcAJgEAFG9y
+Zy9kcm9vbHMvcnVsZS9SdWxlDAAoACkBAA9nZXREZWNsYXJhdGlvbnMBACAoKVtMb3JnL2Ryb29s
+cy9ydWxlL0RlY2xhcmF0aW9uOwoAKwAtBwAsAQAmb3JnL2Ryb29scy9yZXRlb28vUnVsZV9IZWxs
+b19Xb3JsZF8yXzAMAC4ALwEAC2NvbnNlcXVlbmNlAQAjKExvcmcvZHJvb2xzL3NwaS9Lbm93bGVk
+Z2VIZWxwZXI7KVYBAA9rbm93bGVkZ2VIZWxwZXIBACBMb3JnL2Ryb29scy9zcGkvS25vd2xlZGdl
+SGVscGVyOwEADXdvcmtpbmdNZW1vcnkBABpMb3JnL2Ryb29scy9Xb3JraW5nTWVtb3J5OwEABHJ1
+bGUBABZMb3JnL2Ryb29scy9ydWxlL1J1bGU7AQAKU291cmNlRmlsZQEAK1J1bGVfSGVsbG9fV29y
+bGRfMl8wQ29uc2VxdWVuY2VJbnZva2VyLmphdmEAIQABAAMAAQAFAAEAGgAHAAgAAQAJAAAAAgAK
+AAIAAQAMAA0AAQAOAAAALwABAAEAAAAFKrcAD7EAAAACABEAAAAGAAEAAAADABIAAAAMAAEAAAAF
+ABMAFAAAAAEAFQAWAAIAFwAAAAQAAQAYAA4AAAB0AAEABAAAABgruQAaAQBXK7kAIAEATi22ACRX
+K7gAKrEAAAACABEAAAAaAAYAAAAKAAcACwAOAAwAEwATABQAEgAXABYAEgAAACoABAAAABgAEwAU
+AAAAAAAYADAAMQABAAAAGAAyADMAAgAOAAoANAA1AAMAAQA2AAAAAgA3</byte-array>
</entry>
<entry>
<string>org/drools/reteoo/Rule_Hello_World_2_0Eval0Invoker.class</string>
- <byte-array>yv66vgAAADAArwcAAgEAMm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wRXZh
+ <byte-array>yv66vgAAADAAtAcAAgEAMm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wRXZh
bDBJbnZva2VyBwAEAQAQamF2YS9sYW5nL09iamVjdAcABgEAHW9yZy9kcm9vbHMvc3BpL0V2YWxF
-eHByZXNzaW9uBwAIAQApb3JnL2Ryb29scy9zZW1hbnRpY3MvamF2YS9Db21waWxlZEludm9rZXIB
-AAdjbGFzcyQwAQARTGphdmEvbGFuZy9DbGFzczsBAAlTeW50aGV0aWMBAAY8aW5pdD4BAAMoKVYB
-AARDb2RlCgADABAMAAwADQEAD0xpbmVOdW1iZXJUYWJsZQEAEkxvY2FsVmFyaWFibGVUYWJsZQEA
-BHRoaXMBADRMb3JnL2Ryb29scy9yZXRlb28vUnVsZV9IZWxsb19Xb3JsZF8yXzBFdmFsMEludm9r
-ZXI7AQAIZXZhbHVhdGUBAFEoTG9yZy9kcm9vbHMvc3BpL1R1cGxlO1tMb3JnL2Ryb29scy9ydWxl
-L0RlY2xhcmF0aW9uO0xvcmcvZHJvb2xzL1dvcmtpbmdNZW1vcnk7KVoBAApFeGNlcHRpb25zBwAZ
-AQATamF2YS9sYW5nL0V4Y2VwdGlvbgoAGwAdBwAcAQAmb3JnL2Ryb29scy9yZXRlb28vUnVsZV9I
-ZWxsb19Xb3JsZF8yXzAMAB4AHwEABWV2YWwwAQADKClaAQAFdHVwbGUBABZMb3JnL2Ryb29scy9z
-cGkvVHVwbGU7AQAMZGVjbGFyYXRpb25zAQAeW0xvcmcvZHJvb2xzL3J1bGUvRGVjbGFyYXRpb247
-AQANd29ya2luZ01lbW9yeQEAGkxvcmcvZHJvb2xzL1dvcmtpbmdNZW1vcnk7AQAIaGFzaENvZGUB
-AAMoKUkDADZ1jgEAEWdldE1ldGhvZEJ5dGVjb2RlAQASKClMamF2YS91dGlsL0xpc3Q7BwAsAQAr
-b3JnL2Ryb29scy91dGlsL2FzbS9NZXRob2RDb21wYXJhdG9yJFRyYWNlcggAHgoAKwAvDAAMADAB
-ABUoTGphdmEvbGFuZy9TdHJpbmc7KVYJAAEAMgwACQAKCAA0AQAmb3JnLmRyb29scy5yZXRlb28u
-UnVsZV9IZWxsb19Xb3JsZF8yXzAKADYAOAcANwEAD2phdmEvbGFuZy9DbGFzcwwAOQA6AQAHZm9y
-TmFtZQEAJShMamF2YS9sYW5nL1N0cmluZzspTGphdmEvbGFuZy9DbGFzczsHADwBAB5qYXZhL2xh
-bmcvTm9DbGFzc0RlZkZvdW5kRXJyb3IKAD4AQAcAPwEAE2phdmEvbGFuZy9UaHJvd2FibGUMAEEA
-QgEACmdldE1lc3NhZ2UBABQoKUxqYXZhL2xhbmcvU3RyaW5nOwoAOwAvCgA2AEUMAEYARwEADmdl
-dENsYXNzTG9hZGVyAQAZKClMamF2YS9sYW5nL0NsYXNzTG9hZGVyOwcASQEAFmphdmEvbGFuZy9T
-dHJpbmdCdWZmZXIKAEsATQcATAEAEGphdmEvbGFuZy9TdHJpbmcMAE4ATwEAB3JlcGxhY2UBABYo
-Q0MpTGphdmEvbGFuZy9TdHJpbmc7CgBLAFEMAFIAUwEAB3ZhbHVlT2YBACYoTGphdmEvbGFuZy9P
-YmplY3Q7KUxqYXZhL2xhbmcvU3RyaW5nOwoASAAvCABWAQAGLmNsYXNzCgBIAFgMAFkAWgEABmFw
-cGVuZAEALChMamF2YS9sYW5nL1N0cmluZzspTGphdmEvbGFuZy9TdHJpbmdCdWZmZXI7CgBIAFwM
-AF0AQgEACHRvU3RyaW5nCgBfAGEHAGABABVqYXZhL2xhbmcvQ2xhc3NMb2FkZXIMAGIAYwEAE2dl
-dFJlc291cmNlQXNTdHJlYW0BACkoTGphdmEvbGFuZy9TdHJpbmc7KUxqYXZhL2lvL0lucHV0U3Ry
-ZWFtOwcAZQEAHWphdmEvaW8vQnl0ZUFycmF5T3V0cHV0U3RyZWFtCgBkABAKAGQAaAwAaQBqAQAF
-d3JpdGUBAAcoW0JJSSlWCgBsAG4HAG0BABNqYXZhL2lvL0lucHV0U3RyZWFtDABvAHABAARyZWFk
-AQAHKFtCSUkpSQcAcgEAIW9yZy9kcm9vbHMvUnVudGltZURyb29sc0V4Y2VwdGlvbggAdAEAPFVu
-YWJsZSBnZXRSZXNvdXJjZUFzU3RyZWFtIGZvciBDbGFzcyAnUnVsZV9IZWxsb19Xb3JsZF8yXzAn
-IAoAcQAvBwB3AQAab3JnL2Ryb29scy9hc20vQ2xhc3NSZWFkZXIKAGQAeQwAegB7AQALdG9CeXRl
-QXJyYXkBAAQoKVtCCgB2AH0MAAwAfgEABShbQilWCgB2AIAMAIEAggEABmFjY2VwdAEAIShMb3Jn
-L2Ryb29scy9hc20vQ2xhc3NWaXNpdG9yO1opVgoAKwCEDACFAIYBAAhnZXRUcmFjZQEAKigpTG9y
-Zy9kcm9vbHMvYXNtL3V0aWwvVHJhY2VNZXRob2RWaXNpdG9yOwoAiACKBwCJAQAmb3JnL2Ryb29s
-cy9hc20vdXRpbC9UcmFjZU1ldGhvZFZpc2l0b3IMAIsAKgEAB2dldFRleHQHAI0BACBqYXZhL2xh
-bmcvQ2xhc3NOb3RGb3VuZEV4Y2VwdGlvbgcAjwEAE2phdmEvaW8vSU9FeGNlcHRpb24BAAV2aXNp
-dAEALUxvcmcvZHJvb2xzL3V0aWwvYXNtL01ldGhvZENvbXBhcmF0b3IkVHJhY2VyOwEAAmlzAQAV
-TGphdmEvaW8vSW5wdXRTdHJlYW07AQADYm9zAQAfTGphdmEvaW8vQnl0ZUFycmF5T3V0cHV0U3Ry
-ZWFtOwEABGRhdGEBAAJbQgEACWJ5dGVDb3VudAEAAUkBAAtjbGFzc1JlYWRlcgEAHExvcmcvZHJv
-b2xzL2FzbS9DbGFzc1JlYWRlcjsBAAV0cmFjZQEAKExvcmcvZHJvb2xzL2FzbS91dGlsL1RyYWNl
-TWV0aG9kVmlzaXRvcjsBAAZlcXVhbHMBABUoTGphdmEvbGFuZy9PYmplY3Q7KVoKAAEAoQwAKQAq
-CwAHAKEKAKQApgcApQEAJG9yZy9kcm9vbHMvdXRpbC9hc20vTWV0aG9kQ29tcGFyYXRvcgwApwCo
-AQAPY29tcGFyZUJ5dGVjb2RlAQAjKExqYXZhL3V0aWwvTGlzdDtMamF2YS91dGlsL0xpc3Q7KVoB
-AAZvYmplY3QBABJMamF2YS9sYW5nL09iamVjdDsBAAVvdGhlcgEAK0xvcmcvZHJvb2xzL3NlbWFu
-dGljcy9qYXZhL0NvbXBpbGVkSW52b2tlcjsBAApTb3VyY2VGaWxlAQAlUnVsZV9IZWxsb19Xb3Js
-ZF8yXzBFdmFsMEludm9rZXIuamF2YQAhAAEAAwACAAUABwABAAgACQAKAAEACwAAAAAABQABAAwA
-DQABAA4AAAAvAAEAAQAAAAUqtwAPsQAAAAIAEQAAAAYAAQAAAAcAEgAAAAwAAQAAAAUAEwAUAAAA
-AQAVABYAAgAXAAAABAABABgADgAAAEwAAQAEAAAABLgAGqwAAAACABEAAAAGAAEAAAAPABIAAAAq
-AAQAAAAEABMAFAAAAAAABAAgACEAAQAAAAQAIgAjAAIAAAAEACQAJQADAAEAJgAnAAEADgAAAC0A
-AQABAAAAAxIorAAAAAIAEQAAAAYAAQAAABUAEgAAAAwAAQAAAAMAEwAUAAAAAQApACoAAQAOAAAB
-egAGAAgAAACmuwArWRIttwAuTLIAMVnHABxXEjO4ADVZswAxpwAPuwA7Wl+2AD23AEO/tgBEuwBI
-WRIzEC4QL7YASrgAULcAVBJVtgBXtgBbtgBeTbsAZFm3AGZOEQQAvAg6BKcADC0ZBAMVBbYAZywZ
-BAMRBAC2AGtZNgUCo//ppwAOV7sAcVkSc7cAdb+7AHZZLbYAeLcAfDoGGQYrBLYAfyu2AIM6BxkH
-tgCHsAACABIAFwAeAIwAWwB7AHsAjgACABEAAABGABEAAAAZAAoAHABMAB4AVAAfAFsAIgBeACYA
-ZwAiAGoAIwBrACQAbgAiAHQAJAB7ACgAfAApAIYALACTAC0AmgAuAKAALwASAAAAZgAKAAAApgAT
-ABQAAAAKAJwAkACRAAEATABaAJIAkwACAFQAUgCUAJUAAwBbAEsAlgCXAAQAXgAJAJgAmQAFAHQA
-BwCYAJkABQCGACAAmACZAAUAkwATAJoAmwAGAKAABgCcAJ0ABwABAJ4AnwABAA4AAACDAAIAAwAA
-ACkrxwAFA6wrKqYABQSsK8EAB5oABQOsK8AAB00qtgCgLLkAogEAuACjrAAAAAIAEQAAACIACAAA
-ADMABAA0AAYANQALADYADQA5ABQAOgAWAD0AGwA/ABIAAAAgAAMAAAApABMAFAAAAAAAKQCpAKoA
-AQAbAA4AqwCsAAIAAQCtAAAAAgCu</byte-array>
+eHByZXNzaW9uBwAIAQAeb3JnL2Ryb29scy9zcGkvQ29tcGlsZWRJbnZva2VyAQAQc2VyaWFsVmVy
+c2lvblVJRAEAAUoBAA1Db25zdGFudFZhbHVlBW5erL76s3NqAQAHY2xhc3MkMAEAEUxqYXZhL2xh
+bmcvQ2xhc3M7AQAJU3ludGhldGljAQAGPGluaXQ+AQADKClWAQAEQ29kZQoAAwAVDAARABIBAA9M
+aW5lTnVtYmVyVGFibGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQA0TG9yZy9kcm9vbHMv
+cmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wRXZhbDBJbnZva2VyOwEACGV2YWx1YXRlAQBRKExv
+cmcvZHJvb2xzL3NwaS9UdXBsZTtbTG9yZy9kcm9vbHMvcnVsZS9EZWNsYXJhdGlvbjtMb3JnL2Ry
+b29scy9Xb3JraW5nTWVtb3J5OylaAQAKRXhjZXB0aW9ucwcAHgEAE2phdmEvbGFuZy9FeGNlcHRp
+b24KACAAIgcAIQEAJm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wDAAjACQB
+AAVldmFsMAEAAygpWgEABXR1cGxlAQAWTG9yZy9kcm9vbHMvc3BpL1R1cGxlOwEADGRlY2xhcmF0
+aW9ucwEAHltMb3JnL2Ryb29scy9ydWxlL0RlY2xhcmF0aW9uOwEADXdvcmtpbmdNZW1vcnkBABpM
+b3JnL2Ryb29scy9Xb3JraW5nTWVtb3J5OwEACGhhc2hDb2RlAQADKClJAwA2dY4BABFnZXRNZXRo
+b2RCeXRlY29kZQEAEigpTGphdmEvdXRpbC9MaXN0OwcAMQEAK29yZy9kcm9vbHMvdXRpbC9hc20v
+TWV0aG9kQ29tcGFyYXRvciRUcmFjZXIIACMKADAANAwAEQA1AQAVKExqYXZhL2xhbmcvU3RyaW5n
+OylWCQABADcMAA4ADwgAOQEAJm9yZy5kcm9vbHMucmV0ZW9vLlJ1bGVfSGVsbG9fV29ybGRfMl8w
+CgA7AD0HADwBAA9qYXZhL2xhbmcvQ2xhc3MMAD4APwEAB2Zvck5hbWUBACUoTGphdmEvbGFuZy9T
+dHJpbmc7KUxqYXZhL2xhbmcvQ2xhc3M7BwBBAQAeamF2YS9sYW5nL05vQ2xhc3NEZWZGb3VuZEVy
+cm9yCgBDAEUHAEQBABNqYXZhL2xhbmcvVGhyb3dhYmxlDABGAEcBAApnZXRNZXNzYWdlAQAUKClM
+amF2YS9sYW5nL1N0cmluZzsKAEAANAoAOwBKDABLAEwBAA5nZXRDbGFzc0xvYWRlcgEAGSgpTGph
+dmEvbGFuZy9DbGFzc0xvYWRlcjsHAE4BABZqYXZhL2xhbmcvU3RyaW5nQnVmZmVyCgBQAFIHAFEB
+ABBqYXZhL2xhbmcvU3RyaW5nDABTAFQBAAdyZXBsYWNlAQAWKENDKUxqYXZhL2xhbmcvU3RyaW5n
+OwoAUABWDABXAFgBAAd2YWx1ZU9mAQAmKExqYXZhL2xhbmcvT2JqZWN0OylMamF2YS9sYW5nL1N0
+cmluZzsKAE0ANAgAWwEABi5jbGFzcwoATQBdDABeAF8BAAZhcHBlbmQBACwoTGphdmEvbGFuZy9T
+dHJpbmc7KUxqYXZhL2xhbmcvU3RyaW5nQnVmZmVyOwoATQBhDABiAEcBAAh0b1N0cmluZwoAZABm
+BwBlAQAVamF2YS9sYW5nL0NsYXNzTG9hZGVyDABnAGgBABNnZXRSZXNvdXJjZUFzU3RyZWFtAQAp
+KExqYXZhL2xhbmcvU3RyaW5nOylMamF2YS9pby9JbnB1dFN0cmVhbTsHAGoBAB1qYXZhL2lvL0J5
+dGVBcnJheU91dHB1dFN0cmVhbQoAaQAVCgBpAG0MAG4AbwEABXdyaXRlAQAHKFtCSUkpVgoAcQBz
+BwByAQATamF2YS9pby9JbnB1dFN0cmVhbQwAdAB1AQAEcmVhZAEAByhbQklJKUkHAHcBACFvcmcv
+ZHJvb2xzL1J1bnRpbWVEcm9vbHNFeGNlcHRpb24IAHkBADxVbmFibGUgZ2V0UmVzb3VyY2VBc1N0
+cmVhbSBmb3IgQ2xhc3MgJ1J1bGVfSGVsbG9fV29ybGRfMl8wJyAKAHYANAcAfAEAGm9yZy9kcm9v
+bHMvYXNtL0NsYXNzUmVhZGVyCgBpAH4MAH8AgAEAC3RvQnl0ZUFycmF5AQAEKClbQgoAewCCDAAR
+AIMBAAUoW0IpVgoAewCFDACGAIcBAAZhY2NlcHQBACEoTG9yZy9kcm9vbHMvYXNtL0NsYXNzVmlz
+aXRvcjtaKVYKADAAiQwAigCLAQAIZ2V0VHJhY2UBACooKUxvcmcvZHJvb2xzL2FzbS91dGlsL1Ry
+YWNlTWV0aG9kVmlzaXRvcjsKAI0AjwcAjgEAJm9yZy9kcm9vbHMvYXNtL3V0aWwvVHJhY2VNZXRo
+b2RWaXNpdG9yDACQAC8BAAdnZXRUZXh0BwCSAQAgamF2YS9sYW5nL0NsYXNzTm90Rm91bmRFeGNl
+cHRpb24HAJQBABNqYXZhL2lvL0lPRXhjZXB0aW9uAQAFdmlzaXQBAC1Mb3JnL2Ryb29scy91dGls
+L2FzbS9NZXRob2RDb21wYXJhdG9yJFRyYWNlcjsBAAJpcwEAFUxqYXZhL2lvL0lucHV0U3RyZWFt
+OwEAA2JvcwEAH0xqYXZhL2lvL0J5dGVBcnJheU91dHB1dFN0cmVhbTsBAARkYXRhAQACW0IBAAli
+eXRlQ291bnQBAAFJAQALY2xhc3NSZWFkZXIBABxMb3JnL2Ryb29scy9hc20vQ2xhc3NSZWFkZXI7
+AQAFdHJhY2UBAChMb3JnL2Ryb29scy9hc20vdXRpbC9UcmFjZU1ldGhvZFZpc2l0b3I7AQAGZXF1
+YWxzAQAVKExqYXZhL2xhbmcvT2JqZWN0OylaCgABAKYMAC4ALwsABwCmCgCpAKsHAKoBACRvcmcv
+ZHJvb2xzL3V0aWwvYXNtL01ldGhvZENvbXBhcmF0b3IMAKwArQEAD2NvbXBhcmVCeXRlY29kZQEA
+IyhMamF2YS91dGlsL0xpc3Q7TGphdmEvdXRpbC9MaXN0OylaAQAGb2JqZWN0AQASTGphdmEvbGFu
+Zy9PYmplY3Q7AQAFb3RoZXIBACBMb3JnL2Ryb29scy9zcGkvQ29tcGlsZWRJbnZva2VyOwEAClNv
+dXJjZUZpbGUBACVSdWxlX0hlbGxvX1dvcmxkXzJfMEV2YWwwSW52b2tlci5qYXZhACEAAQADAAIA
+BQAHAAIAGgAJAAoAAQALAAAAAgAMAAgADgAPAAEAEAAAAAAABQABABEAEgABABMAAAAvAAEAAQAA
+AAUqtwAUsQAAAAIAFgAAAAYAAQAAAAcAFwAAAAwAAQAAAAUAGAAZAAAAAQAaABsAAgAcAAAABAAB
+AB0AEwAAAEwAAQAEAAAABLgAH6wAAAACABYAAAAGAAEAAAARABcAAAAqAAQAAAAEABgAGQAAAAAA
+BAAlACYAAQAAAAQAJwAoAAIAAAAEACkAKgADAAEAKwAsAAEAEwAAAC0AAQABAAAAAxItrAAAAAIA
+FgAAAAYAAQAAABcAFwAAAAwAAQAAAAMAGAAZAAAAAQAuAC8AAQATAAABegAGAAgAAACmuwAwWRIy
+twAzTLIANlnHABxXEji4ADpZswA2pwAPuwBAWl+2AEK3AEi/tgBJuwBNWRI4EC4QL7YAT7gAVbcA
+WRJatgBctgBgtgBjTbsAaVm3AGtOEQQAvAg6BKcADC0ZBAMVBbYAbCwZBAMRBAC2AHBZNgUCo//p
+pwAOV7sAdlkSeLcAer+7AHtZLbYAfbcAgToGGQYrBLYAhCu2AIg6BxkHtgCMsAACABIAFwAeAJEA
+WwB7AHsAkwACABYAAABGABEAAAAbAAoAHgBMACAAVAAhAFsAJABeACgAZwAkAGoAJQBrACYAbgAk
+AHQAJgB7ACoAfAArAIYALgCTAC8AmgAwAKAAMQAXAAAAZgAKAAAApgAYABkAAAAKAJwAlQCWAAEA
+TABaAJcAmAACAFQAUgCZAJoAAwBbAEsAmwCcAAQAXgAJAJ0AngAFAHQABwCdAJ4ABQCGACAAnQCe
+AAUAkwATAJ8AoAAGAKAABgChAKIABwABAKMApAABABMAAACDAAIAAwAAACkrxwAFA6wrKqYABQSs
+K8EAB5oABQOsK8AAB00qtgClLLkApwEAuACorAAAAAIAFgAAACIACAAAADUABAA2AAYANwALADgA
+DQA7ABQAPAAWAD8AGwBBABcAAAAgAAMAAAApABgAGQAAAAAAKQCuAK8AAQAbAA4AsACxAAIAAQCy
+AAAAAgCz</byte-array>
</entry>
<entry>
<string>org/drools/reteoo/Rule_Hello_World_1_0ConsequenceInvoker.class</string>
- <byte-array>yv66vgAAADAAMwcAAgEAOG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMV8wQ29u
+ <byte-array>yv66vgAAADAAOAcAAgEAOG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMV8wQ29u
c2VxdWVuY2VJbnZva2VyBwAEAQAQamF2YS9sYW5nL09iamVjdAcABgEAGm9yZy9kcm9vbHMvc3Bp
-L0NvbnNlcXVlbmNlAQAGPGluaXQ+AQADKClWAQAEQ29kZQoAAwALDAAHAAgBAA9MaW5lTnVtYmVy
-VGFibGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQA6TG9yZy9kcm9vbHMvcmV0ZW9vL1J1
-bGVfSGVsbG9fV29ybGRfMV8wQ29uc2VxdWVuY2VJbnZva2VyOwEACGV2YWx1YXRlAQA9KExvcmcv
-ZHJvb2xzL3NwaS9Lbm93bGVkZ2VIZWxwZXI7TG9yZy9kcm9vbHMvV29ya2luZ01lbW9yeTspVgEA
-CkV4Y2VwdGlvbnMHABQBABNqYXZhL2xhbmcvRXhjZXB0aW9uCwAWABgHABcBAB5vcmcvZHJvb2xz
-L3NwaS9Lbm93bGVkZ2VIZWxwZXIMABkAGgEACGdldFR1cGxlAQAYKClMb3JnL2Ryb29scy9zcGkv
-VHVwbGU7CwAWABwMAB0AHgEAB2dldFJ1bGUBABgoKUxvcmcvZHJvb2xzL3J1bGUvUnVsZTsKACAA
-IgcAIQEAFG9yZy9kcm9vbHMvcnVsZS9SdWxlDAAjACQBAA9nZXREZWNsYXJhdGlvbnMBACAoKVtM
-b3JnL2Ryb29scy9ydWxlL0RlY2xhcmF0aW9uOwoAJgAoBwAnAQAmb3JnL2Ryb29scy9yZXRlb28v
-UnVsZV9IZWxsb19Xb3JsZF8xXzAMACkAKgEAC2NvbnNlcXVlbmNlAQAjKExvcmcvZHJvb2xzL3Nw
-aS9Lbm93bGVkZ2VIZWxwZXI7KVYBAA9rbm93bGVkZ2VIZWxwZXIBACBMb3JnL2Ryb29scy9zcGkv
-S25vd2xlZGdlSGVscGVyOwEADXdvcmtpbmdNZW1vcnkBABpMb3JnL2Ryb29scy9Xb3JraW5nTWVt
-b3J5OwEABHJ1bGUBABZMb3JnL2Ryb29scy9ydWxlL1J1bGU7AQAKU291cmNlRmlsZQEAK1J1bGVf
-SGVsbG9fV29ybGRfMV8wQ29uc2VxdWVuY2VJbnZva2VyLmphdmEAIQABAAMAAQAFAAAAAgABAAcA
-CAABAAkAAAAvAAEAAQAAAAUqtwAKsQAAAAIADAAAAAYAAQAAAAMADQAAAAwAAQAAAAUADgAPAAAA
-AQAQABEAAgASAAAABAABABMACQAAAHQAAQAEAAAAGCu5ABUBAFcruQAbAQBOLbYAH1cruAAlsQAA
-AAIADAAAABoABgAAAAgABwAJAA4ACgATABEAFAAQABcAFAANAAAAKgAEAAAAGAAOAA8AAAAAABgA
-KwAsAAEAAAAYAC0ALgACAA4ACgAvADAAAwABADEAAAACADI=</byte-array>
+L0NvbnNlcXVlbmNlAQAQc2VyaWFsVmVyc2lvblVJRAEAAUoBAA1Db25zdGFudFZhbHVlBW5erL76
+s3NqAQAGPGluaXQ+AQADKClWAQAEQ29kZQoAAwAQDAAMAA0BAA9MaW5lTnVtYmVyVGFibGUBABJM
+b2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQA6TG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9f
+V29ybGRfMV8wQ29uc2VxdWVuY2VJbnZva2VyOwEACGV2YWx1YXRlAQA9KExvcmcvZHJvb2xzL3Nw
+aS9Lbm93bGVkZ2VIZWxwZXI7TG9yZy9kcm9vbHMvV29ya2luZ01lbW9yeTspVgEACkV4Y2VwdGlv
+bnMHABkBABNqYXZhL2xhbmcvRXhjZXB0aW9uCwAbAB0HABwBAB5vcmcvZHJvb2xzL3NwaS9Lbm93
+bGVkZ2VIZWxwZXIMAB4AHwEACGdldFR1cGxlAQAYKClMb3JnL2Ryb29scy9zcGkvVHVwbGU7CwAb
+ACEMACIAIwEAB2dldFJ1bGUBABgoKUxvcmcvZHJvb2xzL3J1bGUvUnVsZTsKACUAJwcAJgEAFG9y
+Zy9kcm9vbHMvcnVsZS9SdWxlDAAoACkBAA9nZXREZWNsYXJhdGlvbnMBACAoKVtMb3JnL2Ryb29s
+cy9ydWxlL0RlY2xhcmF0aW9uOwoAKwAtBwAsAQAmb3JnL2Ryb29scy9yZXRlb28vUnVsZV9IZWxs
+b19Xb3JsZF8xXzAMAC4ALwEAC2NvbnNlcXVlbmNlAQAjKExvcmcvZHJvb2xzL3NwaS9Lbm93bGVk
+Z2VIZWxwZXI7KVYBAA9rbm93bGVkZ2VIZWxwZXIBACBMb3JnL2Ryb29scy9zcGkvS25vd2xlZGdl
+SGVscGVyOwEADXdvcmtpbmdNZW1vcnkBABpMb3JnL2Ryb29scy9Xb3JraW5nTWVtb3J5OwEABHJ1
+bGUBABZMb3JnL2Ryb29scy9ydWxlL1J1bGU7AQAKU291cmNlRmlsZQEAK1J1bGVfSGVsbG9fV29y
+bGRfMV8wQ29uc2VxdWVuY2VJbnZva2VyLmphdmEAIQABAAMAAQAFAAEAGgAHAAgAAQAJAAAAAgAK
+AAIAAQAMAA0AAQAOAAAALwABAAEAAAAFKrcAD7EAAAACABEAAAAGAAEAAAADABIAAAAMAAEAAAAF
+ABMAFAAAAAEAFQAWAAIAFwAAAAQAAQAYAA4AAAB0AAEABAAAABgruQAaAQBXK7kAIAEATi22ACRX
+K7gAKrEAAAACABEAAAAaAAYAAAAKAAcACwAOAAwAEwATABQAEgAXABYAEgAAACoABAAAABgAEwAU
+AAAAAAAYADAAMQABAAAAGAAyADMAAgAOAAoANAA1AAMAAQA2AAAAAgA3</byte-array>
</entry>
</map>
<null/>
@@ -154,7 +160,7 @@
coOPFgIAAkwACmV4cHJlc3Npb250AB9Mb3JnL2Ryb29scy9zcGkvRXZhbEV4cHJlc3Npb247WwAU
cmVxdWlyZWREZWNsYXJhdGlvbnN0AB5bTG9yZy9kcm9vbHMvcnVsZS9EZWNsYXJhdGlvbjt4cgAi
b3JnLmRyb29scy5ydWxlLkNvbmRpdGlvbmFsRWxlbWVudMYMc+lm86I2AgAAeHBzcgAyb3JnLmRy
-b29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8yXzBFdmFsMEludm9rZXKXFrzydxbvVwIAAHhw
+b29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8yXzBFdmFsMEludm9rZXJuXqy++rNzagIAAHhw
dXIAHltMb3JnLmRyb29scy5ydWxlLkRlY2xhcmF0aW9uO/Wnzws0aCnjAgAAeHAAAAAAdAA4b3Jn
LmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8xXzBDb25zZXF1ZW5jZUludm9rZXJzcgAU
b3JnLmRyb29scy5ydWxlLlJ1bGVuXqy++rNzagIADloACWF1dG9Gb2N1c0oACWxvYWRPcmRlcloA
@@ -164,7 +170,7 @@
bGFyYXRpb25zdAAPTGphdmEvdXRpbC9NYXA7TAAIZHVyYXRpb250ABlMb3JnL2Ryb29scy9zcGkv
RHVyYXRpb247TAAHbGhzUm9vdHQAFUxvcmcvZHJvb2xzL3J1bGUvQW5kO0wABG5hbWVxAH4ADkwA
A3BrZ3EAfgAOeHAAAAAAAAAAAAEAAAAAAAFwdAAETUFJTnNyADhvcmcuZHJvb2xzLnJldGVvby5S
-dWxlX0hlbGxvX1dvcmxkXzFfMENvbnNlcXVlbmNlSW52b2tlcifhlfKgIvVCAgAAeHB1cQB+AAoA
+dWxlX0hlbGxvX1dvcmxkXzFfMENvbnNlcXVlbmNlSW52b2tlcm5erL76s3NqAgAAeHB1cQB+AAoA
AAAAc3EAfgAAP0AAAAAAAAx3CAAAABAAAAAAeHBzcgATb3JnLmRyb29scy5ydWxlLkFuZPz45yLw
psN2AgAAeHIAHG9yZy5kcm9vbHMucnVsZS5Hcm91cEVsZW1lbnTG3JO/b7XpWAIAAUwACGNoaWxk
cmVudAAQTGphdmEvdXRpbC9MaXN0O3hxAH4ABnNyABNqYXZhLnV0aWwuQXJyYXlMaXN0eIHSHZnH
@@ -195,7 +201,7 @@
AAhtZXNzYWdlM3NxAH4ANHQABVRocmVleHBzcQB+ADgAAADScQB+ADJ4eHQADUhlbGxvIFdvcmxk
IDFwdAA4b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8yXzBDb25zZXF1ZW5jZUlu
dm9rZXJzcQB+AA0AAAAAAAAAAAIAAAAAAAFwcQB+ABRzcgA4b3JnLmRyb29scy5yZXRlb28uUnVs
-ZV9IZWxsb19Xb3JsZF8yXzBDb25zZXF1ZW5jZUludm9rZXJ0dXLt8KwGgwIAAHhwdXEAfgAKAAAA
+ZV9IZWxsb19Xb3JsZF8yXzBDb25zZXF1ZW5jZUludm9rZXJuXqy++rNzagIAAHhwdXEAfgAKAAAA
AHNxAH4AAD9AAAAAAAAMdwgAAAAQAAAAAHhwc3EAfgAZc3EAfgAdAAAABHcEAAAACnNxAH4AGXNx
AH4AHQAAAAJ3BAAAAApzcQB+ACEAAAAAAAAAAHNxAH4AHQAAAAF3BAAAAAFzcQB+ACZxAH4ALXNx
AH4ALnEAfgAydAAIbWVzc2FnZTFzcQB+ADRxAH4AN3hwc3EAfgA4AAAA0nEAfgAyc3EAfgAhAAAA
@@ -227,7 +233,7 @@
aW9uO0wADGRlY2xhcmF0aW9uc3QAD0xqYXZhL3V0aWwvTWFwO0wACGR1cmF0aW9udAAZTG9yZy9k
cm9vbHMvc3BpL0R1cmF0aW9uO0wAB2xoc1Jvb3R0ABVMb3JnL2Ryb29scy9ydWxlL0FuZDtMAARu
YW1lcQB+AAVMAANwa2dxAH4ABXhwAAAAAAAAAAABAAAAAAABcHQABE1BSU5zcgA4b3JnLmRyb29s
-cy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8xXzBDb25zZXF1ZW5jZUludm9rZXIn4ZXyoCL1QgIA
+cy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8xXzBDb25zZXF1ZW5jZUludm9rZXJuXqy++rNzagIA
AHhwdXIAHltMb3JnLmRyb29scy5ydWxlLkRlY2xhcmF0aW9uO/Wnzws0aCnjAgAAeHAAAAAAc3EA
fgABP0AAAAAAAAx3CAAAABAAAAAAeHBzcgATb3JnLmRyb29scy5ydWxlLkFuZPz45yLwpsN2AgAA
eHIAHG9yZy5kcm9vbHMucnVsZS5Hcm91cEVsZW1lbnTG3JO/b7XpWAIAAUwACGNoaWxkcmVudAAQ
@@ -259,7 +265,7 @@
c3EAfgAXAAAAAXcEAAAAAXNxAH4AIHEAfgAnc3EAfgAocQB+ACx0AAhtZXNzYWdlM3NxAH4ALnQA
BVRocmVleHBzcQB+ADIAAADScQB+ACx4eHEAfgADcHQADUhlbGxvIFdvcmxkIDJzcQB+AAQAAAAA
AAAAAAIAAAAAAAFwcQB+AAxzcgA4b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8y
-XzBDb25zZXF1ZW5jZUludm9rZXJ0dXLt8KwGgwIAAHhwdXEAfgAPAAAAAHNxAH4AAT9AAAAAAAAM
+XzBDb25zZXF1ZW5jZUludm9rZXJuXqy++rNzagIAAHhwdXEAfgAPAAAAAHNxAH4AAT9AAAAAAAAM
dwgAAAAQAAAAAHhwc3EAfgASc3EAfgAXAAAABHcEAAAACnNxAH4AEnNxAH4AFwAAAAJ3BAAAAApz
cQB+ABsAAAAAAAAAAHNxAH4AFwAAAAF3BAAAAAFzcQB+ACBxAH4AJ3NxAH4AKHEAfgAsdAAIbWVz
c2FnZTFzcQB+AC5xAH4AMXhwc3EAfgAyAAAA0nEAfgAsc3EAfgAbAAAAAQAAAABzcQB+ABcAAAAB
@@ -274,7 +280,7 @@
AH4AXHhwc3EAfgAyAAAA0nEAfgAseHNyAB1vcmcuZHJvb2xzLnJ1bGUuRXZhbENvbmRpdGlvbj4q
3Axyg48WAgACTAAKZXhwcmVzc2lvbnQAH0xvcmcvZHJvb2xzL3NwaS9FdmFsRXhwcmVzc2lvbjtb
ABRyZXF1aXJlZERlY2xhcmF0aW9uc3EAfgAHeHEAfgAVc3IAMm9yZy5kcm9vbHMucmV0ZW9vLlJ1
-bGVfSGVsbG9fV29ybGRfMl8wRXZhbDBJbnZva2Vylxa88ncW71cCAAB4cHVxAH4ADwAAAAB4cQB+
+bGVfSGVsbG9fV29ybGRfMl8wRXZhbDBJbnZva2Vybl6svvqzc2oCAAB4cHVxAH4ADwAAAAB4cQB+
AF5weAA=</byte-array>
</org.drools.rule.Package>
</entry>
@@ -370,7 +376,7 @@
cmF0aW9uc3EAfgAPTAAIZHVyYXRpb250ABlMb3JnL2Ryb29scy9zcGkvRHVyYXRpb247TAAHbGhz
Um9vdHQAFUxvcmcvZHJvb2xzL3J1bGUvQW5kO0wABG5hbWVxAH4AS0wAA3BrZ3EAfgBLeHAAAAAA
AAAAAAEAAAAAAAFwdAAETUFJTnNyADhvcmcuZHJvb2xzLnJldGVvby5SdWxlX0hlbGxvX1dvcmxk
-XzFfMENvbnNlcXVlbmNlSW52b2tlcifhlfKgIvVCAgAAeHB1cgAeW0xvcmcuZHJvb2xzLnJ1bGUu
+XzFfMENvbnNlcXVlbmNlSW52b2tlcm5erL76s3NqAgAAeHB1cgAeW0xvcmcuZHJvb2xzLnJ1bGUu
RGVjbGFyYXRpb2479afPCzRoKeMCAAB4cAAAAABzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAB4cHNy
ABNvcmcuZHJvb2xzLnJ1bGUuQW5k/PjnIvCmw3YCAAB4cgAcb3JnLmRyb29scy5ydWxlLkdyb3Vw
RWxlbWVudMbck79vtelYAgABTAAIY2hpbGRyZW5xAH4AK3hyACJvcmcuZHJvb2xzLnJ1bGUuQ29u
@@ -403,7 +409,7 @@
bmRpdGlvbnQAH0xvcmcvZHJvb2xzL3J1bGUvRXZhbENvbmRpdGlvbjtMAAt0dXBsZVNvdXJjZXEA
fgBAeHEAfgA7AAEAAAATAAAAAHNxAH4AJAAAAAF3BAAAAAFzcQB+AEcAAAAAABQAAAAAc3EAfgBK
AAAAAAAAAAACAAAAAAABcHEAfgBRc3IAOG9yZy5kcm9vbHMucmV0ZW9vLlJ1bGVfSGVsbG9fV29y
-bGRfMl8wQ29uc2VxdWVuY2VJbnZva2VydHVy7fCsBoMCAAB4cHVxAH4AVAAAAABzcQB+AAw/QAAA
+bGRfMl8wQ29uc2VxdWVuY2VJbnZva2Vybl6svvqzc2oCAAB4cHVxAH4AVAAAAABzcQB+AAw/QAAA
AAAADHcIAAAAEAAAAAB4cHNxAH4AV3NxAH4AJAAAAAR3BAAAAApzcQB+AFdzcQB+ACQAAAACdwQA
AAAKc3EAfgBeAAAAAAAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBicQB+AGlzcQB+AGpxAH4AbnQA
CG1lc3NhZ2Uxc3EAfgBwcQB+ADN4cHNxAH4AcwAAANJxAH4AbnNxAH4AXgAAAAEAAAAAc3EAfgAk
@@ -418,48 +424,49 @@
fgBwcQB+AJ14cHNxAH4AcwAAANJxAH4AbnhzcgAdb3JnLmRyb29scy5ydWxlLkV2YWxDb25kaXRp
b24+KtwMcoOPFgIAAkwACmV4cHJlc3Npb250AB9Mb3JnL2Ryb29scy9zcGkvRXZhbEV4cHJlc3Np
b247WwAUcmVxdWlyZWREZWNsYXJhdGlvbnNxAH4ATXhxAH4AWXNyADJvcmcuZHJvb2xzLnJldGVv
-by5SdWxlX0hlbGxvX1dvcmxkXzJfMEV2YWwwSW52b2tlcpcWvPJ3Fu9XAgAAeHB1cQB+AFQAAAAA
+by5SdWxlX0hlbGxvX1dvcmxkXzJfMEV2YWwwSW52b2tlcm5erL76s3NqAgAAeHB1cQB+AFQAAAAA
eHQADUhlbGxvIFdvcmxkIDJwcQB+AKJ4cQB+AN5xAH4ARXhzcgAgb3JnLmRyb29scy5jb21tb24u
QmV0YU5vZGVCaW5kZXLZOk2QQfBaswIAAVsAC2NvbnN0cmFpbnRzdAAhW0xvcmcvZHJvb2xzL3Nw
aS9GaWVsZENvbnN0cmFpbnQ7eHB1cgAhW0xvcmcuZHJvb2xzLnNwaS5GaWVsZENvbnN0cmFpbnQ7
-mvaX9rRKD8YCAAB4cAAAAAFzcgAqb3JnLmRyb29scy5jb21tb24uSW5zdGFuY2VFcXVhbHNDb25z
-dHJhaW50u86LzZRlbJsCAAJJAAtvdGhlckNvbHVtblsADGRlY2xhcmF0aW9uc3EAfgBNeHAAAAAC
-dXEAfgBUAAAAAHEAfgBDc3EAfgA0AAEAAAAIAAAAAHNxAH4AIwAAAAJ3BAAAAAJxAH4ARXNxAH4A
-PgAAAAAADwAAAAFzcQB+ACQAAAACdwQAAAACc3EAfgBHAAAAAAAQAAAAAHEAfgBQcQB+AO1zcQB+
-AKAAAQAAABcAAAAAc3EAfgAkAAAAAXcEAAAAAXNxAH4ARwAAAAAAGAAAAABxAH4ApXEAfgDweHEA
-fgDecQB+AO14c3EAfgDjdXEAfgDmAAAAAXNxAH4A6AAAAAJ1cQB+AFQAAAAAc3EAfgA+AAAAAAAO
-AAAAA3NxAH4AJAAAAAJ3BAAAAAJxAH4A7XNxAH4APgAAAAAAEQAAAAFzcQB+ACQAAAACdwQAAAAC
-c3EAfgBHAAAAAAASAAAAAHEAfgBQcQB+APlzcQB+AKAAAQAAABkAAAAAc3EAfgAkAAAAAXcEAAAA
-AXNxAH4ARwAAAAAAGgAAAABxAH4ApXEAfgD8eHEAfgDecQB+APl4c3EAfgDjdXEAfgDmAAAAAXNx
-AH4A6AAAAAJ1cQB+AFQAAAAAcQB+APdzcQB+ADQAAQAAAAsAAAAAc3EAfgAjAAAAAncEAAAAAnNx
-AH4APgAAAAAADAAAAAFzcQB+ACQAAAACdwQAAAACc3EAfgBHAAAAAAANAAAAAHEAfgBQcQB+AQVz
-cQB+AKAAAQAAABUAAAAAc3EAfgAkAAAAAXcEAAAAAXNxAH4ARwAAAAAAFgAAAABxAH4ApXEAfgEI
-eHEAfgDecQB+AQV4c3EAfgDjdXEAfgDmAAAAAXNxAH4A6AAAAAJ1cQB+AFQAAAAAcQB+AENxAH4B
-A3EAfgD5eHEAfgCZcQB+ACl4c3EAfgDjdXEAfgDmAAAAAXNxAH4A6AAAAAF1cQB+AFQAAAAAcQB+
-AEFzcQB+ADQAAQAAAAQAAAAAc3EAfgAjAAAAAncEAAAAAnEAfgBBcQB+APd4cQB+AHdxAH4AKXEA
-fgDreHEAfgCScQB+AClxAH4BBXhzcQB+AON1cQB+AOYAAAABc3EAfgDoAAAAAXVxAH4AVAAAAABx
-AH4AQXNxAH4ANAABAAAABgAAAABzcQB+ACMAAAABdwQAAAABcQB+AEN4cQB+AIJxAH4AKXEAfgD3
-eHNxAH4A43VxAH4A5gAAAAFzcQB+AOgAAAAAdXEAfgBUAAAAAHEAfgA8cQB+ARN4c3EAfgDjdXEA
-fgDmAAAAAHEAfgA3eHEAfgBmcQB+ACl4cQB+AGZxAH4AMXNxAH4AL3NxAH4ADD9AAAAAAAAMdwgA
-AAAQAAAAAnEAfgCdcQB+AQNxAH4AM3EAfgDreHEAfgCScQB+ASFzcQB+AC9zcQB+AAw/QAAAAAAA
-DHcIAAAAEAAAAAJxAH4Ae3EAfgETcQB+ADNxAH4BGXhxAH4Ad3EAfgEjeHNxAH4AJAAAAAV3BAAA
-AAdxAH4AN3EAfgETcQB+ARlxAH4A63EAfgEDeHEAfgEDc3EAfgAkAAAAAHcEAAAAAXhxAH4AdHEA
-fgAic3EAfgAMP0AAAAAAAAx3CAAAABAAAAABcQB+AHRxAH4AKXhzcgAmb3JnLmRyb29scy5zcGku
-Q2xhc3NPYmplY3RUeXBlUmVzb2x2ZXIChNj8cLGw6wIAAUwACm9iamVjdFR5cGV0AENMb3JnL2Ry
-b29scy9zcGkvQ2xhc3NPYmplY3RUeXBlUmVzb2x2ZXIkTW9kaWZpZWFibGVDbGFzc09iamVjdFR5
-cGU7eHBzcgBBb3JnLmRyb29scy5zcGkuQ2xhc3NPYmplY3RUeXBlUmVzb2x2ZXIkTW9kaWZpZWFi
-bGVDbGFzc09iamVjdFR5cGVEpauUAjf7NQIAAHhxAH4AcwAAASxwc3IAH29yZy5kcm9vbHMucmV0
-ZW9vLlJldGVvb0J1aWxkZXIYHVn7j8gD8AIACUkAF2N1cnJlbnRPZmZzZXRBZGp1c3RtZW50SQAC
-aWRMAA1hdHRhY2hlZE5vZGVzcQB+AA9MAAxkZWNsYXJhdGlvbnNxAH4AD0wADG9iamVjdFNvdXJj
-ZXEAfgA2TAAKb2JqZWN0VHlwZXEAfgAPTAAIcmVzb2x2ZXJxAH4AHkwABXJ1bGVzcQB+AA9MAAt0
-dXBsZVNvdXJjZXEAfgBAeHAAAAAAAAAAG3NxAH4ADD9AAAAAAAAYdwgAAAAgAAAAEnEAfgDwcQB+
-APBxAH4A63EAfgDrcQB+AQNxAH4BA3EAfgD8cQB+APxxAH4A+XEAfgD5cQB+AEFxAH4AQXEAfgEI
-cQB+AQhxAH4BBXEAfgEFcQB+ADdxAH4AN3EAfgA8cQB+ADxxAH4A93EAfgD3cQB+AO1xAH4A7XEA
-fgEZcQB+ARlxAH4AonEAfgCicQB+AEVxAH4ARXEAfgETcQB+ARNxAH4AKXEAfgApcQB+AENxAH4A
-Q3hzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAB4cQB+AQNzcgAXamF2YS51dGlsLkxpbmtlZEhhc2hN
-YXA0wE5cEGzA+wIAAVoAC2FjY2Vzc09yZGVyeHEAfgAMP0AAAAAAAAx3CAAAABAAAAABcQB+ALRz
-cgARamF2YS5sYW5nLkludGVnZXIS4qCk94GHOAIAAUkABXZhbHVleHIAEGphdmEubGFuZy5OdW1i
-ZXKGrJUdC5TgiwIAAHhwAAAAA3gAcQB+ASpzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAJxAH4AUHVy
-AB1bTG9yZy5kcm9vbHMucmV0ZW9vLkJhc2VOb2RlOwvnyZNDnLPqAgAAeHAAAAAEcQB+AElxAH4B
-B3EAfgDvcQB+APtxAH4ApXVxAH4BNwAAAARxAH4ApHEAfgEKcQB+APJxAH4A/nhxAH4A/A==</byte-array>
+mvaX9rRKD8YCAAB4cAAAAAFzcgAtb3JnLmRyb29scy5jb21tb24uSW5zdGFuY2VOb3RFcXVhbHND
+b25zdHJhaW50u86LzZRlbJsCAAJJAAtvdGhlckNvbHVtblsADGRlY2xhcmF0aW9uc3EAfgBNeHAA
+AAACdXEAfgBUAAAAAHEAfgBDc3EAfgA0AAEAAAAIAAAAAHNxAH4AIwAAAAJ3BAAAAAJxAH4ARXNx
+AH4APgAAAAAADwAAAAFzcQB+ACQAAAACdwQAAAACc3EAfgBHAAAAAAAQAAAAAHEAfgBQcQB+AO1z
+cQB+AKAAAQAAABcAAAAAc3EAfgAkAAAAAXcEAAAAAXNxAH4ARwAAAAAAGAAAAABxAH4ApXEAfgDw
+eHEAfgDecQB+AO14c3EAfgDjdXEAfgDmAAAAAXNxAH4A6AAAAAJ1cQB+AFQAAAAAc3EAfgA+AAAA
+AAAOAAAAA3NxAH4AJAAAAAJ3BAAAAAJxAH4A7XNxAH4APgAAAAAAEQAAAAFzcQB+ACQAAAACdwQA
+AAACc3EAfgBHAAAAAAASAAAAAHEAfgBQcQB+APlzcQB+AKAAAQAAABkAAAAAc3EAfgAkAAAAAXcE
+AAAAAXNxAH4ARwAAAAAAGgAAAABxAH4ApXEAfgD8eHEAfgDecQB+APl4c3EAfgDjdXEAfgDmAAAA
+AXNxAH4A6AAAAAJ1cQB+AFQAAAAAcQB+APdzcQB+ADQAAQAAAAsAAAAAc3EAfgAjAAAAAncEAAAA
+AnNxAH4APgAAAAAADAAAAAFzcQB+ACQAAAACdwQAAAACc3EAfgBHAAAAAAANAAAAAHEAfgBQcQB+
+AQVzcQB+AKAAAQAAABUAAAAAc3EAfgAkAAAAAXcEAAAAAXNxAH4ARwAAAAAAFgAAAABxAH4ApXEA
+fgEIeHEAfgDecQB+AQV4c3EAfgDjdXEAfgDmAAAAAXNxAH4A6AAAAAJ1cQB+AFQAAAAAcQB+AENx
+AH4BA3EAfgD5eHEAfgCZcQB+ACl4c3EAfgDjdXEAfgDmAAAAAXNxAH4A6AAAAAF1cQB+AFQAAAAA
+cQB+AEFzcQB+ADQAAQAAAAQAAAAAc3EAfgAjAAAAAncEAAAAAnEAfgBBcQB+APd4cQB+AHdxAH4A
+KXEAfgDreHEAfgCScQB+AClxAH4BBXhzcQB+AON1cQB+AOYAAAABc3EAfgDoAAAAAXVxAH4AVAAA
+AABxAH4AQXNxAH4ANAABAAAABgAAAABzcQB+ACMAAAABdwQAAAABcQB+AEN4cQB+AIJxAH4AKXEA
+fgD3eHNxAH4A43VxAH4A5gAAAAFzcQB+AOgAAAAAdXEAfgBUAAAAAHEAfgA8cQB+ARN4c3EAfgDj
+dXEAfgDmAAAAAHEAfgA3eHEAfgBmcQB+ACl4cQB+AGZxAH4AMXNxAH4AL3NxAH4ADD9AAAAAAAAM
+dwgAAAAQAAAAAnEAfgCdcQB+AQNxAH4AM3EAfgDreHEAfgCScQB+ASFzcQB+AC9zcQB+AAw/QAAA
+AAAADHcIAAAAEAAAAAJxAH4Ae3EAfgETcQB+ADNxAH4BGXhxAH4Ad3EAfgEjeHNxAH4AJAAAAAV3
+BAAAAAdxAH4AN3EAfgETcQB+ARlxAH4A63EAfgEDeHEAfgEDc3EAfgAkAAAAAHcEAAAAAXhxAH4A
+dHEAfgAic3EAfgAMP0AAAAAAAAx3CAAAABAAAAABcQB+AHRxAH4AKXhzcgAmb3JnLmRyb29scy5z
+cGkuQ2xhc3NPYmplY3RUeXBlUmVzb2x2ZXIChNj8cLGw6wIAAUwACm9iamVjdFR5cGV0AENMb3Jn
+L2Ryb29scy9zcGkvQ2xhc3NPYmplY3RUeXBlUmVzb2x2ZXIkTW9kaWZpZWFibGVDbGFzc09iamVj
+dFR5cGU7eHBzcgBBb3JnLmRyb29scy5zcGkuQ2xhc3NPYmplY3RUeXBlUmVzb2x2ZXIkTW9kaWZp
+ZWFibGVDbGFzc09iamVjdFR5cGVEpauUAjf7NQIAAHhxAH4AcwAAASxwc3IAH29yZy5kcm9vbHMu
+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
+c2hNYXA0wE5cEGzA+wIAAVoAC2FjY2Vzc09yZGVyeHEAfgAMP0AAAAAAAAx3CAAAABAAAAABcQB+
+ALRzcgARamF2YS5sYW5nLkludGVnZXIS4qCk94GHOAIAAUkABXZhbHVleHIAEGphdmEubGFuZy5O
+dW1iZXKGrJUdC5TgiwIAAHhwAAAAA3gAcQB+ASpzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAJxAH4A
+UHVyAB1bTG9yZy5kcm9vbHMucmV0ZW9vLkJhc2VOb2RlOwvnyZNDnLPqAgAAeHAAAAAEcQB+AElx
+AH4BB3EAfgDvcQB+APtxAH4ApXVxAH4BNwAAAARxAH4ApHEAfgEKcQB+APJxAH4A/nhxAH4A/A==
+</byte-array>
</org.drools.reteoo.ReteooRuleBase>
\ No newline at end of file
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-22 02:27:59 UTC (rev 4803)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/reteoo/OneAndTwoOrsPerson 2006-06-22 04:07:32 UTC (rev 4804)
@@ -7,79 +7,85 @@
<map>
<entry>
<string>org/drools/reteoo/Rule_Hello_World_2_0.class</string>
- <byte-array>yv66vgAAADAAJQcAAgEAJm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wBwAE
-AQAQamF2YS9sYW5nL09iamVjdAEABjxpbml0PgEAAygpVgEABENvZGUKAAMACQwABQAGAQAPTGlu
-ZU51bWJlclRhYmxlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAEdGhpcwEAKExvcmcvZHJvb2xzL3Jl
-dGVvby9SdWxlX0hlbGxvX1dvcmxkXzJfMDsBAAtjb25zZXF1ZW5jZQEAIyhMb3JnL2Ryb29scy9z
-cGkvS25vd2xlZGdlSGVscGVyOylWAQAKRXhjZXB0aW9ucwcAEgEAE2phdmEvbGFuZy9FeGNlcHRp
-b24JABQAFgcAFQEAEGphdmEvbGFuZy9TeXN0ZW0MABcAGAEAA291dAEAFUxqYXZhL2lvL1ByaW50
-U3RyZWFtOwgAGgEABmRvbmUgMQoAHAAeBwAdAQATamF2YS9pby9QcmludFN0cmVhbQwAHwAgAQAH
-cHJpbnRsbgEAFShMamF2YS9sYW5nL1N0cmluZzspVgEABmRyb29scwEAIExvcmcvZHJvb2xzL3Nw
-aS9Lbm93bGVkZ2VIZWxwZXI7AQAKU291cmNlRmlsZQEAGVJ1bGVfSGVsbG9fV29ybGRfMl8wLmph
-dmEAIQABAAMAAAAAAAIAAQAFAAYAAQAHAAAALwABAAEAAAAFKrcACLEAAAACAAoAAAAGAAEAAAAH
-AAsAAAAMAAEAAAAFAAwADQAAAAkADgAPAAIAEAAAAAQAAQARAAcAAAA3AAIAAQAAAAmyABMSGbYA
-G7EAAAACAAoAAAAKAAIAAAAJAAgACwALAAAADAABAAAACQAhACIAAAABACMAAAACACQ=</byte-array>
+ <byte-array>yv66vgAAADAAKgcAAgEAJm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wBwAE
+AQAQamF2YS9sYW5nL09iamVjdAEAEHNlcmlhbFZlcnNpb25VSUQBAAFKAQANQ29uc3RhbnRWYWx1
+ZQVuXqy++rNzagEABjxpbml0PgEAAygpVgEABENvZGUKAAMADgwACgALAQAPTGluZU51bWJlclRh
+YmxlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAEdGhpcwEAKExvcmcvZHJvb2xzL3JldGVvby9SdWxl
+X0hlbGxvX1dvcmxkXzJfMDsBAAtjb25zZXF1ZW5jZQEAIyhMb3JnL2Ryb29scy9zcGkvS25vd2xl
+ZGdlSGVscGVyOylWAQAKRXhjZXB0aW9ucwcAFwEAE2phdmEvbGFuZy9FeGNlcHRpb24JABkAGwcA
+GgEAEGphdmEvbGFuZy9TeXN0ZW0MABwAHQEAA291dAEAFUxqYXZhL2lvL1ByaW50U3RyZWFtOwgA
+HwEABmRvbmUgMQoAIQAjBwAiAQATamF2YS9pby9QcmludFN0cmVhbQwAJAAlAQAHcHJpbnRsbgEA
+FShMamF2YS9sYW5nL1N0cmluZzspVgEABmRyb29scwEAIExvcmcvZHJvb2xzL3NwaS9Lbm93bGVk
+Z2VIZWxwZXI7AQAKU291cmNlRmlsZQEAGVJ1bGVfSGVsbG9fV29ybGRfMl8wLmphdmEAIQABAAMA
+AAABABoABQAGAAEABwAAAAIACAACAAEACgALAAEADAAAAC8AAQABAAAABSq3AA2xAAAAAgAPAAAA
+BgABAAAABwAQAAAADAABAAAABQARABIAAAAJABMAFAACABUAAAAEAAEAFgAMAAAANwACAAEAAAAJ
+sgAYEh62ACCxAAAAAgAPAAAACgACAAAACgAIAAwAEAAAAAwAAQAAAAkAJgAnAAAAAQAoAAAAAgAp
+</byte-array>
</entry>
<entry>
<string>org/drools/reteoo/Rule_Hello_World_1_0.class</string>
- <byte-array>yv66vgAAADAAJQcAAgEAJm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMV8wBwAE
-AQAQamF2YS9sYW5nL09iamVjdAEABjxpbml0PgEAAygpVgEABENvZGUKAAMACQwABQAGAQAPTGlu
-ZU51bWJlclRhYmxlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAEdGhpcwEAKExvcmcvZHJvb2xzL3Jl
-dGVvby9SdWxlX0hlbGxvX1dvcmxkXzFfMDsBAAtjb25zZXF1ZW5jZQEAIyhMb3JnL2Ryb29scy9z
-cGkvS25vd2xlZGdlSGVscGVyOylWAQAKRXhjZXB0aW9ucwcAEgEAE2phdmEvbGFuZy9FeGNlcHRp
-b24JABQAFgcAFQEAEGphdmEvbGFuZy9TeXN0ZW0MABcAGAEAA291dAEAFUxqYXZhL2lvL1ByaW50
-U3RyZWFtOwgAGgEABmRvbmUgMQoAHAAeBwAdAQATamF2YS9pby9QcmludFN0cmVhbQwAHwAgAQAH
-cHJpbnRsbgEAFShMamF2YS9sYW5nL1N0cmluZzspVgEABmRyb29scwEAIExvcmcvZHJvb2xzL3Nw
-aS9Lbm93bGVkZ2VIZWxwZXI7AQAKU291cmNlRmlsZQEAGVJ1bGVfSGVsbG9fV29ybGRfMV8wLmph
-dmEAIQABAAMAAAAAAAIAAQAFAAYAAQAHAAAALwABAAEAAAAFKrcACLEAAAACAAoAAAAGAAEAAAAH
-AAsAAAAMAAEAAAAFAAwADQAAAAkADgAPAAIAEAAAAAQAAQARAAcAAAA3AAIAAQAAAAmyABMSGbYA
-G7EAAAACAAoAAAAKAAIAAAAJAAgACwALAAAADAABAAAACQAhACIAAAABACMAAAACACQ=</byte-array>
+ <byte-array>yv66vgAAADAAKgcAAgEAJm9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMV8wBwAE
+AQAQamF2YS9sYW5nL09iamVjdAEAEHNlcmlhbFZlcnNpb25VSUQBAAFKAQANQ29uc3RhbnRWYWx1
+ZQVuXqy++rNzagEABjxpbml0PgEAAygpVgEABENvZGUKAAMADgwACgALAQAPTGluZU51bWJlclRh
+YmxlAQASTG9jYWxWYXJpYWJsZVRhYmxlAQAEdGhpcwEAKExvcmcvZHJvb2xzL3JldGVvby9SdWxl
+X0hlbGxvX1dvcmxkXzFfMDsBAAtjb25zZXF1ZW5jZQEAIyhMb3JnL2Ryb29scy9zcGkvS25vd2xl
+ZGdlSGVscGVyOylWAQAKRXhjZXB0aW9ucwcAFwEAE2phdmEvbGFuZy9FeGNlcHRpb24JABkAGwcA
+GgEAEGphdmEvbGFuZy9TeXN0ZW0MABwAHQEAA291dAEAFUxqYXZhL2lvL1ByaW50U3RyZWFtOwgA
+HwEABmRvbmUgMQoAIQAjBwAiAQATamF2YS9pby9QcmludFN0cmVhbQwAJAAlAQAHcHJpbnRsbgEA
+FShMamF2YS9sYW5nL1N0cmluZzspVgEABmRyb29scwEAIExvcmcvZHJvb2xzL3NwaS9Lbm93bGVk
+Z2VIZWxwZXI7AQAKU291cmNlRmlsZQEAGVJ1bGVfSGVsbG9fV29ybGRfMV8wLmphdmEAIQABAAMA
+AAABABoABQAGAAEABwAAAAIACAACAAEACgALAAEADAAAAC8AAQABAAAABSq3AA2xAAAAAgAPAAAA
+BgABAAAABwAQAAAADAABAAAABQARABIAAAAJABMAFAACABUAAAAEAAEAFgAMAAAANwACAAEAAAAJ
+sgAYEh62ACCxAAAAAgAPAAAACgACAAAACgAIAAwAEAAAAAwAAQAAAAkAJgAnAAAAAQAoAAAAAgAp
+</byte-array>
</entry>
<entry>
<string>org/drools/reteoo/Rule_Hello_World_2_0ConsequenceInvoker.class</string>
- <byte-array>yv66vgAAADAAMwcAAgEAOG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wQ29u
+ <byte-array>yv66vgAAADAAOAcAAgEAOG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMl8wQ29u
c2VxdWVuY2VJbnZva2VyBwAEAQAQamF2YS9sYW5nL09iamVjdAcABgEAGm9yZy9kcm9vbHMvc3Bp
-L0NvbnNlcXVlbmNlAQAGPGluaXQ+AQADKClWAQAEQ29kZQoAAwALDAAHAAgBAA9MaW5lTnVtYmVy
-VGFibGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQA6TG9yZy9kcm9vbHMvcmV0ZW9vL1J1
-bGVfSGVsbG9fV29ybGRfMl8wQ29uc2VxdWVuY2VJbnZva2VyOwEACGV2YWx1YXRlAQA9KExvcmcv
-ZHJvb2xzL3NwaS9Lbm93bGVkZ2VIZWxwZXI7TG9yZy9kcm9vbHMvV29ya2luZ01lbW9yeTspVgEA
-CkV4Y2VwdGlvbnMHABQBABNqYXZhL2xhbmcvRXhjZXB0aW9uCwAWABgHABcBAB5vcmcvZHJvb2xz
-L3NwaS9Lbm93bGVkZ2VIZWxwZXIMABkAGgEACGdldFR1cGxlAQAYKClMb3JnL2Ryb29scy9zcGkv
-VHVwbGU7CwAWABwMAB0AHgEAB2dldFJ1bGUBABgoKUxvcmcvZHJvb2xzL3J1bGUvUnVsZTsKACAA
-IgcAIQEAFG9yZy9kcm9vbHMvcnVsZS9SdWxlDAAjACQBAA9nZXREZWNsYXJhdGlvbnMBACAoKVtM
-b3JnL2Ryb29scy9ydWxlL0RlY2xhcmF0aW9uOwoAJgAoBwAnAQAmb3JnL2Ryb29scy9yZXRlb28v
-UnVsZV9IZWxsb19Xb3JsZF8yXzAMACkAKgEAC2NvbnNlcXVlbmNlAQAjKExvcmcvZHJvb2xzL3Nw
-aS9Lbm93bGVkZ2VIZWxwZXI7KVYBAA9rbm93bGVkZ2VIZWxwZXIBACBMb3JnL2Ryb29scy9zcGkv
-S25vd2xlZGdlSGVscGVyOwEADXdvcmtpbmdNZW1vcnkBABpMb3JnL2Ryb29scy9Xb3JraW5nTWVt
-b3J5OwEABHJ1bGUBABZMb3JnL2Ryb29scy9ydWxlL1J1bGU7AQAKU291cmNlRmlsZQEAK1J1bGVf
-SGVsbG9fV29ybGRfMl8wQ29uc2VxdWVuY2VJbnZva2VyLmphdmEAIQABAAMAAQAFAAAAAgABAAcA
-CAABAAkAAAAvAAEAAQAAAAUqtwAKsQAAAAIADAAAAAYAAQAAAAMADQAAAAwAAQAAAAUADgAPAAAA
-AQAQABEAAgASAAAABAABABMACQAAAHQAAQAEAAAAGCu5ABUBAFcruQAbAQBOLbYAH1cruAAlsQAA
-AAIADAAAABoABgAAAAgABwAJAA4ACgATABEAFAAQABcAFAANAAAAKgAEAAAAGAAOAA8AAAAAABgA
-KwAsAAEAAAAYAC0ALgACAA4ACgAvADAAAwABADEAAAACADI=</byte-array>
+L0NvbnNlcXVlbmNlAQAQc2VyaWFsVmVyc2lvblVJRAEAAUoBAA1Db25zdGFudFZhbHVlBW5erL76
+s3NqAQAGPGluaXQ+AQADKClWAQAEQ29kZQoAAwAQDAAMAA0BAA9MaW5lTnVtYmVyVGFibGUBABJM
+b2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQA6TG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9f
+V29ybGRfMl8wQ29uc2VxdWVuY2VJbnZva2VyOwEACGV2YWx1YXRlAQA9KExvcmcvZHJvb2xzL3Nw
+aS9Lbm93bGVkZ2VIZWxwZXI7TG9yZy9kcm9vbHMvV29ya2luZ01lbW9yeTspVgEACkV4Y2VwdGlv
+bnMHABkBABNqYXZhL2xhbmcvRXhjZXB0aW9uCwAbAB0HABwBAB5vcmcvZHJvb2xzL3NwaS9Lbm93
+bGVkZ2VIZWxwZXIMAB4AHwEACGdldFR1cGxlAQAYKClMb3JnL2Ryb29scy9zcGkvVHVwbGU7CwAb
+ACEMACIAIwEAB2dldFJ1bGUBABgoKUxvcmcvZHJvb2xzL3J1bGUvUnVsZTsKACUAJwcAJgEAFG9y
+Zy9kcm9vbHMvcnVsZS9SdWxlDAAoACkBAA9nZXREZWNsYXJhdGlvbnMBACAoKVtMb3JnL2Ryb29s
+cy9ydWxlL0RlY2xhcmF0aW9uOwoAKwAtBwAsAQAmb3JnL2Ryb29scy9yZXRlb28vUnVsZV9IZWxs
+b19Xb3JsZF8yXzAMAC4ALwEAC2NvbnNlcXVlbmNlAQAjKExvcmcvZHJvb2xzL3NwaS9Lbm93bGVk
+Z2VIZWxwZXI7KVYBAA9rbm93bGVkZ2VIZWxwZXIBACBMb3JnL2Ryb29scy9zcGkvS25vd2xlZGdl
+SGVscGVyOwEADXdvcmtpbmdNZW1vcnkBABpMb3JnL2Ryb29scy9Xb3JraW5nTWVtb3J5OwEABHJ1
+bGUBABZMb3JnL2Ryb29scy9ydWxlL1J1bGU7AQAKU291cmNlRmlsZQEAK1J1bGVfSGVsbG9fV29y
+bGRfMl8wQ29uc2VxdWVuY2VJbnZva2VyLmphdmEAIQABAAMAAQAFAAEAGgAHAAgAAQAJAAAAAgAK
+AAIAAQAMAA0AAQAOAAAALwABAAEAAAAFKrcAD7EAAAACABEAAAAGAAEAAAADABIAAAAMAAEAAAAF
+ABMAFAAAAAEAFQAWAAIAFwAAAAQAAQAYAA4AAAB0AAEABAAAABgruQAaAQBXK7kAIAEATi22ACRX
+K7gAKrEAAAACABEAAAAaAAYAAAAKAAcACwAOAAwAEwATABQAEgAXABYAEgAAACoABAAAABgAEwAU
+AAAAAAAYADAAMQABAAAAGAAyADMAAgAOAAoANAA1AAMAAQA2AAAAAgA3</byte-array>
</entry>
<entry>
<string>org/drools/reteoo/Rule_Hello_World_1_0ConsequenceInvoker.class</string>
- <byte-array>yv66vgAAADAAMwcAAgEAOG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMV8wQ29u
+ <byte-array>yv66vgAAADAAOAcAAgEAOG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9fV29ybGRfMV8wQ29u
c2VxdWVuY2VJbnZva2VyBwAEAQAQamF2YS9sYW5nL09iamVjdAcABgEAGm9yZy9kcm9vbHMvc3Bp
-L0NvbnNlcXVlbmNlAQAGPGluaXQ+AQADKClWAQAEQ29kZQoAAwALDAAHAAgBAA9MaW5lTnVtYmVy
-VGFibGUBABJMb2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQA6TG9yZy9kcm9vbHMvcmV0ZW9vL1J1
-bGVfSGVsbG9fV29ybGRfMV8wQ29uc2VxdWVuY2VJbnZva2VyOwEACGV2YWx1YXRlAQA9KExvcmcv
-ZHJvb2xzL3NwaS9Lbm93bGVkZ2VIZWxwZXI7TG9yZy9kcm9vbHMvV29ya2luZ01lbW9yeTspVgEA
-CkV4Y2VwdGlvbnMHABQBABNqYXZhL2xhbmcvRXhjZXB0aW9uCwAWABgHABcBAB5vcmcvZHJvb2xz
-L3NwaS9Lbm93bGVkZ2VIZWxwZXIMABkAGgEACGdldFR1cGxlAQAYKClMb3JnL2Ryb29scy9zcGkv
-VHVwbGU7CwAWABwMAB0AHgEAB2dldFJ1bGUBABgoKUxvcmcvZHJvb2xzL3J1bGUvUnVsZTsKACAA
-IgcAIQEAFG9yZy9kcm9vbHMvcnVsZS9SdWxlDAAjACQBAA9nZXREZWNsYXJhdGlvbnMBACAoKVtM
-b3JnL2Ryb29scy9ydWxlL0RlY2xhcmF0aW9uOwoAJgAoBwAnAQAmb3JnL2Ryb29scy9yZXRlb28v
-UnVsZV9IZWxsb19Xb3JsZF8xXzAMACkAKgEAC2NvbnNlcXVlbmNlAQAjKExvcmcvZHJvb2xzL3Nw
-aS9Lbm93bGVkZ2VIZWxwZXI7KVYBAA9rbm93bGVkZ2VIZWxwZXIBACBMb3JnL2Ryb29scy9zcGkv
-S25vd2xlZGdlSGVscGVyOwEADXdvcmtpbmdNZW1vcnkBABpMb3JnL2Ryb29scy9Xb3JraW5nTWVt
-b3J5OwEABHJ1bGUBABZMb3JnL2Ryb29scy9ydWxlL1J1bGU7AQAKU291cmNlRmlsZQEAK1J1bGVf
-SGVsbG9fV29ybGRfMV8wQ29uc2VxdWVuY2VJbnZva2VyLmphdmEAIQABAAMAAQAFAAAAAgABAAcA
-CAABAAkAAAAvAAEAAQAAAAUqtwAKsQAAAAIADAAAAAYAAQAAAAMADQAAAAwAAQAAAAUADgAPAAAA
-AQAQABEAAgASAAAABAABABMACQAAAHQAAQAEAAAAGCu5ABUBAFcruQAbAQBOLbYAH1cruAAlsQAA
-AAIADAAAABoABgAAAAgABwAJAA4ACgATABEAFAAQABcAFAANAAAAKgAEAAAAGAAOAA8AAAAAABgA
-KwAsAAEAAAAYAC0ALgACAA4ACgAvADAAAwABADEAAAACADI=</byte-array>
+L0NvbnNlcXVlbmNlAQAQc2VyaWFsVmVyc2lvblVJRAEAAUoBAA1Db25zdGFudFZhbHVlBW5erL76
+s3NqAQAGPGluaXQ+AQADKClWAQAEQ29kZQoAAwAQDAAMAA0BAA9MaW5lTnVtYmVyVGFibGUBABJM
+b2NhbFZhcmlhYmxlVGFibGUBAAR0aGlzAQA6TG9yZy9kcm9vbHMvcmV0ZW9vL1J1bGVfSGVsbG9f
+V29ybGRfMV8wQ29uc2VxdWVuY2VJbnZva2VyOwEACGV2YWx1YXRlAQA9KExvcmcvZHJvb2xzL3Nw
+aS9Lbm93bGVkZ2VIZWxwZXI7TG9yZy9kcm9vbHMvV29ya2luZ01lbW9yeTspVgEACkV4Y2VwdGlv
+bnMHABkBABNqYXZhL2xhbmcvRXhjZXB0aW9uCwAbAB0HABwBAB5vcmcvZHJvb2xzL3NwaS9Lbm93
+bGVkZ2VIZWxwZXIMAB4AHwEACGdldFR1cGxlAQAYKClMb3JnL2Ryb29scy9zcGkvVHVwbGU7CwAb
+ACEMACIAIwEAB2dldFJ1bGUBABgoKUxvcmcvZHJvb2xzL3J1bGUvUnVsZTsKACUAJwcAJgEAFG9y
+Zy9kcm9vbHMvcnVsZS9SdWxlDAAoACkBAA9nZXREZWNsYXJhdGlvbnMBACAoKVtMb3JnL2Ryb29s
+cy9ydWxlL0RlY2xhcmF0aW9uOwoAKwAtBwAsAQAmb3JnL2Ryb29scy9yZXRlb28vUnVsZV9IZWxs
+b19Xb3JsZF8xXzAMAC4ALwEAC2NvbnNlcXVlbmNlAQAjKExvcmcvZHJvb2xzL3NwaS9Lbm93bGVk
+Z2VIZWxwZXI7KVYBAA9rbm93bGVkZ2VIZWxwZXIBACBMb3JnL2Ryb29scy9zcGkvS25vd2xlZGdl
+SGVscGVyOwEADXdvcmtpbmdNZW1vcnkBABpMb3JnL2Ryb29scy9Xb3JraW5nTWVtb3J5OwEABHJ1
+bGUBABZMb3JnL2Ryb29scy9ydWxlL1J1bGU7AQAKU291cmNlRmlsZQEAK1J1bGVfSGVsbG9fV29y
+bGRfMV8wQ29uc2VxdWVuY2VJbnZva2VyLmphdmEAIQABAAMAAQAFAAEAGgAHAAgAAQAJAAAAAgAK
+AAIAAQAMAA0AAQAOAAAALwABAAEAAAAFKrcAD7EAAAACABEAAAAGAAEAAAADABIAAAAMAAEAAAAF
+ABMAFAAAAAEAFQAWAAIAFwAAAAQAAQAYAA4AAAB0AAEABAAAABgruQAaAQBXK7kAIAEATi22ACRX
+K7gAKrEAAAACABEAAAAaAAYAAAAKAAcACwAOAAwAEwATABQAEgAXABYAEgAAACoABAAAABgAEwAU
+AAAAAAAYADAAMQABAAAAGAAyADMAAgAOAAoANAA1AAMAAQA2AAAAAgA3</byte-array>
</entry>
</map>
<null/>
@@ -93,7 +99,7 @@
Y2xhcmF0aW9uc3QAD0xqYXZhL3V0aWwvTWFwO0wACGR1cmF0aW9udAAZTG9yZy9kcm9vbHMvc3Bp
L0R1cmF0aW9uO0wAB2xoc1Jvb3R0ABVMb3JnL2Ryb29scy9ydWxlL0FuZDtMAARuYW1lcQB+AARM
AANwa2dxAH4ABHhwAAAAAAAAAAABAAAAAAABcHQABE1BSU5zcgA4b3JnLmRyb29scy5yZXRlb28u
-UnVsZV9IZWxsb19Xb3JsZF8xXzBDb25zZXF1ZW5jZUludm9rZXIn4ZXyoCL1QgIAAHhwdXIAHltM
+UnVsZV9IZWxsb19Xb3JsZF8xXzBDb25zZXF1ZW5jZUludm9rZXJuXqy++rNzagIAAHhwdXIAHltM
b3JnLmRyb29scy5ydWxlLkRlY2xhcmF0aW9uO/Wnzws0aCnjAgAAeHAAAAAAc3EAfgAAP0AAAAAA
AAx3CAAAABAAAAAAeHBzcgATb3JnLmRyb29scy5ydWxlLkFuZPz45yLwpsN2AgAAeHIAHG9yZy5k
cm9vbHMucnVsZS5Hcm91cEVsZW1lbnTG3JO/b7XpWAIAAUwACGNoaWxkcmVudAAQTGphdmEvdXRp
@@ -128,8 +134,8 @@
AH4AH3EAfgAmc3EAfgAncQB+ACt0AAhtZXNzYWdlM3NxAH4ALXQABVRocmVleHBzcQB+ADEAAADS
cQB+ACt4eHQADUhlbGxvIFdvcmxkIDFwdAA4b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19X
b3JsZF8yXzBDb25zZXF1ZW5jZUludm9rZXJzcQB+AAMAAAAAAAAAAAIAAAAAAAFwcQB+AAtzcgA4
-b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8yXzBDb25zZXF1ZW5jZUludm9rZXJ0
-dXLt8KwGgwIAAHhwdXEAfgAOAAAAAXNyABtvcmcuZHJvb2xzLnJ1bGUuRGVjbGFyYXRpb24DczwB
+b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8yXzBDb25zZXF1ZW5jZUludm9rZXJu
+Xqy++rNzagIAAHhwdXEAfgAOAAAAAXNyABtvcmcuZHJvb2xzLnJ1bGUuRGVjbGFyYXRpb24DczwB
8iDr1gIAA0kABmNvbHVtbkwACWV4dHJhY3RvcnQAGkxvcmcvZHJvb2xzL3NwaS9FeHRyYWN0b3I7
TAAKaWRlbnRpZmllcnEAfgAEeHAAAAAAc3EAfgAncQB+ACt0AAhtZXNzYWdlMXQACSRtZXNzYWdl
MXNxAH4AAD9AAAAAAAAMdwgAAAAQAAAAAXEAfgB1cQB+AHJ4cHNxAH4AEXNxAH4AFgAAAAR3BAAA
@@ -176,7 +182,7 @@
aW9uO0wADGRlY2xhcmF0aW9uc3QAD0xqYXZhL3V0aWwvTWFwO0wACGR1cmF0aW9udAAZTG9yZy9k
cm9vbHMvc3BpL0R1cmF0aW9uO0wAB2xoc1Jvb3R0ABVMb3JnL2Ryb29scy9ydWxlL0FuZDtMAARu
YW1lcQB+AAVMAANwa2dxAH4ABXhwAAAAAAAAAAABAAAAAAABcHQABE1BSU5zcgA4b3JnLmRyb29s
-cy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8xXzBDb25zZXF1ZW5jZUludm9rZXIn4ZXyoCL1QgIA
+cy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8xXzBDb25zZXF1ZW5jZUludm9rZXJuXqy++rNzagIA
AHhwdXIAHltMb3JnLmRyb29scy5ydWxlLkRlY2xhcmF0aW9uO/Wnzws0aCnjAgAAeHAAAAAAc3EA
fgABP0AAAAAAAAx3CAAAABAAAAAAeHBzcgATb3JnLmRyb29scy5ydWxlLkFuZPz45yLwpsN2AgAA
eHIAHG9yZy5kcm9vbHMucnVsZS5Hcm91cEVsZW1lbnTG3JO/b7XpWAIAAUwACGNoaWxkcmVudAAQ
@@ -211,7 +217,7 @@
AXcEAAAAAXNxAH4AIHEAfgAnc3EAfgAocQB+ACx0AAhtZXNzYWdlM3NxAH4ALnQABVRocmVleHBz
cQB+ADIAAADScQB+ACx4eHEAfgADcHQADUhlbGxvIFdvcmxkIDJzcQB+AAQAAAAAAAAAAAIAAAAA
AAFwcQB+AAxzcgA4b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8yXzBDb25zZXF1
-ZW5jZUludm9rZXJ0dXLt8KwGgwIAAHhwdXEAfgAPAAAAAXNyABtvcmcuZHJvb2xzLnJ1bGUuRGVj
+ZW5jZUludm9rZXJuXqy++rNzagIAAHhwdXEAfgAPAAAAAXNyABtvcmcuZHJvb2xzLnJ1bGUuRGVj
bGFyYXRpb24DczwB8iDr1gIAA0kABmNvbHVtbkwACWV4dHJhY3RvcnQAGkxvcmcvZHJvb2xzL3Nw
aS9FeHRyYWN0b3I7TAAKaWRlbnRpZmllcnEAfgAFeHAAAAAAc3EAfgAocQB+ACx0AAhtZXNzYWdl
MXQACSRtZXNzYWdlMXNxAH4AAT9AAAAAAAAMdwgAAAAQAAAAAXEAfgB1cQB+AHJ4cHNxAH4AEnNx
@@ -329,7 +335,7 @@
D0wACGR1cmF0aW9udAAZTG9yZy9kcm9vbHMvc3BpL0R1cmF0aW9uO0wAB2xoc1Jvb3R0ABVMb3Jn
L2Ryb29scy9ydWxlL0FuZDtMAARuYW1lcQB+AERMAANwa2dxAH4ARHhwAAAAAAAAAAACAAAAAAAB
cHQABE1BSU5zcgA4b3JnLmRyb29scy5yZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8yXzBDb25zZXF1
-ZW5jZUludm9rZXJ0dXLt8KwGgwIAAHhwdXIAHltMb3JnLmRyb29scy5ydWxlLkRlY2xhcmF0aW9u
+ZW5jZUludm9rZXJuXqy++rNzagIAAHhwdXIAHltMb3JnLmRyb29scy5ydWxlLkRlY2xhcmF0aW9u
O/Wnzws0aCnjAgAAeHAAAAABc3IAG29yZy5kcm9vbHMucnVsZS5EZWNsYXJhdGlvbgNzPAHyIOvW
AgADSQAGY29sdW1uTAAJZXh0cmFjdG9ydAAaTG9yZy9kcm9vbHMvc3BpL0V4dHJhY3RvcjtMAApp
ZGVudGlmaWVycQB+AER4cAAAAABzcgAjb3JnLmRyb29scy5iYXNlLkNsYXNzRmllbGRFeHRyYWN0
@@ -377,7 +383,7 @@
b2xzL3NwaS9GaWVsZENvbnN0cmFpbnQ7eHB1cgAhW0xvcmcuZHJvb2xzLnNwaS5GaWVsZENvbnN0
cmFpbnQ7mvaX9rRKD8YCAAB4cAAAAABzcQB+ADkAAAAAAAkAAAACc3EAfgAkAAAAA3cEAAAABHNx
AH4AQAAAAAAACgAAAABzcQB+AEMAAAAAAAAAAAEAAAAAAAFwcQB+AEpzcgA4b3JnLmRyb29scy5y
-ZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8xXzBDb25zZXF1ZW5jZUludm9rZXIn4ZXyoCL1QgIAAHhw
+ZXRlb28uUnVsZV9IZWxsb19Xb3JsZF8xXzBDb25zZXF1ZW5jZUludm9rZXJuXqy++rNzagIAAHhw
dXEAfgBNAAAAAHNxAH4ADD9AAAAAAAAMdwgAAAAQAAAAAHhwc3EAfgBac3EAfgAkAAAAA3cEAAAA
CnNxAH4AWnNxAH4AJAAAAAJ3BAAAAApzcQB+AGEAAAAAAAAAAHNxAH4AJAAAAAF3BAAAAAFzcQB+
AGVxAH4AbHNxAH4AUnEAfgBWdAAIbWVzc2FnZTFzcQB+AG9xAH4Acnhwc3EAfgBzAAAA0nEAfgBW
@@ -394,65 +400,65 @@
CG1lc3NhZ2Uzc3EAfgBvcQB+AKp4cHNxAH4AcwAAANJxAH4AVnh4dAANSGVsbG8gV29ybGQgMXBx
AH4Ax3EAfgA+c3EAfgA5AAAAAAAbAAAAAHNxAH4AJAAAAAF3BAAAAAFzcQB+AEAAAAAAABwAAAAA
cQB+AElxAH4BC3hzcQB+AMJ1cQB+AMUAAAABcQB+ALxxAH4Ax3EAfgApeHNxAH4AwnVxAH4AxQAA
-AAFzcgAqb3JnLmRyb29scy5jb21tb24uSW5zdGFuY2VFcXVhbHNDb25zdHJhaW50u86LzZRlbJsC
-AAJJAAtvdGhlckNvbHVtblsADGRlY2xhcmF0aW9uc3EAfgBGeHAAAAACdXEAfgBNAAAAAHNxAH4A
-OQAAAAAABwAAAAVzcQB+ACQAAAACdwQAAAACcQB+AMdzcQB+ADkAAAAAAAwAAAACc3EAfgAkAAAA
-A3cEAAAABHNxAH4AQAAAAAAADQAAAABxAH4AynEAfgEXc3EAfgA5AAAAAAAdAAAAAHNxAH4AJAAA
-AAF3BAAAAAFzcQB+AEAAAAAAAB4AAAAAcQB+AElxAH4BGnhzcQB+AMJxAH4AxnEAfgEXcQB+ADdz
-cQB+ADkAAAAAAB8AAAAAc3EAfgAkAAAAAXcEAAAAAXNxAH4AQAAAAAAAIAAAAABxAH4ASXEAfgEe
-eHNxAH4AwnVxAH4AxQAAAAFxAH4AvHEAfgEXcQB+ACl4c3EAfgDCdXEAfgDFAAAAAXNxAH4BEgAA
-AAJ1cQB+AE0AAAAAcQB+ARVzcQB+ADQAAQAAAAsAAAAAc3EAfgAjAAAAAncEAAAAAnEAfgEXc3EA
-fgA5AAAAAAAVAAAAAnNxAH4AJAAAAAN3BAAAAARzcQB+AEAAAAAAABYAAAAAcQB+AMpxAH4BKXNx
-AH4AOQAAAAAAJQAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBAAAAAAAAmAAAAAHEAfgBJcQB+ASx4
-c3EAfgDCcQB+AMZxAH4BKXEAfgA3c3EAfgA5AAAAAAAnAAAAAHNxAH4AJAAAAAF3BAAAAAFzcQB+
-AEAAAAAAACgAAAAAcQB+AElxAH4BMHhzcQB+AMJ1cQB+AMUAAAABcQB+ALxxAH4BKXEAfgApeHNx
-AH4AwnVxAH4AxQAAAAFzcQB+ARIAAAABdXEAfgBNAAAAAHNxAH4AOQAAAAAAEgAAAAVzcQB+ACQA
-AAACdwQAAAACc3EAfgA5AAAAAAATAAAAAnNxAH4AJAAAAAN3BAAAAARzcQB+AEAAAAAAABQAAAAA
-cQB+AMpxAH4BO3NxAH4AOQAAAAAAIQAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBAAAAAAAAiAAAA
-AHEAfgBJcQB+AT54c3EAfgDCcQB+AMZxAH4BO3EAfgA3c3EAfgA5AAAAAAAjAAAAAHNxAH4AJAAA
-AAF3BAAAAAFzcQB+AEAAAAAAACQAAAAAcQB+AElxAH4BQnhzcQB+AMJ1cQB+AMUAAAABcQB+ALxx
-AH4BO3EAfgApeHNxAH4AwnVxAH4AxQAAAAFzcQB+ARIAAAABdXEAfgBNAAAAAHEAfgE5c3EAfgA0
-AAEAAAAIAAAAAHNxAH4AIwAAAAJ3BAAAAAJxAH4Ax3EAfgE7eHEAfgD+c3EAfgAmAAEAAAABAAAA
-AHNxAH4AKnNxAH4ADD9AAAAAAAAMdwgAAAAQAAAAA3NxAH4AL3NxAH4ADD9AAAAAAAAMdwgAAAAQ
-AAAAAXEAfgByc3EAfgA0AAEAAAACAAAAAHNxAH4AIwAAAAF3BAAAAAFzcgAmb3JnLmRyb29scy5y
-ZXRlb28uTGVmdElucHV0QWRhcHRlck5vZGVmYbm/CjpSNAIAAkwABmJpbmRlcnEAfgA7TAAMb2Jq
-ZWN0U291cmNlcQB+ADZ4cQB+AD0AAQAAAAMAAAALc3EAfgAkAAAAAXcEAAAAAXNxAH4AOQAAAAAA
-BQAAAAtzcQB+ACQAAAACdwQAAAACcQB+ARVzcQB+ADkAAAAAABAAAAAFc3EAfgAkAAAAAXcEAAAA
-AXEAfgE5eHNxAH4AwnEAfgDGcQB+AVdzcQB+ADQAAQAAAA8AAAAAc3EAfgAjAAAAAXcEAAAAAXEA
-fgFZeHEAfgDuc3EAfgAmAAEAAAAOAAAAAHNxAH4AKnNxAH4ADD9AAAAAAAAMdwgAAAAQAAAAAXNx
-AH4AL3NxAH4ADD9AAAAAAAAMdwgAAAAQAAAAAnEAfgCZc3EAfgA0AAEAAAARAAAAAHNxAH4AIwAA
-AAF3BAAAAAFxAH4BOXhxAH4A9XEAfgFecQB+AJFxAH4BXHhxAH4A7nEAfgFheHNxAH4AJAAAAAJ3
-BAAAAAJxAH4BXHEAfgFjeHEAfgFjc3EAfgAkAAAAAHcEAAAAAXhxAH4A8nEAfgAieHNxAH4AwnVx
-AH4AxQAAAAFzcQB+ARIAAAAAdXEAfgBNAAAAAHEAfgFVc3EAfgA0AAEAAAAEAAAAAHNxAH4AIwAA
-AAF3BAAAAAFxAH4BV3hxAH4A3HEAfgFNeHNxAH4AwnEAfgDGcQB+AVJ4cQB+ANVxAH4BTXhxAH4A
-1XEAfgFQc3EAfgAvc3EAfgAMP0AAAAAAAAx3CAAAABAAAAACcQB+AKpxAH4BJ3EAfgBycQB+AUt4
-cQB+AP5xAH4BbnNxAH4AL3NxAH4ADD9AAAAAAAAMdwgAAAAQAAAAAnEAfgB7cQB+AWtxAH4AcnNx
-AH4ANAABAAAABgAAAABzcQB+ACMAAAABdwQAAAABcQB+ARV4cQB+AOVxAH4BTXhxAH4A3HEAfgFw
-eHNxAH4AJAAAAAV3BAAAAAdxAH4BUnEAfgFrcQB+AXJxAH4BS3EAfgEneHEAfgEnc3EAfgAkAAAA
-AHcEAAAAAXhxAH4A2XEAfgAicQB+ASl4c3EAfgDCdXEAfgDFAAAAAXNxAH4BEgAAAAN1cQB+AE0A
-AAAAcQB+AVlxAH4BY3EAfgEneHEAfgEFcQB+AU14c3EAfgDCdXEAfgDFAAAAAXNxAH4BEgAAAAF1
-cQB+AE0AAAAAcQB+AVdxAH4BcnEAfgFLcQB+ADdxAH4BGnEAfgE+cQB+ASx4cQB+ALBxAH4AKXhx
-AH4AsHEAfgAxeHNxAH4AJAAAAAF3BAAAAAFxAH4AN3hxAH4BMHNxAH4AJAAAAAR3BAAAAARxAH4B
-C3EAfgEecQB+AUJxAH4BMHhxAH4AuHEAfgAic3EAfgAMP0AAAAAAAAx3CAAAABAAAAADcQB+ALhx
-AH4AKXEAfgDZcQB+AU1xAH4A8nEAfgFeeHNyACZvcmcuZHJvb2xzLnNwaS5DbGFzc09iamVjdFR5
-cGVSZXNvbHZlcgKE2PxwsbDrAgABTAAKb2JqZWN0VHlwZXQAQ0xvcmcvZHJvb2xzL3NwaS9DbGFz
-c09iamVjdFR5cGVSZXNvbHZlciRNb2RpZmllYWJsZUNsYXNzT2JqZWN0VHlwZTt4cHNyAEFvcmcu
-ZHJvb2xzLnNwaS5DbGFzc09iamVjdFR5cGVSZXNvbHZlciRNb2RpZmllYWJsZUNsYXNzT2JqZWN0
-VHlwZUSlq5QCN/s1AgAAeHEAfgBzAAABLHBzcgAfb3JnLmRyb29scy5yZXRlb28uUmV0ZW9vQnVp
-bGRlchgdWfuPyAPwAgAJSQAXY3VycmVudE9mZnNldEFkanVzdG1lbnRJAAJpZEwADWF0dGFjaGVk
-Tm9kZXNxAH4AD0wADGRlY2xhcmF0aW9uc3EAfgAPTAAMb2JqZWN0U291cmNlcQB+ADZMAApvYmpl
-Y3RUeXBlcQB+AA9MAAhyZXNvbHZlcnEAfgAeTAAFcnVsZXNxAH4AD0wAC3R1cGxlU291cmNlcQB+
-ADx4cAAAAAAAAAApc3EAfgAMP0AAAAAAADB3CAAAAEAAAAAccQB+AVdxAH4BV3EAfgE+cQB+AT5x
-AH4APnEAfgA+cQB+AV5xAH4BXnEAfgFycQB+AXJxAH4BQnEAfgFCcQB+AWtxAH4Ba3EAfgEecQB+
-AR5xAH4BLHEAfgEscQB+ASlxAH4BKXEAfgFNcQB+AU1xAH4BY3EAfgFjcQB+ATBxAH4BMHEAfgEn
-cQB+ASdxAH4BS3EAfgFLcQB+AClxAH4AKXEAfgE7cQB+ATtxAH4BXHEAfgFccQB+AVlxAH4BWXEA
-fgEXcQB+ARdxAH4BVXEAfgFVcQB+AVJxAH4BUnEAfgE5cQB+ATlxAH4BC3EAfgELcQB+AMdxAH4A
-x3EAfgA3cQB+ADdxAH4BGnEAfgEacQB+ARVxAH4BFXhzcQB+AAw/QAAAAAAADHcIAAAAEAAAAAFx
-AH4AWHEAfgBReHEAfgApc3IAF2phdmEudXRpbC5MaW5rZWRIYXNoTWFwNMBOXBBswPsCAAFaAAth
-Y2Nlc3NPcmRlcnhxAH4ADD9AAAAAAAAMdwgAAAAQAAAAA3EAfgB0c3IAEWphdmEubGFuZy5JbnRl
-Z2VyEuKgpPeBhzgCAAFJAAV2YWx1ZXhyABBqYXZhLmxhbmcuTnVtYmVyhqyVHQuU4IsCAAB4cAAA
-AAVxAH4AknNxAH4BjAAAAARxAH4AwHNxAH4BjAAAAAZ4AHEAfgGDc3EAfgAMP0AAAAAAAAx3CAAA
-ABAAAAACcQB+AMp1cgAdW0xvcmcuZHJvb2xzLnJldGVvby5CYXNlTm9kZTsL58mTQ5yz6gIAAHhw
-AAAABHEAfgDJcQB+ARlxAH4BPXEAfgErcQB+AEl1cQB+AZIAAAAIcQB+AEJxAH4BDXEAfgEccQB+
-ASBxAH4BQHEAfgFEcQB+AS5xAH4BMnhxAH4BMA==</byte-array>
+AAFzcgAtb3JnLmRyb29scy5jb21tb24uSW5zdGFuY2VOb3RFcXVhbHNDb25zdHJhaW50u86LzZRl
+bJsCAAJJAAtvdGhlckNvbHVtblsADGRlY2xhcmF0aW9uc3EAfgBGeHAAAAACdXEAfgBNAAAAAHNx
+AH4AOQAAAAAABwAAAAVzcQB+ACQAAAACdwQAAAACcQB+AMdzcQB+ADkAAAAAAAwAAAACc3EAfgAk
+AAAAA3cEAAAABHNxAH4AQAAAAAAADQAAAABxAH4AynEAfgEXc3EAfgA5AAAAAAAdAAAAAHNxAH4A
+JAAAAAF3BAAAAAFzcQB+AEAAAAAAAB4AAAAAcQB+AElxAH4BGnhzcQB+AMJxAH4AxnEAfgEXcQB+
+ADdzcQB+ADkAAAAAAB8AAAAAc3EAfgAkAAAAAXcEAAAAAXNxAH4AQAAAAAAAIAAAAABxAH4ASXEA
+fgEeeHNxAH4AwnVxAH4AxQAAAAFxAH4AvHEAfgEXcQB+ACl4c3EAfgDCdXEAfgDFAAAAAXNxAH4B
+EgAAAAJ1cQB+AE0AAAAAcQB+ARVzcQB+ADQAAQAAAAsAAAAAc3EAfgAjAAAAAncEAAAAAnEAfgEX
+c3EAfgA5AAAAAAAVAAAAAnNxAH4AJAAAAAN3BAAAAARzcQB+AEAAAAAAABYAAAAAcQB+AMpxAH4B
+KXNxAH4AOQAAAAAAJQAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBAAAAAAAAmAAAAAHEAfgBJcQB+
+ASx4c3EAfgDCcQB+AMZxAH4BKXEAfgA3c3EAfgA5AAAAAAAnAAAAAHNxAH4AJAAAAAF3BAAAAAFz
+cQB+AEAAAAAAACgAAAAAcQB+AElxAH4BMHhzcQB+AMJ1cQB+AMUAAAABcQB+ALxxAH4BKXEAfgAp
+eHNxAH4AwnVxAH4AxQAAAAFzcQB+ARIAAAABdXEAfgBNAAAAAHNxAH4AOQAAAAAAEgAAAAVzcQB+
+ACQAAAACdwQAAAACc3EAfgA5AAAAAAATAAAAAnNxAH4AJAAAAAN3BAAAAARzcQB+AEAAAAAAABQA
+AAAAcQB+AMpxAH4BO3NxAH4AOQAAAAAAIQAAAABzcQB+ACQAAAABdwQAAAABc3EAfgBAAAAAAAAi
+AAAAAHEAfgBJcQB+AT54c3EAfgDCcQB+AMZxAH4BO3EAfgA3c3EAfgA5AAAAAAAjAAAAAHNxAH4A
+JAAAAAF3BAAAAAFzcQB+AEAAAAAAACQAAAAAcQB+AElxAH4BQnhzcQB+AMJ1cQB+AMUAAAABcQB+
+ALxxAH4BO3EAfgApeHNxAH4AwnVxAH4AxQAAAAFzcQB+ARIAAAABdXEAfgBNAAAAAHEAfgE5c3EA
+fgA0AAEAAAAIAAAAAHNxAH4AIwAAAAJ3BAAAAAJxAH4Ax3EAfgE7eHEAfgD+c3EAfgAmAAEAAAAB
+AAAAAHNxAH4AKnNxAH4ADD9AAAAAAAAMdwgAAAAQAAAAA3NxAH4AL3NxAH4ADD9AAAAAAAAMdwgA
+AAAQAAAAAXEAfgByc3EAfgA0AAEAAAACAAAAAHNxAH4AIwAAAAF3BAAAAAFzcgAmb3JnLmRyb29s
+cy5yZXRlb28uTGVmdElucHV0QWRhcHRlck5vZGVmYbm/CjpSNAIAAkwABmJpbmRlcnEAfgA7TAAM
+b2JqZWN0U291cmNlcQB+ADZ4cQB+AD0AAQAAAAMAAAALc3EAfgAkAAAAAXcEAAAAAXNxAH4AOQAA
+AAAABQAAAAtzcQB+ACQAAAACdwQAAAACcQB+ARVzcQB+ADkAAAAAABAAAAAFc3EAfgAkAAAAAXcE
+AAAAAXEAfgE5eHNxAH4AwnEAfgDGcQB+AVdzcQB+ADQAAQAAAA8AAAAAc3EAfgAjAAAAAXcEAAAA
+AXEAfgFZeHEAfgDuc3EAfgAmAAEAAAAOAAAAAHNxAH4AKnNxAH4ADD9AAAAAAAAMdwgAAAAQAAAA
+AXNxAH4AL3NxAH4ADD9AAAAAAAAMdwgAAAAQAAAAAnEAfgCZc3EAfgA0AAEAAAARAAAAAHNxAH4A
+IwAAAAF3BAAAAAFxAH4BOXhxAH4A9XEAfgFecQB+AJFxAH4BXHhxAH4A7nEAfgFheHNxAH4AJAAA
+AAJ3BAAAAAJxAH4BXHEAfgFjeHEAfgFjc3EAfgAkAAAAAHcEAAAAAXhxAH4A8nEAfgAieHNxAH4A
+wnVxAH4AxQAAAAFzcQB+ARIAAAAAdXEAfgBNAAAAAHEAfgFVc3EAfgA0AAEAAAAEAAAAAHNxAH4A
+IwAAAAF3BAAAAAFxAH4BV3hxAH4A3HEAfgFNeHNxAH4AwnEAfgDGcQB+AVJ4cQB+ANVxAH4BTXhx
+AH4A1XEAfgFQc3EAfgAvc3EAfgAMP0AAAAAAAAx3CAAAABAAAAACcQB+AKpxAH4BJ3EAfgBycQB+
+AUt4cQB+AP5xAH4BbnNxAH4AL3NxAH4ADD9AAAAAAAAMd...
[truncated message content] |
|
From: <jbo...@li...> - 2006-06-22 02:28:22
|
Author: tirelli
Date: 2006-06-21 22:27:59 -0400 (Wed, 21 Jun 2006)
New Revision: 4803
Added:
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_exists.drl
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedLeftMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultLeftMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultRightMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrLeftMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectNotEqualConstrLeftMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectNotEqualConstrRightMemory.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/BaseMultiLinkedListNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/MultiLinkedList.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/MultiLinkedListNode.java
Log:
JBRULES-317:
* Fixing 'exists' problem reported in JBRULES-317
* Added integration test for it
* Refactored MultiLinkedListNode to avoid attribute shadowing
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -705,6 +705,45 @@
list.size() );
}
+ public void testExists2() throws Exception {
+ final PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_exists.drl" ) ) );
+ final Package pkg = builder.getPackage();
+
+ final RuleBase ruleBase = getRuleBase();
+ ruleBase.addPackage( pkg );
+ final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+
+ final List list = new ArrayList();
+ workingMemory.setGlobal( "list",
+ list );
+
+ final Cheese cheddar = new Cheese( "cheddar", 7 );
+ final Cheese provolone = new Cheese( "provolone", 5);
+ final Person edson = new Person("Edson", "cheddar");
+ final Person bob = new Person("Bob", "muzzarela");
+
+ workingMemory.assertObject( cheddar );
+ workingMemory.fireAllRules();
+ assertEquals( 0,
+ list.size() );
+
+ workingMemory.assertObject( provolone );
+ workingMemory.fireAllRules();
+ assertEquals( 0,
+ list.size() );
+
+ workingMemory.assertObject( edson );
+ workingMemory.fireAllRules();
+ assertEquals( 1,
+ list.size() );
+
+ workingMemory.assertObject( bob );
+ workingMemory.fireAllRules();
+ assertEquals( 1,
+ list.size() );
+ }
+
public void testWithInvalidRule() throws Exception {
final PackageBuilder builder = new PackageBuilder();
builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "invalid_rule.drl" ) ) );
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_exists.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_exists.drl 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_exists.drl 2006-06-22 02:27:59 UTC (rev 4803)
@@ -0,0 +1,14 @@
+package org.drools.examples;
+
+import org.drools.Person;
+import org.drools.Cheese;
+
+global java.util.List list;
+
+rule "Buy cheese"
+when
+ $cheese: Cheese($type : type);
+ exists Person(likes == $type);
+then
+ list.add($cheese);
+end
Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_exists.drl
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ native
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceEqualsConstraint.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -1,5 +1,3 @@
-package org.drools.common;
-
/*
* Copyright 2005 JBoss Inc
*
@@ -16,19 +14,28 @@
* limitations under the License.
*/
+package org.drools.common;
+
import org.drools.WorkingMemory;
import org.drools.rule.Declaration;
import org.drools.spi.FieldConstraint;
import org.drools.spi.Tuple;
+/**
+ * InstanceEqualsConstraint
+ *
+ * Created: 21/06/2006
+ * @author <a href="mailto:ti...@po...">Edson Tirelli</a>
+ *
+ * @version $Id$
+ */
+
public class InstanceEqualsConstraint
implements
- FieldConstraint {
- /**
- *
- */
- private static final long serialVersionUID = -4913836428340400997L;
+ FieldConstraint {
+ private static final long serialVersionUID = 2986814365490743953L;
+
private final Declaration[] declarations = new Declaration[0];
private int otherColumn;
@@ -44,7 +51,7 @@
public boolean isAllowed(final InternalFactHandle handle,
final Tuple tuple,
final WorkingMemory workingMemory) {
- return !(tuple.get( this.otherColumn ).getObject() == handle.getObject());
+ return (tuple.get( this.otherColumn ).getObject() == handle.getObject());
}
public String toString() {
@@ -68,4 +75,4 @@
return this.otherColumn == other.otherColumn;
}
-}
\ No newline at end of file
+}
Added: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -0,0 +1,71 @@
+package org.drools.common;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.drools.WorkingMemory;
+import org.drools.rule.Declaration;
+import org.drools.spi.FieldConstraint;
+import org.drools.spi.Tuple;
+
+public class InstanceNotEqualsConstraint
+ implements
+ FieldConstraint {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -4913836428340400997L;
+
+ private final Declaration[] declarations = new Declaration[0];
+
+ private int otherColumn;
+
+ public InstanceNotEqualsConstraint(final int otherColumn) {
+ this.otherColumn = otherColumn;
+ }
+
+ public Declaration[] getRequiredDeclarations() {
+ return this.declarations;
+ }
+
+ public boolean isAllowed(final InternalFactHandle handle,
+ final Tuple tuple,
+ final WorkingMemory workingMemory) {
+ return !(tuple.get( this.otherColumn ).getObject() == handle.getObject());
+ }
+
+ public String toString() {
+ return "[InstanceNotEqualsConstraint otherColumn=" + this.otherColumn + " ]";
+ }
+
+ public int hashCode() {
+ return this.otherColumn;
+ }
+
+ public boolean equals(final Object object) {
+ if ( this == object ) {
+ return true;
+ }
+
+ if ( object == null || getClass() != object.getClass() ) {
+ return false;
+ }
+
+ final InstanceNotEqualsConstraint other = (InstanceNotEqualsConstraint) object;
+ return this.otherColumn == other.otherColumn;
+ }
+
+}
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/InstanceNotEqualsConstraint.java
___________________________________________________________________
Name: svn:keywords
+ id author date revision
Name: svn:eol-style
+ native
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooBuilder.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -33,6 +33,7 @@
import org.drools.base.FieldFactory;
import org.drools.common.BetaNodeBinder;
import org.drools.common.InstanceEqualsConstraint;
+import org.drools.common.InstanceNotEqualsConstraint;
import org.drools.rule.And;
import org.drools.rule.Column;
import org.drools.rule.Declaration;
@@ -410,7 +411,7 @@
final Map.Entry entry = (Map.Entry) it.next();
final Class previousClass = ((ClassObjectType) entry.getKey()).getClassType();
if ( thisClass.isAssignableFrom( previousClass ) ) {
- predicateConstraints.add( new InstanceEqualsConstraint( ((Integer) entry.getValue()).intValue() ) );
+ predicateConstraints.add( new InstanceNotEqualsConstraint( ((Integer) entry.getValue()).intValue() ) );
}
}
@@ -490,10 +491,12 @@
RightInputAdapterNode adapter = (RightInputAdapterNode) attachNode( new RightInputAdapterNode( this.id++,
column.getFactIndex(),
notNode ) );
+
+ BetaNodeBinder identityBinder = new BetaNodeBinder( new InstanceEqualsConstraint( column.getFactIndex() ) );
notNode = (NotNode) attachNode( new NotNode( this.id++,
tupleSource,
adapter,
- new BetaNodeBinder() ) );
+ identityBinder ) );
if ( exists.getChild() instanceof Not ) {
adapter = (RightInputAdapterNode) attachNode( new RightInputAdapterNode( this.id++,
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedLeftMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedLeftMemory.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedLeftMemory.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -105,7 +105,7 @@
this.innerMemory.remove( workingMemory,
(MultiLinkedListNodeWrapper) tuple.getChild() );
}
- tuple.getLinkedList().remove( tuple );
+ tuple.getOuterList().remove( tuple );
}
/**
@@ -139,7 +139,7 @@
this.innerMemory.remove( workingMemory,
(MultiLinkedListNodeWrapper) tuple.getChild() );
}
- tuple.getLinkedList().remove( tuple );
+ tuple.getOuterList().remove( tuple );
}
/**
@@ -299,7 +299,7 @@
* @see org.drools.reteoo.beta.BetaLeftMemory#isPossibleMatch(org.drools.util.MultiLinkedListNodeWrapper)
*/
public final boolean isPossibleMatch(final MultiLinkedListNodeWrapper tuple) {
- boolean isPossible = ((this.selectedList != null) && (tuple.getLinkedList() == this.selectedList));
+ boolean isPossible = ((this.selectedList != null) && (tuple.getOuterList() == this.selectedList));
if ( (isPossible) && (this.innerMemory != null) ) {
isPossible = this.innerMemory.isPossibleMatch( (MultiLinkedListNodeWrapper) tuple.getChild() );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -107,7 +107,7 @@
this.innerMemory.remove( workingMemory,
(MultiLinkedListNodeWrapper) matches.getChild() );
}
- matches.getLinkedList().remove( matches );
+ matches.getOuterList().remove( matches );
}
/**
@@ -142,7 +142,7 @@
this.innerMemory.remove( workingMemory,
(MultiLinkedListNodeWrapper) wrapper.getChild() );
}
- wrapper.getLinkedList().remove( wrapper );
+ wrapper.getOuterList().remove( wrapper );
}
/**
@@ -233,7 +233,7 @@
public final boolean isPossibleMatch(final MultiLinkedListNodeWrapper matches) {
boolean ret = false;
if ( this.selectedList != null ) {
- ret = matches.getLinkedList() == this.selectedList;
+ ret = matches.getOuterList() == this.selectedList;
if ( ret && (this.innerMemory != null) ) {
ret = this.innerMemory.isPossibleMatch( (MultiLinkedListNodeWrapper) matches.getChild() );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultLeftMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultLeftMemory.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultLeftMemory.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -113,7 +113,7 @@
* @inheritDoc
*/
public final boolean isPossibleMatch(final MultiLinkedListNodeWrapper tuple) {
- return tuple.getLinkedList() == this.memory;
+ return tuple.getOuterList() == this.memory;
}
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultRightMemory.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/DefaultRightMemory.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -63,7 +63,7 @@
*/
public final void remove(final WorkingMemory workingMemory,
final ObjectMatches matches) {
- matches.getLinkedList().remove( matches );
+ matches.getOuterList().remove( matches );
}
/**
@@ -85,7 +85,7 @@
*/
public final void remove(final WorkingMemory workingMemory,
final MultiLinkedListNodeWrapper wrapper) {
- wrapper.getLinkedList().remove( wrapper );
+ wrapper.getOuterList().remove( wrapper );
}
/**
@@ -125,7 +125,7 @@
* @see org.drools.reteoo.beta.BetaRightMemory#isPossibleMatch(org.drools.util.MultiLinkedListNodeWrapper)
*/
public final boolean isPossibleMatch(final MultiLinkedListNodeWrapper matches) {
- return matches.getLinkedList() == this.memory;
+ return matches.getOuterList() == this.memory;
}
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrLeftMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrLeftMemory.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrLeftMemory.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -106,7 +106,7 @@
this.innerMemory.remove( workingMemory,
(MultiLinkedListNodeWrapper) tuple.getChild() );
}
- final LinkedList list = tuple.getLinkedList();
+ final LinkedList list = tuple.getOuterList();
list.remove( tuple );
this.size--;
if ( list.isEmpty() ) {
@@ -147,7 +147,7 @@
(MultiLinkedListNodeWrapper) tuple.getChild() );
}
- final LinkedList list = tuple.getLinkedList();
+ final LinkedList list = tuple.getOuterList();
list.remove( tuple );
this.size--;
@@ -272,7 +272,7 @@
* @see org.drools.reteoo.beta.BetaLeftMemory#isPossibleMatch(org.drools.util.MultiLinkedListNodeWrapper)
*/
public final boolean isPossibleMatch(final MultiLinkedListNodeWrapper tuple) {
- return ((this.selectedList != null) && (tuple != null) && (tuple.getLinkedList() == this.selectedList));
+ return ((this.selectedList != null) && (tuple != null) && (tuple.getOuterList() == this.selectedList));
}
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -110,7 +110,7 @@
this.innerMemory.remove( workingMemory,
(MultiLinkedListNodeWrapper) matches.getChild() );
}
- final KeyMultiLinkedList list = (KeyMultiLinkedList) matches.getLinkedList();
+ final KeyMultiLinkedList list = (KeyMultiLinkedList) matches.getOuterList();
list.remove( matches );
this.memorySize--;
if ( list.isEmpty() ) {
@@ -152,7 +152,7 @@
this.innerMemory.remove( workingMemory,
(MultiLinkedListNodeWrapper) matches.getChild() );
}
- final KeyMultiLinkedList list = (KeyMultiLinkedList) matches.getLinkedList();
+ final KeyMultiLinkedList list = (KeyMultiLinkedList) matches.getOuterList();
list.remove( matches );
this.memorySize--;
if ( list.isEmpty() ) {
@@ -245,7 +245,7 @@
public final boolean isPossibleMatch(final MultiLinkedListNodeWrapper wrapper) {
boolean ret = false;
if ( this.selectedList != null ) {
- ret = wrapper.getLinkedList() == this.selectedList;
+ ret = wrapper.getOuterList() == this.selectedList;
if ( ret && (this.innerMemory != null) ) {
ret = this.innerMemory.isPossibleMatch( (MultiLinkedListNodeWrapper) wrapper.getChild() );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectNotEqualConstrLeftMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectNotEqualConstrLeftMemory.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectNotEqualConstrLeftMemory.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -108,7 +108,7 @@
this.innerMemory.remove( workingMemory,
(MultiLinkedListNodeWrapper) tuple.getChild().getChild() );
}
- final LinkedList list = tuple.getChild().getLinkedList();
+ final LinkedList list = tuple.getChild().getOuterList();
list.remove( tuple.getChild() );
if ( list.isEmpty() ) {
removeMemoryEntry( list );
@@ -153,7 +153,7 @@
(MultiLinkedListNodeWrapper) tuple.getChild().getChild() );
}
- final LinkedList list = tuple.getChild().getLinkedList();
+ final LinkedList list = tuple.getChild().getOuterList();
list.remove( tuple.getChild() );
if ( list.isEmpty() ) {
@@ -189,7 +189,7 @@
boolean hasnext = false;
if ( this.next == null ) {
while ( this.candidate != null ) {
- if ( this.candidate.getChild().getLinkedList() != ObjectNotEqualConstrLeftMemory.this.noMatchList ) {
+ if ( this.candidate.getChild().getOuterList() != ObjectNotEqualConstrLeftMemory.this.noMatchList ) {
if ( (ObjectNotEqualConstrLeftMemory.this.innerMemory == null) || (ObjectNotEqualConstrLeftMemory.this.innerMemory.isPossibleMatch( (MultiLinkedListNodeWrapper) this.candidate.getChild().getChild() )) ) {
hasnext = true;
this.next = this.candidate;
@@ -261,8 +261,8 @@
*/
public final boolean isPossibleMatch(final MultiLinkedListNodeWrapper tuple) {
boolean ret = false;
- if ( (tuple != null) && (tuple.getChild() != null) && (tuple.getChild().getLinkedList() != null) ) {
- ret = (tuple.getChild().getLinkedList() != this.noMatchList);
+ if ( (tuple != null) && (tuple.getChild() != null) && (tuple.getChild().getOuterList() != null) ) {
+ ret = (tuple.getChild().getOuterList() != this.noMatchList);
if ( ret && (this.innerMemory != null) ) {
ret = this.innerMemory.isPossibleMatch( (MultiLinkedListNodeWrapper) tuple.getChild().getChild() );
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectNotEqualConstrRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectNotEqualConstrRightMemory.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectNotEqualConstrRightMemory.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -118,11 +118,11 @@
}
// removing from indexed list
- matches.getChild().getLinkedList().remove( matches.getChild() );
+ matches.getChild().getOuterList().remove( matches.getChild() );
- if ( matches.getChild().getLinkedList().isEmpty() ) {
+ if ( matches.getChild().getOuterList().isEmpty() ) {
// removing index map entry
- this.removeMemoryEntry( (MultiLinkedList) matches.getChild().getLinkedList() );
+ this.removeMemoryEntry( (MultiLinkedList) matches.getChild().getOuterList() );
}
matches.setChild( null );
@@ -176,11 +176,11 @@
}
// removing from indexed list
- matches.getChild().getLinkedList().remove( matches.getChild() );
+ matches.getChild().getOuterList().remove( matches.getChild() );
- if ( matches.getChild().getLinkedList().isEmpty() ) {
+ if ( matches.getChild().getOuterList().isEmpty() ) {
// removing index map entry
- this.removeMemoryEntry( (MultiLinkedList) matches.getChild().getLinkedList() );
+ this.removeMemoryEntry( (MultiLinkedList) matches.getChild().getOuterList() );
}
matches.setChild( null );
@@ -207,7 +207,7 @@
boolean hasnext = false;
if ( this.next == null ) {
while ( this.candidate != null ) {
- if ( this.candidate.getChild().getLinkedList() != ObjectNotEqualConstrRightMemory.this.noMatchList ) {
+ if ( this.candidate.getChild().getOuterList() != ObjectNotEqualConstrRightMemory.this.noMatchList ) {
if ( (ObjectNotEqualConstrRightMemory.this.innerMemory == null) || (ObjectNotEqualConstrRightMemory.this.innerMemory.isPossibleMatch( (MultiLinkedListNodeWrapper) this.candidate.getChild().getChild() )) ) {
hasnext = true;
this.next = this.candidate;
@@ -276,8 +276,8 @@
*/
public final boolean isPossibleMatch(final MultiLinkedListNodeWrapper matches) {
boolean ret = false;
- if ( (matches != null) && (matches.getChild() != null) && (matches.getChild().getLinkedList() != null) ) {
- ret = (matches.getChild().getLinkedList() != this.noMatchList);
+ if ( (matches != null) && (matches.getChild() != null) && (matches.getChild().getOuterList() != null) ) {
+ ret = (matches.getChild().getOuterList() != this.noMatchList);
if ( ret && (this.innerMemory != null) ) {
ret = this.innerMemory.isPossibleMatch( (MultiLinkedListNodeWrapper) matches.getChild().getChild() );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/BaseMultiLinkedListNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/BaseMultiLinkedListNode.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/BaseMultiLinkedListNode.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -30,7 +30,7 @@
MultiLinkedListNode {
private MultiLinkedListNode child = null;
- private LinkedList list = null;
+ private LinkedList outerList = null;
public BaseMultiLinkedListNode() {
}
@@ -56,19 +56,19 @@
/**
* @inheritDoc
*
- * @see org.drools.util.MultiLinkedListNode#getLinkedList()
+ * @see org.drools.util.MultiLinkedListNode#getOuterList()
*/
- public LinkedList getLinkedList() {
- return this.list;
+ public LinkedList getOuterList() {
+ return this.outerList;
}
/**
* @inheritDoc
*
- * @see org.drools.util.MultiLinkedListNode#setLinkedList(org.drools.util.LinkedList)
+ * @see org.drools.util.MultiLinkedListNode#setOuterList(org.drools.util.LinkedList)
*/
- public void setLinkedList(final LinkedList list) {
- this.list = list;
+ public void setOuterList(final LinkedList list) {
+ this.outerList = list;
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/MultiLinkedList.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/MultiLinkedList.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/MultiLinkedList.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -40,7 +40,7 @@
*/
public void add(final MultiLinkedListNode node) {
super.add( node );
- node.setLinkedList( this );
+ node.setOuterList( this );
}
/**
@@ -55,6 +55,6 @@
*/
public void remove(final MultiLinkedListNode node) {
super.remove( node );
- node.setLinkedList( null );
+ node.setOuterList( null );
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/MultiLinkedListNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/MultiLinkedListNode.java 2006-06-22 01:09:52 UTC (rev 4802)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/util/MultiLinkedListNode.java 2006-06-22 02:27:59 UTC (rev 4803)
@@ -49,13 +49,13 @@
* @return
* The containing LinkedList
*/
- public LinkedList getLinkedList();
+ public LinkedList getOuterList();
/**
* Sets the containing LinkedList
* @param list
* The containing LinkedListNode
*/
- public void setLinkedList(LinkedList list);
+ public void setOuterList(LinkedList list);
}
|
|
From: <jbo...@li...> - 2006-06-22 01:09:58
|
Author: unibrew
Date: 2006-06-21 21:09:52 -0400 (Wed, 21 Jun 2006)
New Revision: 4802
Modified:
labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
Log:
[JBFORUMS-44] Working on pagination.
Modified: labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
===================================================================
--- labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java 2006-06-21 22:39:43 UTC (rev 4801)
+++ labs/jbossforums/trunk/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java 2006-06-22 01:09:52 UTC (rev 4802)
@@ -22,6 +22,8 @@
package org.jboss.portlet.forums.ui.action;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -44,6 +46,7 @@
import org.jboss.portlet.forums.ui.Constants;
import org.jboss.portlet.forums.ui.ForumUtil;
import org.jboss.portlet.forums.ui.JSFUtil;
+import org.jboss.portlet.forums.ui.view.PageNavigator;
/**
* @author <a href="mailto:rys...@jb...">Ryszard Kozmik</a>
@@ -51,75 +54,75 @@
public class ModeratorAction extends BaseController
{
+ //preference related data
+ private PreferenceController userPreferences = null;
+
//business data being generated in this bean by executing ui actions
//this is data is created such that it can be consumed by the view components
//like facelets
private Forum forum = null;
-
+ private PageNavigator pageNavigator = null;
+ private Collection page = new ArrayList();
+ private Map topicNavigator = new HashMap();
private Map checkboxes;
private ResourceBundle bundle;
- //----------------bean configuration supplied by the forums-config.xml---------------------------------------------------------------------------------------------
+ // Page navigation methods
+ /**
+ *
+ */
+ public PageNavigator getPageNavigator()
+ {
+ return this.pageNavigator;
+ }
+
+ /**
+ *
+ *
+ */
+ public Map getTopicNavigator()
+ {
+ return this.topicNavigator;
+ }
+
+ //------------user preferences-------------------------------------------------------------------------------------------------------------
+ /**
+ * @return Returns the userPreferences.
+ */
+ public PreferenceController getUserPreferences()
+ {
+ return userPreferences;
+ }
+ /**
+ * @param userPreferences The userPreferences to set.
+ */
+ public void setUserPreferences(PreferenceController userPreferences)
+ {
+ this.userPreferences = userPreferences;
+ }
+ //-------------------------------------------------------------------------------------------------------------------------------------
-
//----------------business data being generated for use by the view components like facelets---------------------------------------------------------------------------------------
public Forum getForum()
{
return this.forum;
}
- public String getPagination()
- {
- /**
- * TODO: implement real code to get the pagination...
- */
- //stub code
- return "10";
- }
- public String getPageNumber()
- {
- /**
- * TODO: implement real code to get the pageNumber...
- */
- //stub code
- return "2";
- }
-
public void setCheckboxes(Map checkboxes)
{
this.checkboxes = checkboxes;
- Iterator it = checkboxes.keySet().iterator();
- System.out.println("test");
- while (it.hasNext())
- {
- String temp = (String)it.next();
- System.out.println("KEY: "+temp+" VALUE:"+checkboxes.get(temp));
- }
}
public Map getCheckboxes()
{
- try {
- if (checkboxes!=null) {
- Iterator it = checkboxes.keySet().iterator();
- System.out.println("GETCHECKBOXES FULL");
- while (it.hasNext())
- {
- Integer temp = (Integer)it.next();
- System.out.println("KEY: "+temp+" VALUE:"+checkboxes.get(temp));
- }
- } else
- {
- System.out.println("GETCHECKBOXES: EMPTY");
- }
- } catch (Exception e)
- {
- e.printStackTrace();
- }
return checkboxes;
}
+ public Collection getPage() {
+ return page;
+ }
+
//------------user preferences-------------------------------------------------------------------------------------------------------------
//-------------------------------------------------------------------------------------------------------------------------------------
@@ -130,14 +133,6 @@
public ModeratorAction()
{
super();
- try
- {
- this.execute();
- }
- catch(Exception e)
- {
- JSFUtil.handleException(e);
- }
}
//ui actions supported by this bean----------------------------------------------------------------------------------------------------
@@ -185,16 +180,19 @@
String forum_to_id = ForumUtil.getParameter(Constants.p_forum_to_id);
if (forum_to_id==null || forum_to_id.trim().compareToIgnoreCase("-1")==0)
{
+ System.out.println("HELLO WORLD2");
message = bundle.getString("ERR_NO_DEST_FORUM");
FacesContext.getCurrentInstance().addMessage("message",
new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
return "success";
}
-
+ Forum forumDest=null;
try {
- Forum forum = this.getForumsModule().findForumById(new Integer(forum_to_id));
+ forumDest = this.getForumsModule().findForumById(new Integer(forum_to_id));
+ System.out.println("HELLO WORLD3");
} catch (Exception e)
{
+ System.out.println("HELLO WORL4");
message = bundle.getString("ERR_INTERNAL");
FacesContext.getCurrentInstance().addMessage("message",
new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
@@ -210,6 +208,7 @@
{
Topic topic = null;
try {
+ System.out.println("HELLO WORLD5");
topic = getForumsModule().findTopicById(topicId);
} catch(Exception e)
{
@@ -218,13 +217,14 @@
new FacesMessage(FacesMessage.SEVERITY_ERROR,message,"moderate"));
return "success";
}
- forum.addTopic(topic);
+ System.out.println("HELLO WORLD6");
+ forumDest.addTopic(topic);
}
}
message = bundle.getString("SUCC_TOPIC_MOVED");
FacesContext.getCurrentInstance().addMessage("message",
new FacesMessage(FacesMessage.SEVERITY_INFO,message, "moderate"));
- this.forum = BaseController.getForumsModule().findForumById(forum.getId());
+ this.forum = BaseController.getForumsModule().findForumById(this.forum.getId());
checkboxes=new HashMap();
} catch (Exception e)
{
@@ -365,6 +365,25 @@
return false;
}
+ /**
+ *
+ */
+ public boolean isInitialized()
+ {
+ boolean initialized = false;
+ try
+ {
+ this.execute();
+ initialized = true;
+ }
+ catch(Exception e)
+ {
+ JSFUtil.handleException(e);
+ }
+ System.out.println ("INITIALIZED: "+initialized);
+ return initialized;
+ }
+
private void execute() throws Exception
{
// Getting ResourceBundle with current Locale
@@ -374,19 +393,44 @@
ClassLoader ldr = Thread.currentThread().getContextClassLoader();
this.bundle = ResourceBundle.getBundle("ResourceJSF", locale, ldr);
+
+ int currentPage = 0;
+ //parse the input parameters
+ String pageParam = ForumUtil.getParameter(Constants.p_page);
+ if(pageParam!=null && pageParam.trim().length()>0)
+ {
+ //setup the page data
+ currentPage = Integer.parseInt(pageParam);
+ }
+
int forumId = -1;
String f = ForumUtil.getParameter(Constants.p_forumId);
+
if(f!=null && f.trim().length()>0)
{
forumId = Integer.parseInt(f);
}
- System.out.println("FORUMID: "+forumId);
+
+ //grab the data to be displayed for this page
if(forumId!=-1)
{
- // start with a stub implementation
+ //setup the business objects like the forum, topics etc that will be displayed
this.forum = BaseController.getForumsModule().findForumById(new Integer(forumId));
+ Object[] topicObjects = this.forum.getTopics().toArray();
checkboxes=new HashMap();
- }
+ System.out.println("TOPIC OBJ: "+topicObjects);
+ System.out.println("USER PREF: "+Integer.parseInt(this.userPreferences.getPreference(Constants.TOPICS_FORUM_KEY)));
+ System.out.println("CurrPage: "+currentPage);
+ //setup the pageNavigator for this forum
+ this.pageNavigator = new PageNavigator(
+ topicObjects, //total number of entries to be split up into pages
+ Integer.parseInt(this.userPreferences.getPreference(Constants.TOPICS_FORUM_KEY)),
+ currentPage //currently selected page being displayed, first page by default
+ );
+
+ this.page = this.pageNavigator.getPage();
+
+ }
}
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2006-06-21 22:39:43 UTC (rev 4801)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_body.xhtml 2006-06-22 01:09:52 UTC (rev 4802)
@@ -22,122 +22,210 @@
*/
-->
-<div xmlns="http://www.w3.org/1999/xhtml"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:c="http://java.sun.com/jstl/core"
- xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:forums="http://www.jboss.com/products/jbossportal/forums"
- class="bb"
->
+
+<div xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:forums="http://www.jboss.com/products/jbossportal/forums" class="bb">
<ui:composition template="/views/common/common.xhtml">
<ui:define name="mainContent">
-
-<h:messages layout="table" infoStyle="color:green" warnStyle="color:red" />
-
-<h:form>
- <table width="100%" cellspacing="2" cellpadding="2" border="0" align="center">
- <tr>
- <td align="left">
- <span class="nav">
- <a href="" class="nav"></a> ->
- <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}" styleClass="nav">
- <f:param name="f" value="#{moderator.forum.id}"/>
- <h:outputText value="#{moderator.forum.name}"/>
+<c:choose>
+ <c:when test="#{moderator.initialized && moderator.forum!=null && moderator.forum.id!=-1}">
+ <h:messages layout="table" infoStyle="color:green"
+ warnStyle="color:red"/>
+ <h:form>
+ <table width="100%" cellspacing="2" cellpadding="2" border="0"
+ align="center">
+ <tr>
+ <td align="left">
+ <span class="nav">
+ ->
+ <h:outputLink value="#{forums:outputLink(shared.links['forum'],true)}"
+ styleClass="nav">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <h:outputText value="#{moderator.forum.name}"/>
</h:outputLink>
- </span>
- </td>
- </tr>
- </table>
-
- <table width="100%" cellpadding="4" cellspacing="1" border="0" class="forumline">
- <tr>
- <td class="catHead" colspan="5" align="center" height="28">
- <span class="cattitle">${resource.Mod_CP}</span>
- </td>
- </tr>
- <tr>
- <td class="spaceRow" colspan="5" align="center">
- <span class="gensmall">${resource.Mod_CP_explain}</span>
- </td>
- </tr>
- <tr>
- <th width="4%" class="thLeft" nowrap="nowrap">&nbsp;</th>
- <th nowrap="nowrap">&nbsp;${resource.Topics}&nbsp;</th>
- <th width="8%" nowrap="nowrap">&nbsp;${resource.Replies}&nbsp;</th>
- <th width="17%" nowrap="nowrap">&nbsp;${resource.Last_Post}&nbsp;</th>
- <th width="5%" class="thRight" nowrap="nowrap">&nbsp;${resource.Select}&nbsp;</th>
- </tr>
- <c:forEach items="#{moderator.forum.topics}" var="topicrow" >
- <tr>
- <td class="row1" align="center" valign="middle">
- <img src="#{forums:folderTypeURL(topicrow,moderator.anonymous)}"
- width="19"
- height="18"
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <!-- page navigation -->
+ <c:if test="#{moderator.pageNavigator.totalPages gt 1}">
+ <td align="right" valign="middle" nowrap="nowrap">
+ <br/>
+ <span class="nav">
+ Goto page
+ <!-- previous link -->
+ <c:if test="#{moderator.pageNavigator.pageNumber gt 1}">
+ &nbsp;&nbsp;
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page"
+ value="#{moderator.pageNavigator.currentPage-1}"/>
+ <h:outputText value="Previous"/>
+ </h:outputLink>
+ &nbsp;&nbsp;
+ </c:if>
+ <!-- actual pages -->
+ <c:forEach items="#{moderator.pageNavigator.pages}"
+ var="page" varStatus="idx">
+ <c:choose>
+ <c:when test="#{moderator.pageNavigator.pageNumber==page}">
+ <b>${page}</b>
+ </c:when>
+ <c:otherwise>
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f"
+ value="#{moderator.forum.id}"/>
+ <f:param name="page" value="#{page-1}"/>
+ <h:outputText value="${page}"/>
+ </h:outputLink>
+ </c:otherwise>
+ </c:choose>
+ <c:if test="${idx.index-1 ne moderator.pageNavigator.totalPages-1}">
+ <f:verbatim>,</f:verbatim>
+ </c:if>
+ </c:forEach>
+ <!-- Next link -->
+ <c:if test="#{moderator.pageNavigator.pageNumber lt moderator.pageNavigator.totalPages}">
+ &nbsp;&nbsp;
+ <h:outputLink value="#{forums:outputLink(shared.links['moderator'],true)}">
+ <f:param name="f" value="#{moderator.forum.id}"/>
+ <f:param name="page"
+ value="#{moderator.pageNavigator.currentPage+1}"/>
+ <h:outputText value="Next"/>
+ </h:outputLink>
+ &nbsp;&nbsp;
+ </c:if>
+ </span>
+ </td>
+ </c:if>
+ </tr>
+ </table>
+ <table width="100%" cellpadding="4" cellspacing="1" border="0"
+ class="forumline">
+ <tr>
+ <td class="catHead" colspan="5" align="center" height="28">
+ <span class="cattitle">${resource.Mod_CP}</span>
+ </td>
+ </tr>
+ <tr>
+ <td class="spaceRow" colspan="5" align="center">
+ <span class="gensmall">${resource.Mod_CP_explain}</span>
+ </td>
+ </tr>
+ <tr>
+ <th width="4%" class="thLeft" nowrap="nowrap">&nbsp;</th>
+ <th nowrap="nowrap">&nbsp;${resource.Topics}&nbsp;</th>
+ <th width="8%" nowrap="nowrap">&nbsp;${resource.Replies}&nbsp;</th>
+ <th width="17%" nowrap="nowrap">&nbsp;${resource.Last_Post}&nbsp;</th>
+ <th width="5%" class="thRight" nowrap="nowrap">&nbsp;${resource.Select}&nbsp;</th>
+ </tr>
+ <c:forEach items="#{moderator.page}" var="topicrow">
+ <tr>
+ <td class="row1" align="center" valign="middle">
+ <img src="#{forums:folderTypeURL(topicrow,moderator.anonymous)}"
+ width="19" height="18"
alt="${resource.Topic_Moved}"
title="${resource.Topic_Moved}"/>
- </td>
- <td class="row1">
+ </td>
+ <td class="row1">
&nbsp;
- <span class="topictitle">${forums:folderType(topicrow)}
- <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}" styleClass="topictitle">
- <f:param name="t" value="${topicrow.id}"/>
- <h:outputText value="${topicrow.subject}"/>
- </h:outputLink>
+ <span class="topictitle">
+ ${forums:folderType(topicrow)}
+ <h:outputLink value="#{forums:outputLink(shared.links['topic'],true)}"
+ styleClass="topictitle">
+ <f:param name="t" value="${topicrow.id}"/>
+ <h:outputText value="${topicrow.subject}"/>
+ </h:outputLink>
</span>
- </td>
- <td class="row2" align="center" valign="middle"><span
- class="postdetails">${topicrow.replies}</span></td>
- <td class="row1" align="center" valign="middle"><span
- class="postdetails">${topicrow.lastPostDate}</span></td>
- <td class="row2" align="center" valign="middle">
- <h:selectBooleanCheckbox value="#{moderator.checkboxes[topicrow.id]}" />
- </td>
- </tr>
- </c:forEach>
- <tr align="right">
- <td class="catBottom" colspan="5" height="29">
-
- <h:commandButton action="#{moderator.deleteConfirm}" class="liteoption" value="${resource.Delete}">
- <f:param name="f" value="#{forum.forum.id}"/>
- </h:commandButton>
- &nbsp;
- <h:commandButton action="#{moderator.moveConfirm}" class="liteoption" value="${resource.Move}">
+ </td>
+ <td class="row2" align="center" valign="middle">
+ <span class="postdetails">${topicrow.replies}</span>
+ </td>
+ <td class="row1" align="center" valign="middle">
+ <span class="postdetails">${topicrow.lastPostDate}</span>
+ </td>
+ <td class="row2" align="center" valign="middle">
+ <h:selectBooleanCheckbox value="#{moderator.checkboxes[topicrow.id]}"/>
+ </td>
+ </tr>
+ </c:forEach>
+ <tr align="right">
+ <td class="catBottom" colspan="5" height="29">
+ <h:commandButton action="#{moderator.deleteConfirm}"
+ class="liteoption"
+ value="${resource.Delete}">
<f:param name="f" value="#{forum.forum.id}"/>
- </h:commandButton>
- &nbsp;
- <h:commandButton action="#{moderator.lockTopic}" class="liteoption" value="${resource.Lock}">
+ </h:commandButton>
+ &nbsp;
+ <h:commandButton action="#{moderator.moveConfirm}"
+ class="liteoption"
+ value="${resource.Move}">
<f:param name="f" value="#{forum.forum.id}"/>
- </h:commandButton>
- &nbsp;
- <h:commandButton action="#{moderator.unlockTopic}" class="liteoption" value="${resource.Unlock}">
+ </h:commandButton>
+ &nbsp;
+ <h:commandButton action="#{moderator.lockTopic}"
+ class="liteoption"
+ value="${resource.Lock}">
<f:param name="f" value="#{forum.forum.id}"/>
- </h:commandButton>
- </td>
- </tr>
- </table>
- <table width="100%" cellspacing="2" border="0" align="center" cellpadding="2">
- <tr>
- <td align="left" valign="middle">
- <span class="nav">
+ </h:commandButton>
+ &nbsp;
+ <h:commandButton action="#{moderator.unlockTopic}"
+ class="liteoption"
+ value="${resource.Unlock}">
+ <f:param name="f" value="#{forum.forum.id}"/>
+ </h:commandButton>
+ </td>
+ </tr>
+ </table>
+ <table width="100%" cellspacing="2" border="0" align="center"
+ cellpadding="2">
+ <!--<tr>
+ <td align="left" valign="middle">
+ <span class="nav">
<b>#{moderator.pagination}</b>
- </span>
- </td>
- <td align="right" valign="top" nowrap="nowrap">
- <span class="gensmall"></span>
- <br/>
- <span class="nav">#{moderator.pageNumber}</span>
- </td>
- </tr>
-</table>
-</h:form>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td align="right">
- <ui:include src="/views/jumpbox.xhtml"/>
- </td>
- </tr>
-</table>
+ </span>
+ </td>
+ <td align="right" valign="top" nowrap="nowrap">
+ <br/>
+ <span class="nav">#{moderator.pageNumber}</span>
+ </td>
+ </tr>-->
+ </table>
+ </h:form>
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td align="right">
+ <ui:include src="/views/jumpbox.xhtml"/>
+ </td>
+ </tr>
+ </table>
+ </c:when>
+ <c:otherwise>
+ <table class="forumline" width="100%" cellspacing="1" cellpadding="4" border="0">
+ <tr>
+ <td>
+ <table width="100%" cellspacing="0" cellpadding="1" border="0">
+ <tr>
+ <td>&nbsp;</td>
+ </tr>
+ <tr>
+ <td align="center">
+ <span class="gen">This forum has no posts....</span>
+ </td>
+ </tr>
+ <tr>
+ <td>&nbsp;</td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+ </c:otherwise>
+ </c:choose>
</ui:define>
</ui:composition>
-</div>
+</div>
\ No newline at end of file
Modified: labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml
===================================================================
--- labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml 2006-06-21 22:39:43 UTC (rev 4801)
+++ labs/jbossforums/trunk/forums/src/resources/portal-forums-war/views/moderator/modcp_move.xhtml 2006-06-22 01:09:52 UTC (rev 4802)
@@ -31,7 +31,7 @@
xmlns:forums="http://www.jboss.com/products/jbossportal/forums" class="bb">
<ui:composition template="/views/common/common.xhtml">
<ui:define name="mainContent">
- <form>
+ <h:form>
<table width="100%" cellspacing="2" cellpadding="2" border="0"
align="center">
<tr>
@@ -106,7 +106,7 @@
</td>
</tr>
</table>
- </form>
+ </h:form>
<ui:debug key="s" />
</ui:define>
</ui:composition>
|
|
From: <jbo...@li...> - 2006-06-21 22:39:49
|
Author: KrisVerlaenen
Date: 2006-06-21 18:39:43 -0400 (Wed, 21 Jun 2006)
New Revision: 4801
Modified:
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/LocationDeterminator.java
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java
labs/jbossrules/trunk/drools-ide/src/test/java/org/drools/ide/editors/completion/LocationDeterminatorTest.java
Log:
JBRULES-314: Lhs Rule completion should have better support for exists, not, eval, and, or
- extended completion support for eval, and, or, not, exists
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/LocationDeterminator.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/LocationDeterminator.java 2006-06-21 22:37:56 UTC (rev 4800)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/LocationDeterminator.java 2006-06-21 22:39:43 UTC (rev 4801)
@@ -8,9 +8,11 @@
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
+import org.drools.lang.descr.AndDescr;
import org.drools.lang.descr.ColumnDescr;
import org.drools.lang.descr.ExistsDescr;
import org.drools.lang.descr.NotDescr;
+import org.drools.lang.descr.OrDescr;
import org.drools.lang.descr.PackageDescr;
import org.drools.lang.descr.PatternDescr;
import org.drools.lang.descr.RuleDescr;
@@ -24,13 +26,22 @@
static final Pattern COLUMN_PATTERN_EXCLUDES_ARGUMENT = Pattern.compile(".*[(,](\\s*(\\S*)\\s*:)?\\s*([^\\s<>!=:]+)\\s+excludes\\s+", Pattern.DOTALL);
static final Pattern COLUMN_PATTERN_COMPARATOR_ARGUMENT = Pattern.compile(".*[(,](\\s*(\\S*)\\s*:)?\\s*([^\\s<>!=:]+)\\s*([<>=!]+)\\s*[^\\s<>!=:]*", Pattern.DOTALL);
+ static final Pattern EXISTS_PATTERN = Pattern.compile(".*\\s+exists\\s*\\(?\\s*((\\S*)\\s*:)?\\s*\\S*", Pattern.DOTALL);
+ static final Pattern NOT_PATTERN = Pattern.compile(".*\\s+not\\s*\\(?\\s*((\\S*)\\s*:)?\\s*\\S*", Pattern.DOTALL);
+ static final Pattern EVAL_PATTERN = Pattern.compile(".*\\s+eval\\s*\\(\\s*[^)]*", Pattern.DOTALL);
+
static final int LOCATION_UNKNOWN = 0;
static final int LOCATION_BEGIN_OF_CONDITION = 1;
+ static final int LOCATION_BEGIN_OF_CONDITION_EXISTS = 2;
+ static final int LOCATION_BEGIN_OF_CONDITION_AND_OR = 3;
+ static final int LOCATION_BEGIN_OF_CONDITION_NOT = 4;
static final int LOCATION_INSIDE_CONDITION_START = 100;
static final int LOCATION_INSIDE_CONDITION_OPERATOR = 101;
static final int LOCATION_INSIDE_CONDITION_ARGUMENT = 102;
+ static final int LOCATION_INSIDE_EVAL = 200;
+
static final String LOCATION_PROPERTY_CLASS_NAME = "ClassName";
static final String LOCATION_PROPERTY_PROPERTY_NAME = "PropertyName";
@@ -81,6 +92,18 @@
}
PatternDescr subDescr = (PatternDescr) subDescrs.get(subDescrs.size() - 1);
if (subDescr == null) {
+ Matcher matcher = EXISTS_PATTERN.matcher(backText);
+ if (matcher.matches()) {
+ return new Location(LOCATION_BEGIN_OF_CONDITION_EXISTS);
+ }
+ matcher = NOT_PATTERN.matcher(backText);
+ if (matcher.matches()) {
+ return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
+ }
+ matcher = EVAL_PATTERN.matcher(backText);
+ if (matcher.matches()) {
+ return new Location(LOCATION_INSIDE_EVAL);
+ }
return new Location(LOCATION_BEGIN_OF_CONDITION);
}
if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
@@ -145,36 +168,94 @@
} else if (descr instanceof ExistsDescr) {
List subDescrs = ((ExistsDescr) descr).getDescrs();
if (subDescrs.size() == 0) {
- return new Location(LOCATION_BEGIN_OF_CONDITION);
+ return new Location(LOCATION_BEGIN_OF_CONDITION_EXISTS);
}
if (subDescrs.size() == 1) {
PatternDescr subDescr = (PatternDescr) subDescrs.get(0);
if (subDescr == null) {
- return new Location(LOCATION_BEGIN_OF_CONDITION);
+ return new Location(LOCATION_BEGIN_OF_CONDITION_EXISTS);
}
- if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
- return new Location(LOCATION_BEGIN_OF_CONDITION);
- }
+ // not needed because an exist description is ended if subdescr is ended
+ // if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
+ // return new Location(LOCATION_BEGIN_OF_CONDITION);
+ // }
return determineLocationForDescr(subDescr, backText);
}
return determineLocationForDescr(descr, backText);
} else if (descr instanceof NotDescr) {
List subDescrs = ((NotDescr) descr).getDescrs();
if (subDescrs.size() == 0) {
- return new Location(LOCATION_BEGIN_OF_CONDITION);
+ return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
}
if (subDescrs.size() == 1) {
PatternDescr subDescr = (PatternDescr) subDescrs.get(0);
if (subDescr == null) {
- return new Location(LOCATION_BEGIN_OF_CONDITION);
+ return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
}
- if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
- return new Location(LOCATION_BEGIN_OF_CONDITION);
+ // not needed because a not description is ended if subdescr is ended
+ // if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
+ // return new Location(LOCATION_BEGIN_OF_CONDITION);
+ // }
+ Location location = determineLocationForDescr(subDescr, backText);
+ if (location.getType() == LOCATION_BEGIN_OF_CONDITION) {
+ return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
}
- return determineLocationForDescr(subDescr, backText);
+ return location;
}
return determineLocationForDescr(descr, backText);
-
+ } else if (descr instanceof AndDescr) {
+ List subDescrs = ((AndDescr) descr).getDescrs();
+ int size = subDescrs.size();
+ if (size == 2) {
+ PatternDescr subDescr = (PatternDescr) subDescrs.get(1);
+ if (subDescr == null) {
+ Matcher matcher = EXISTS_PATTERN.matcher(backText);
+ if (matcher.matches()) {
+ return new Location(LOCATION_BEGIN_OF_CONDITION_EXISTS);
+ }
+ matcher = NOT_PATTERN.matcher(backText);
+ if (matcher.matches()) {
+ return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
+ }
+ return new Location(LOCATION_BEGIN_OF_CONDITION_AND_OR);
+ // not needed because an and description is ended if subdescr is ended
+ // } else if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
+ // return new Location(LOCATION_BEGIN_OF_CONDITION);
+ } else {
+ Location location = determineLocationForDescr(subDescr, backText);
+ if (location.getType() == LOCATION_BEGIN_OF_CONDITION) {
+ return new Location(LOCATION_BEGIN_OF_CONDITION_AND_OR);
+ }
+ return location;
+ }
+ }
+ return new Location(LOCATION_UNKNOWN);
+ } else if (descr instanceof OrDescr) {
+ List subDescrs = ((OrDescr) descr).getDescrs();
+ int size = subDescrs.size();
+ if (size == 2) {
+ PatternDescr subDescr = (PatternDescr) subDescrs.get(1);
+ if (subDescr == null) {
+ Matcher matcher = EXISTS_PATTERN.matcher(backText);
+ if (matcher.matches()) {
+ return new Location(LOCATION_BEGIN_OF_CONDITION_EXISTS);
+ }
+ matcher = NOT_PATTERN.matcher(backText);
+ if (matcher.matches()) {
+ return new Location(LOCATION_BEGIN_OF_CONDITION_NOT);
+ }return new Location(LOCATION_BEGIN_OF_CONDITION_AND_OR);
+ // not needed because an or description is ended if subdescr is ended
+ // } else if (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0) {
+ // return new Location(LOCATION_BEGIN_OF_CONDITION);
+ } else {
+ Location location = determineLocationForDescr(subDescr, backText);
+ if (location.getType() == LOCATION_BEGIN_OF_CONDITION) {
+ return new Location(LOCATION_BEGIN_OF_CONDITION_AND_OR);
+ }
+ return location;
+ }
+ }
+ return new Location(LOCATION_UNKNOWN);
}
return new Location(LOCATION_UNKNOWN);
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java 2006-06-21 22:37:56 UTC (rev 4800)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/editors/completion/RuleCompletionProcessor.java 2006-06-21 22:39:43 UTC (rev 4801)
@@ -128,13 +128,22 @@
case LocationDeterminator.LOCATION_BEGIN_OF_CONDITION:
// if we are at the beginning of a new condition
// add drools keywords
- list.add( new RuleCompletionProposal(prefix.length(), "exists", "exists ", droolsIcon));
- list.add( new RuleCompletionProposal(prefix.length(), "not", "not ", droolsIcon));
list.add( new RuleCompletionProposal(prefix.length(), "and", "and ", droolsIcon));
list.add( new RuleCompletionProposal(prefix.length(), "or", "or ", droolsIcon));
RuleCompletionProposal prop = new RuleCompletionProposal(prefix.length(), "eval", "eval( )", 6 );
prop.setImage(droolsIcon);
list.add(prop);
+ prop = new RuleCompletionProposal(prefix.length(), "then", "then" + System.getProperty("line.separator") + "\t");
+ prop.setImage(droolsIcon);
+ list.add(prop);
+ // we do not break but also add all elements that are needed for and/or
+ case LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR:
+ list.add( new RuleCompletionProposal(prefix.length(), "not", "not ", droolsIcon));
+ // we do not break but also add all elements that are needed for not
+ case LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_NOT:
+ list.add( new RuleCompletionProposal(prefix.length(), "exists", "exists ", droolsIcon));
+ // we do not break but also add all elements that are needed for exists
+ case LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS:
// and add imported classes
List imports = getDRLEditor().getImports();
iterator = imports.iterator();
@@ -162,10 +171,7 @@
list.add(p);
}
}
- prop = new RuleCompletionProposal(prefix.length(), "then", "then" + System.getProperty("line.separator") + "\t");
- prop.setImage(droolsIcon);
- list.add(prop);
- break;
+ break;
case LocationDeterminator.LOCATION_INSIDE_CONDITION_START :
String className = (String) location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME);
if (className != null) {
@@ -255,6 +261,27 @@
// do nothing
}
break;
+ case LocationDeterminator.LOCATION_INSIDE_EVAL :
+ try {
+ parser = new DrlParser();
+ PackageDescr descr = parser.parse(backText);
+ List rules = descr.getRules();
+ if (rules != null && rules.size() == 1) {
+ Map result = new HashMap();
+ getRuleParameters(result, ((RuleDescr) rules.get(0)).getLhs().getDescrs());
+ Iterator iterator2 = result.keySet().iterator();
+ while (iterator2.hasNext()) {
+ String name = (String) iterator2.next();
+ RuleCompletionProposal proposal = new RuleCompletionProposal(prefix.length(), name);
+ proposal.setPriority(-1);
+ proposal.setImage(methodIcon);
+ list.add(proposal);
+ }
+ }
+ } catch (DroolsParserException exc) {
+ // do nothing
+ }
+ break;
}
}
}
Modified: labs/jbossrules/trunk/drools-ide/src/test/java/org/drools/ide/editors/completion/LocationDeterminatorTest.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/test/java/org/drools/ide/editors/completion/LocationDeterminatorTest.java 2006-06-21 22:37:56 UTC (rev 4800)
+++ labs/jbossrules/trunk/drools-ide/src/test/java/org/drools/ide/editors/completion/LocationDeterminatorTest.java 2006-06-21 22:39:43 UTC (rev 4801)
@@ -342,54 +342,113 @@
" when \n" +
" exists ";
location = LocationDeterminator.getLocationInCondition(input);
- assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
-
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
input =
"rule MyRule \n" +
" when \n" +
+ " exists ( ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " exists(";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
" exists Cl";
location = LocationDeterminator.getLocationInCondition(input);
- assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
-
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
input =
"rule MyRule \n" +
" when \n" +
+ " exists ( Cl";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " exists ( name : Cl";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
" exists Class (";
location = LocationDeterminator.getLocationInCondition(input);
assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
-
+
input =
"rule MyRule \n" +
" when \n" +
- " exists Class () \n" +
- " ";
+ " exists Class ( ) \n" +
+ " ";
location = LocationDeterminator.getLocationInCondition(input);
assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
-
+
/** NOT */
input =
"rule MyRule \n" +
" when \n" +
" not ";
location = LocationDeterminator.getLocationInCondition(input);
- assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_NOT, location.getType());
input =
"rule MyRule \n" +
" when \n" +
" not Cl";
location = LocationDeterminator.getLocationInCondition(input);
- assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_NOT, location.getType());
input =
"rule MyRule \n" +
" when \n" +
+ " not exists ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " not exists Cl";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
" not Class (";
location = LocationDeterminator.getLocationInCondition(input);
assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
+// TODO
+// input =
+// "rule MyRule \n" +
+// " when \n" +
+// " not exists Class (";
+// location = LocationDeterminator.getLocationInCondition(input);
+// assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+// assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
+//
+// input =
+// "rule MyRule \n" +
+// " when \n" +
+// " not exists name : Class (";
+// location = LocationDeterminator.getLocationInCondition(input);
+// assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+// assertEquals("Class", location.getProperty(LocationDeterminator.LOCATION_PROPERTY_CLASS_NAME));
+
input =
"rule MyRule \n" +
" when \n" +
@@ -397,6 +456,269 @@
" ";
location = LocationDeterminator.getLocationInCondition(input);
assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+
+ /** AND */
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) && ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class () and ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " name : Class ( name: property ) and ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( name: property ) \n" +
+ " and ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and Cl";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and name : Cl";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) && name : Cl";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and Class ( ) \n" +
+ " ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and not Class ( ) \n" +
+ " ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and exists Class ( ) \n" +
+ " ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and Class ( ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and Class ( name ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and Class ( name == ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " exists Class ( ) and not ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_NOT, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " exists Class ( ) and exists ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) and not Class ( ) \n" +
+ " ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+
+ /** OR */
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) or ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) || ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class () or ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " name : Class ( name: property ) or ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( name: property ) \n" +
+ " or ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) or Cl";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) or name : Cl";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) || name : Cl";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_AND_OR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) or Class ( ) \n" +
+ " ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) or Class ( ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_START, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) or Class ( name ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_OPERATOR, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " Class ( ) or Class ( name == ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_INSIDE_CONDITION_ARGUMENT, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " exists Class ( ) or not ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_NOT, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " exists Class ( ) or exists ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION_EXISTS, location.getType());
+
+ /** EVAL */
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " eval ( ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " eval(";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " eval( myCla";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_INSIDE_EVAL, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " eval( true )";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
+
+ input =
+ "rule MyRule \n" +
+ " when \n" +
+ " eval( true ) \n" +
+ " ";
+ location = LocationDeterminator.getLocationInCondition(input);
+ assertEquals(LocationDeterminator.LOCATION_BEGIN_OF_CONDITION, location.getType());
}
}
|
|
From: <jbo...@li...> - 2006-06-21 22:37:58
|
Author: KrisVerlaenen
Date: 2006-06-21 18:37:56 -0400 (Wed, 21 Jun 2006)
New Revision: 4800
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java
Log:
JBRULES-314: Lhs Rule completion should have better support for exists, not, eval, and, or
- extended parser so the end of and, or, exists, not and eval is registered
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java 2006-06-21 22:05:06 UTC (rev 4799)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java 2006-06-21 22:37:56 UTC (rev 4800)
@@ -4560,6 +4560,17 @@
}
+ if (d instanceof OrDescr) {
+ List l = ((OrDescr) d).getDescrs();
+ if (l != null && l.size() == 2) {
+ PatternDescr subDescr = (PatternDescr) l.get(1);
+ if (subDescr != null && (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0)) {
+ Token end = input.LT(-1);
+ d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
+ }
+ }
+ }
+
}
catch (RecognitionException re) {
reportError(re);
@@ -4646,7 +4657,18 @@
}
-
+
+ if (d instanceof AndDescr) {
+ List l = ((AndDescr) d).getDescrs();
+ if (l != null && l.size() == 2) {
+ PatternDescr subDescr = (PatternDescr) l.get(1);
+ if (subDescr != null && (subDescr.getEndLine() != 0 || subDescr.getEndColumn() != 0)) {
+ Token end = input.LT(-1);
+ d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
+ }
+ }
+ }
+
}
catch (RecognitionException re) {
reportError(re);
@@ -4835,6 +4857,11 @@
}
+ if (column != null && (column.getEndLine() != 0 || column.getEndColumn() != 0)) {
+ Token end = input.LT(-1);
+ d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
+ }
+
}
catch (RecognitionException re) {
reportError(re);
@@ -4909,8 +4936,12 @@
d = new NotDescr( (ColumnDescr) column );
d.setLocation( offset(loc.getLine()), loc.getCharPositionInLine() );
-
}
+
+ if (column != null && (column.getEndLine() != 0 || column.getEndColumn() != 0)) {
+ Token end = input.LT(-1);
+ d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
+ }
}
catch (RecognitionException re) {
@@ -4954,6 +4985,9 @@
}
+
+ Token end = input.LT(-1);
+ d.setEndLocation(offset(end.getLine()), end.getCharPositionInLine());
}
catch (RecognitionException re) {
|
|
From: <jbo...@li...> - 2006-06-21 22:05:11
|
Author: szimano
Date: 2006-06-21 18:05:06 -0400 (Wed, 21 Jun 2006)
New Revision: 4799
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
Log:
getAllTags JBLAB-706
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-06-21 19:02:59 UTC (rev 4798)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java 2006-06-21 22:05:06 UTC (rev 4799)
@@ -137,4 +137,27 @@
return vect;
}
+ public Vector getAllTags(String clas) {
+ Vector vect = null;
+
+ try {
+ TagMeTagger tagger = (TagMeTagger) Class.forName(clas)
+ .newInstance();
+
+ vect = tagger.getAllTags();
+ } catch (InstantiationException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (IllegalAccessException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ClassNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return vect;
+
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-21 19:02:59 UTC (rev 4798)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java 2006-06-21 22:05:06 UTC (rev 4799)
@@ -39,6 +39,7 @@
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.TabPanel;
import com.google.gwt.user.client.ui.TextBox;
import com.google.gwt.user.client.ui.VerticalPanel;
@@ -65,10 +66,13 @@
private FlexTable suggTable;
private Vector suggestionCheckboxes;
-
+
private Image parentButton;
- public TagMeShowPopupListener(String path, String user, String clas, Image parentButton) {
+ private ListBox listBox;
+
+ public TagMeShowPopupListener(String path, String user, String clas,
+ Image parentButton) {
this.path = path;
this.currentUser = user;
this.clas = clas;
@@ -115,6 +119,34 @@
tagging.getSugestions(path, clas, callback);
}
+ public void refreshAllTags() {
+ listBox.clear();
+
+ TaggingServiceAsync tagging = (TaggingServiceAsync) GWT
+ .create(TaggingService.class);
+
+ ServiceDefTarget endpoint = (ServiceDefTarget) tagging;
+ endpoint.setServiceEntryPoint("/tagme-servlet/tag/");
+
+ AsyncCallback callback = new AsyncCallback() {
+ public void onSuccess(Object result) {
+ Vector res = (Vector)result;
+
+ for (int i = 0; i < res.size(); i++) {
+ listBox.addItem(res.get(i).toString());
+ }
+ }
+
+ public void onFailure(Throwable caught) {
+ Window.alert("Error ! " + caught.getMessage() + " Throwable: "
+ + caught);
+ }
+ };
+
+ // call AJAX methos, after that callback is going to be executed
+ tagging.getAllTags(clas, callback);
+ }
+
public void refreshTags() {
while (table.getRowCount() > 0) {
@@ -190,6 +222,9 @@
// refresh tags also
refreshSugestions();
+
+ //refresh all tags list
+ refreshAllTags();
}
public void onClick(Widget sender) {
@@ -207,15 +242,18 @@
VerticalPanel input = new VerticalPanel();
input.add(new Label("Add a Tag:"));
- hPanel.add(input);
-
VerticalPanel suggestions = new VerticalPanel();
suggTable = new FlexTable();
suggestions.add(new Label("Suggestions:"));
suggestions.add(suggTable);
hPanel.add(suggestions);
+ listBox = new ListBox();
+ listBox.setVisibleItemCount(5);
+ hPanel.add(listBox);
+ panel.add(hPanel);
+
Vector textBoxes = new Vector();
for (int i = 0; i < 3; i++) {
@@ -224,7 +262,7 @@
input.add(box);
}
- panel.add(hPanel);
+ panel.add(input);
refreshTags();
@@ -257,16 +295,18 @@
TabPanel tabs = new TabPanel();
tabs.add(panel, "Tag Content");
-
+
VerticalPanel searchPanel = new VerticalPanel();
- searchPanel.add(new Label("Search for tagged content by tag name, author or keyword search of the description"));
+ searchPanel
+ .add(new Label(
+ "Search for tagged content by tag name, author or keyword search of the description"));
searchPanel.add(new Label("Tag"));
searchPanel.add(new TextBox());
searchPanel.add(new Label("Author"));
searchPanel.add(new TextBox());
searchPanel.add(new Label("Keyword"));
searchPanel.add(new TextBox());
-
+
searchPanel.add(new Label("Search results"));
searchPanel.add(new Button("Close", new ClickListener() {
@@ -275,18 +315,19 @@
}
}));
-
+
tabs.add(searchPanel, "Tag Search");
-
+
tabs.selectTab(0);
-
+
dialog.add(tabs);
dialog.setStyleName(TAGME_STYLE);
dialog.setText("TagMe!");
- dialog.setPopupPosition(DOM.getAbsoluteLeft(parentButton.getElement()), DOM.getAbsoluteTop(parentButton.getElement()));
+ dialog.setPopupPosition(DOM.getAbsoluteLeft(parentButton.getElement()),
+ DOM.getAbsoluteTop(parentButton.getElement()));
dialog.show();
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-06-21 19:02:59 UTC (rev 4798)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java 2006-06-21 22:05:06 UTC (rev 4799)
@@ -46,4 +46,6 @@
public boolean deleteTag(String user, String path, String clas, String tag);
public Vector getSugestions(String path, String clas);
+
+ public Vector getAllTags(String clas);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java 2006-06-21 19:02:59 UTC (rev 4798)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java 2006-06-21 22:05:06 UTC (rev 4799)
@@ -40,4 +40,6 @@
AsyncCallback callback);
public void getSugestions(String path, String clas, AsyncCallback callback);
+
+ public void getAllTags(String clas, AsyncCallback callback);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-21 19:02:59 UTC (rev 4798)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java 2006-06-21 22:05:06 UTC (rev 4799)
@@ -197,4 +197,20 @@
*/
}
+ public Vector getAllTags() {
+ Vector<String> ret = new Vector<String>();
+ try {
+ List<String> tags = service.getAllTags();
+
+ for (String tag : tags) {
+ ret.add(tag);
+ }
+ } catch (TagGetException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ return ret;
+ }
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-21 19:02:59 UTC (rev 4798)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java 2006-06-21 22:05:06 UTC (rev 4799)
@@ -31,4 +31,6 @@
public void deleteTag(String user, String path, String tag);
public Vector getSuggestions(String path);
+
+ public Vector getAllTags();
}
|
|
From: <jbo...@li...> - 2006-06-21 19:03:02
|
Author: szimano
Date: 2006-06-21 15:02:59 -0400 (Wed, 21 Jun 2006)
New Revision: 4798
Modified:
labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java
labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
Log:
getAll feature for tags
JBSHOTOKU-86
Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java 2006-06-21 18:50:32 UTC (rev 4797)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/TagService.java 2006-06-21 19:02:59 UTC (rev 4798)
@@ -39,4 +39,10 @@
* @return A relative link to a feed with the given parameters.
*/
public String getFeedLink(FeedType feedType, List<String> dataList, String type);
+
+ /**Gets all the tags.
+ * @return Tag list
+ * @throws TagGetException
+ */
+ public List<String> getAllTags() throws TagGetException;
}
Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-21 18:50:32 UTC (rev 4797)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java 2006-06-21 19:02:59 UTC (rev 4798)
@@ -290,17 +290,17 @@
endRet.remove(tag);
}
}
-
+
return endRet;
}
-
+
private boolean tagListContainsTag(Tag tag, List<Tag> listToCheck) {
for (Tag tag2 : listToCheck) {
if (tag.getName().equals(tag2.getName())) {
return true;
}
}
-
+
return false;
}
@@ -308,7 +308,7 @@
double ret = 0;
for (Tag tag : givenTags) {
- if (tagListContainsTag(tag,listToCheck)) {
+ if (tagListContainsTag(tag, listToCheck)) {
ret++;
}
}
@@ -362,4 +362,11 @@
return "";
}
}
+
+ public List<String> getAllTags() throws TagGetException {
+ List<String> result = manager.createQuery("SELECT DISTINCT name FROM TagEntity")
+ .getResultList();
+
+ return result;
+ }
}
|
550 messages has been excluded from this view by a project administrator.
