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-05-09 13:22:50
|
Author: jfr...@jb...
Date: 2006-05-09 09:22:45 -0400 (Tue, 09 May 2006)
New Revision: 4153
Modified:
labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Build on dev17. For the moment the "missing" extensions are:
xpm, t1lib in gd (graphic).
imap, pgsql, pspell and tidy (I am not very sure we need the 2 lasts).
Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-09 11:11:22 UTC (rev 4152)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-09 13:22:45 UTC (rev 4153)
@@ -21,9 +21,14 @@
case `uname -n` in
dev12)
# -with-libxml-dir=/usr/local but 2.6.11 needed.
- ADDCONF="--with-libxml-dir=$TOOLS/LIBXML2 \
+ # Solaris dynamic ld exports the symbols so build shared extensions.
+ EXTTYPE=shared
+ ADDCONF="\
+ --enable-all=$EXTTYPE \
+ --with-libxml-dir=$TOOLS/LIBXML2 \
--with-libexpat-dir=/usr/local \
--with-curl=no \
+ --with-zlib-dir \
--with-jpeg-dir=/usr/sfw \
--with-png-dir=/usr/sfw \
--with-freetype-dir=/usr/sfw \
@@ -32,8 +37,8 @@
--with-mysql=no \
--with-mysqli=no \
--with-pdo-mysql=no \
- --with-pgsql=shared,$TOOLS/POSTGRESQL \
- --with-pdo-pgsql=shared,$TOOLS/POSTGRESQL \
+ --with-pgsql=$EXTTYPE,$TOOLS/POSTGRESQL \
+ --with-pdo-pgsql=$EXTTYPE,$TOOLS/POSTGRESQL \
--with-pspell=no \
--with-readline=no \
--with-tidy=no \
@@ -44,6 +49,7 @@
export LD_LIBRARY_PATH
;;
dev17*)
+ EXTTYPE=static
ADDCONF="\
--with-pic \
--with-libdir=lib64 \
@@ -62,6 +68,7 @@
ADDFLAGS="-fPIC"
;;
*)
+ EXTTYPE=static
ADDCONF="\
--with-jpeg-dir \
--with-png-dir \
@@ -89,11 +96,36 @@
--enable-embed=shared \
--with-kerberos \
--with-imap-ssl \
- --enable-all=shared \
+ --with-gd \
+ --with-zlib-dir \
--enable-gd-native-ttf \
- --with-zlib-dir \
--with-xpm-dir \
--with-ttf \
+ --with-bz2 \
+ --enable-bcmath \
+ --enable-calendar \
+ --with-curl \
+ --enable-dbase \
+ --enable-dba \
+ --enable-exif \
+ --enable-filepro \
+ --enable-ftp \
+ --with-gettext \
+ --with-ldap \
+ --enable-mbstring \
+ --with-mysqli \
+ --with-mysql \
+ --with-pdo-mysql \
+ --with-openssl \
+ --enable-shmop \
+ --enable-soap \
+ --enable-sockets \
+ --enable-sysvmsg \
+ --enable-sysvsem \
+ --enable-sysvshm \
+ --enable-wddx \
+ --with-xmlrpc \
+ \
--with-fbsql=no \
--with-fdftk=no \
--with-gmp=no \
|
Author: mic...@jb...
Date: 2006-05-09 07:11:22 -0400 (Tue, 09 May 2006)
New Revision: 4152
Added:
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/function_arrays.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:
JBRULES-262
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-05-09 09:55:35 UTC (rev 4151)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java 2006-05-09 11:11:22 UTC (rev 4152)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-05-09 10:21:45
+// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-05-09 20:55:12
package org.drools.lang;
import java.util.List;
@@ -15,7 +15,7 @@
public class RuleParser extends Parser {
public static final String[] tokenNames = new String[] {
- "<invalid>", "<EOR>", "<DOWN>", "<UP>", "EOL", "ID", "INT", "BOOL", "STRING", "FLOAT", "MISC", "WS", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "\';\'", "\'package\'", "\'import\'", "\'.\'", "\'.*\'", "\'expander\'", "\'global\'", "\'function\'", "\'(\'", "\',\'", "\')\'", "\'{\'", "\'}\'", "\'query\'", "\'end\'", "\'rule\'", "\'when\'", "\':\'", "\'then\'", "\'attributes\'", "\'salience\'", "\'no-loop\'", "\'auto-focus\'", "\'xor-group\'", "\'agenda-group\'", "\'duration\'", "\'or\'", "\'==\'", "\'>\'", "\'>=\'", "\'<\'", "\'<=\'", "\'!=\'", "\'contains\'", "\'matches\'", "\'excludes\'", "\'null\'", "\'->\'", "\'||\'", "\'and\'", "\'&&\'", "\'exists\'", "\'not\'", "\'eval\'", "\'use\'"
+ "<invalid>", "<EOR>", "<DOWN>", "<UP>", "EOL", "ID", "INT", "BOOL", "STRING", "FLOAT", "MISC", "WS", "SH_STYLE_SINGLE_LINE_COMMENT", "C_STYLE_SINGLE_LINE_COMMENT", "MULTI_LINE_COMMENT", "\';\'", "\'package\'", "\'import\'", "\'.\'", "\'.*\'", "\'expander\'", "\'global\'", "\'function\'", "\'(\'", "\',\'", "\')\'", "\'{\'", "\'}\'", "\'query\'", "\'end\'", "\'rule\'", "\'when\'", "\':\'", "\'then\'", "\'attributes\'", "\'salience\'", "\'no-loop\'", "\'auto-focus\'", "\'xor-group\'", "\'agenda-group\'", "\'duration\'", "\'or\'", "\'==\'", "\'>\'", "\'>=\'", "\'<\'", "\'<=\'", "\'!=\'", "\'contains\'", "\'matches\'", "\'excludes\'", "\'null\'", "\'->\'", "\'||\'", "\'and\'", "\'&&\'", "\'exists\'", "\'not\'", "\'eval\'", "\'[\'", "\']\'", "\'use\'"
};
public static final int BOOL=7;
public static final int INT=6;
@@ -901,14 +901,15 @@
// $ANTLR start function
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:331:1: function : 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= ID opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= ID opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:331:1: function : 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= argument opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol ;
public void function() throws RecognitionException {
Token name=null;
- Token paramName=null;
String retType = null;
String paramType = null;
+ String paramName = null;
+
String body = null;
@@ -916,8 +917,8 @@
FunctionDescr f = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:336:17: ( 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= ID opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= ID opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:336:17: 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= ID opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= ID opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:336:17: ( 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= argument opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:336:17: 'function' opt_eol (retType= dotted_name )? opt_eol name= ID opt_eol '(' opt_eol ( (paramType= dotted_name )? opt_eol paramName= argument opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument opt_eol )* )? ')' opt_eol '{' body= curly_chunk '}' opt_eol
{
match(input,22,FOLLOW_22_in_function362);
following.push(FOLLOW_opt_eol_in_function364);
@@ -960,7 +961,7 @@
opt_eol();
following.pop();
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:342:25: ( (paramType= dotted_name )? opt_eol paramName= ID opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= ID opt_eol )* )?
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:342:25: ( (paramType= dotted_name )? opt_eol paramName= argument opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument opt_eol )* )?
int alt16=2;
int LA16_0 = input.LA(1);
if ( (LA16_0>=EOL && LA16_0<=ID)||LA16_0==15 ) {
@@ -971,13 +972,13 @@
}
else {
NoViableAltException nvae =
- new NoViableAltException("342:25: ( (paramType= dotted_name )? opt_eol paramName= ID opt_eol ( \',\' opt_eol (paramType= dotted_name )? opt_eol paramName= ID opt_eol )* )?", 16, 0, input);
+ new NoViableAltException("342:25: ( (paramType= dotted_name )? opt_eol paramName= argument opt_eol ( \',\' opt_eol (paramType= dotted_name )? opt_eol paramName= argument opt_eol )* )?", 16, 0, input);
throw nvae;
}
switch (alt16) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:342:33: (paramType= dotted_name )? opt_eol paramName= ID opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= ID opt_eol )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:342:33: (paramType= dotted_name )? opt_eol paramName= argument opt_eol ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument opt_eol )*
{
// C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:342:33: (paramType= dotted_name )?
int alt13=2;
@@ -1000,16 +1001,18 @@
opt_eol();
following.pop();
- paramName=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_function408);
+ following.push(FOLLOW_argument_in_function408);
+ paramName=argument();
+ following.pop();
+
following.push(FOLLOW_opt_eol_in_function410);
opt_eol();
following.pop();
- f.addParameter( paramType, paramName.getText() );
+ f.addParameter( paramType, paramName );
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:346:33: ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= ID opt_eol )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:346:33: ( ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument opt_eol )*
loop15:
do {
int alt15=2;
@@ -1021,7 +1024,7 @@
switch (alt15) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:346:41: ',' opt_eol (paramType= dotted_name )? opt_eol paramName= ID opt_eol
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:346:41: ',' opt_eol (paramType= dotted_name )? opt_eol paramName= argument opt_eol
{
match(input,24,FOLLOW_24_in_function424);
following.push(FOLLOW_opt_eol_in_function426);
@@ -1049,14 +1052,16 @@
opt_eol();
following.pop();
- paramName=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_function439);
+ following.push(FOLLOW_argument_in_function439);
+ paramName=argument();
+ following.pop();
+
following.push(FOLLOW_opt_eol_in_function441);
opt_eol();
following.pop();
- f.addParameter( paramType, paramName.getText() );
+ f.addParameter( paramType, paramName );
}
@@ -1315,6 +1320,8 @@
case 54:
case 55:
case 59:
+ case 60:
+ case 61:
alt17=1;
break;
default:
@@ -1517,7 +1524,7 @@
throw nvae;
}
}
- else if ( (LA19_0>=EOL && LA19_0<=31)||(LA19_0>=33 && LA19_0<=59) ) {
+ else if ( (LA19_0>=EOL && LA19_0<=31)||(LA19_0>=33 && LA19_0<=61) ) {
alt19=2;
}
else {
@@ -1730,6 +1737,8 @@
case 54:
case 55:
case 59:
+ case 60:
+ case 61:
alt20=1;
break;
default:
@@ -1803,7 +1812,7 @@
if ( LA22_0==32 ) {
alt22=1;
}
- else if ( (LA22_0>=EOL && LA22_0<=31)||(LA22_0>=33 && LA22_0<=59) ) {
+ else if ( (LA22_0>=EOL && LA22_0<=31)||(LA22_0>=33 && LA22_0<=61) ) {
alt22=2;
}
else {
@@ -1835,7 +1844,7 @@
if ( LA23_0==29 ) {
alt23=2;
}
- else if ( (LA23_0>=EOL && LA23_0<=28)||(LA23_0>=30 && LA23_0<=59) ) {
+ else if ( (LA23_0>=EOL && LA23_0<=28)||(LA23_0>=30 && LA23_0<=61) ) {
alt23=1;
}
@@ -2976,6 +2985,8 @@
case 57:
case 58:
case 59:
+ case 60:
+ case 61:
alt43=1;
break;
case 15:
@@ -4100,6 +4111,8 @@
case 57:
case 58:
case 59:
+ case 60:
+ case 61:
alt55=2;
break;
@@ -4244,6 +4257,8 @@
case 57:
case 58:
case 59:
+ case 60:
+ case 61:
alt56=2;
break;
@@ -4388,6 +4403,8 @@
case 57:
case 58:
case 59:
+ case 60:
+ case 61:
alt57=2;
break;
@@ -4937,7 +4954,7 @@
// $ANTLR start dotted_name
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:973:1: dotted_name returns [String name] : id= ID ( '.' id= ID )* ;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:973:1: dotted_name returns [String name] : id= ID ( '.' id= ID )* ( '[' ']' )* ;
public String dotted_name() throws RecognitionException {
String name;
Token id=null;
@@ -4946,8 +4963,8 @@
name = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:978:17: (id= ID ( '.' id= ID )* )
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:978:17: id= ID ( '.' id= ID )*
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:978:17: (id= ID ( '.' id= ID )* ( '[' ']' )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:978:17: id= ID ( '.' id= ID )* ( '[' ']' )*
{
id=(Token)input.LT(1);
match(input,ID,FOLLOW_ID_in_dotted_name2754);
@@ -4979,7 +4996,33 @@
}
} while (true);
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:978:99: ( '[' ']' )*
+ loop64:
+ do {
+ int alt64=2;
+ int LA64_0 = input.LA(1);
+ if ( LA64_0==59 ) {
+ alt64=1;
+ }
+
+ switch (alt64) {
+ case 1 :
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:978:101: '[' ']'
+ {
+ match(input,59,FOLLOW_59_in_dotted_name2773);
+ match(input,60,FOLLOW_60_in_dotted_name2775);
+ name = name + "[]";
+
+ }
+ break;
+
+ default :
+ break loop64;
+ }
+ } while (true);
+
+
}
}
@@ -4994,8 +5037,65 @@
// $ANTLR end dotted_name
+ // $ANTLR start argument
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:981:1: argument returns [String name] : id= ID ( '[' ']' )* ;
+ public String argument() throws RecognitionException {
+ String name;
+ Token id=null;
+
+
+ name = null;
+
+ try {
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:986:17: (id= ID ( '[' ']' )* )
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:986:17: id= ID ( '[' ']' )*
+ {
+ id=(Token)input.LT(1);
+ match(input,ID,FOLLOW_ID_in_argument2805);
+ name=id.getText();
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:986:46: ( '[' ']' )*
+ loop65:
+ do {
+ int alt65=2;
+ int LA65_0 = input.LA(1);
+ if ( LA65_0==59 ) {
+ alt65=1;
+ }
+
+
+ switch (alt65) {
+ case 1 :
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:986:48: '[' ']'
+ {
+ match(input,59,FOLLOW_59_in_argument2811);
+ match(input,60,FOLLOW_60_in_argument2813);
+ name = name + "[]";
+
+ }
+ break;
+
+ default :
+ break loop65;
+ }
+ } while (true);
+
+
+ }
+
+ }
+ catch (RecognitionException re) {
+ reportError(re);
+ recover(input,re);
+ }
+ finally {
+ }
+ return name;
+ }
+ // $ANTLR end argument
+
+
// $ANTLR start word
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:982:1: word returns [String word] : (id= ID | 'import' | 'use' | 'rule' | 'query' | 'salience' | 'no-loop' | 'when' | 'then' | 'end' | str= STRING );
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:990:1: word returns [String word] : (id= ID | 'import' | 'use' | 'rule' | 'query' | 'salience' | 'no-loop' | 'when' | 'then' | 'end' | str= STRING );
public String word() throws RecognitionException {
String word;
Token id=null;
@@ -5005,136 +5105,136 @@
word = null;
try {
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:986:17: (id= ID | 'import' | 'use' | 'rule' | 'query' | 'salience' | 'no-loop' | 'when' | 'then' | 'end' | str= STRING )
- int alt64=11;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:994:17: (id= ID | 'import' | 'use' | 'rule' | 'query' | 'salience' | 'no-loop' | 'when' | 'then' | 'end' | str= STRING )
+ int alt66=11;
switch ( input.LA(1) ) {
case ID:
- alt64=1;
+ alt66=1;
break;
case 17:
- alt64=2;
+ alt66=2;
break;
- case 59:
- alt64=3;
+ case 61:
+ alt66=3;
break;
case 30:
- alt64=4;
+ alt66=4;
break;
case 28:
- alt64=5;
+ alt66=5;
break;
case 35:
- alt64=6;
+ alt66=6;
break;
case 36:
- alt64=7;
+ alt66=7;
break;
case 31:
- alt64=8;
+ alt66=8;
break;
case 33:
- alt64=9;
+ alt66=9;
break;
case 29:
- alt64=10;
+ alt66=10;
break;
case STRING:
- alt64=11;
+ alt66=11;
break;
default:
NoViableAltException nvae =
- new NoViableAltException("982:1: word returns [String word] : (id= ID | \'import\' | \'use\' | \'rule\' | \'query\' | \'salience\' | \'no-loop\' | \'when\' | \'then\' | \'end\' | str= STRING );", 64, 0, input);
+ new NoViableAltException("990:1: word returns [String word] : (id= ID | \'import\' | \'use\' | \'rule\' | \'query\' | \'salience\' | \'no-loop\' | \'when\' | \'then\' | \'end\' | str= STRING );", 66, 0, input);
throw nvae;
}
- switch (alt64) {
+ switch (alt66) {
case 1 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:986:17: id= ID
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:994:17: id= ID
{
id=(Token)input.LT(1);
- match(input,ID,FOLLOW_ID_in_word2794);
+ match(input,ID,FOLLOW_ID_in_word2841);
word=id.getText();
}
break;
case 2 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:987:17: 'import'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:995:17: 'import'
{
- match(input,17,FOLLOW_17_in_word2806);
+ match(input,17,FOLLOW_17_in_word2853);
word="import";
}
break;
case 3 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:988:17: 'use'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:996:17: 'use'
{
- match(input,59,FOLLOW_59_in_word2815);
+ match(input,61,FOLLOW_61_in_word2862);
word="use";
}
break;
case 4 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:989:17: 'rule'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:997:17: 'rule'
{
- match(input,30,FOLLOW_30_in_word2827);
+ match(input,30,FOLLOW_30_in_word2874);
word="rule";
}
break;
case 5 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:990:17: 'query'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:998:17: 'query'
{
- match(input,28,FOLLOW_28_in_word2838);
+ match(input,28,FOLLOW_28_in_word2885);
word="query";
}
break;
case 6 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:991:17: 'salience'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:999:17: 'salience'
{
- match(input,35,FOLLOW_35_in_word2848);
+ match(input,35,FOLLOW_35_in_word2895);
word="salience";
}
break;
case 7 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:992:17: 'no-loop'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:1000:17: 'no-loop'
{
- match(input,36,FOLLOW_36_in_word2856);
+ match(input,36,FOLLOW_36_in_word2903);
word="no-loop";
}
break;
case 8 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:993:17: 'when'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:1001:17: 'when'
{
- match(input,31,FOLLOW_31_in_word2864);
+ match(input,31,FOLLOW_31_in_word2911);
word="when";
}
break;
case 9 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:994:17: 'then'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:1002:17: 'then'
{
- match(input,33,FOLLOW_33_in_word2875);
+ match(input,33,FOLLOW_33_in_word2922);
word="then";
}
break;
case 10 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:995:17: 'end'
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:1003:17: 'end'
{
- match(input,29,FOLLOW_29_in_word2886);
+ match(input,29,FOLLOW_29_in_word2933);
word="end";
}
break;
case 11 :
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:996:17: str= STRING
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:1004:17: str= STRING
{
str=(Token)input.LT(1);
- match(input,STRING,FOLLOW_STRING_in_word2900);
+ match(input,STRING,FOLLOW_STRING_in_word2947);
word=getString(str);
}
@@ -5159,20 +5259,20 @@
return predict(input, s0);
}
DFA.State s1 = new DFA.State() {{alt=4;}};
+ DFA.State s3 = new DFA.State() {{alt=1;}};
DFA.State s4 = new DFA.State() {{alt=2;}};
- DFA.State s3 = new DFA.State() {{alt=1;}};
DFA.State s2 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
- case 28:
- return s4;
+ case 30:
+ return s3;
case EOL:
case 15:
return s2;
- case 30:
- return s3;
+ case 28:
+ return s4;
default:
NoViableAltException nvae =
@@ -5241,23 +5341,53 @@
throw nvae;
}
};
- DFA.State s17 = new DFA.State() {{alt=1;}};
- DFA.State s24 = new DFA.State() {
+ DFA.State s18 = new DFA.State() {{alt=1;}};
+ DFA.State s27 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA4_24 = input.LA(1);
- if ( LA4_24==ID ) {return s17;}
- if ( LA4_24==18 ) {return s16;}
+ int LA4_27 = input.LA(1);
+ if ( LA4_27==ID ) {return s18;}
+ if ( LA4_27==59 ) {return s17;}
NoViableAltException nvae =
- new NoViableAltException("", 4, 24, input);
+ new NoViableAltException("", 4, 27, input);
throw nvae;
}
};
+ DFA.State s17 = new DFA.State() {
+ public DFA.State transition(IntStream input) throws RecognitionException {
+ int LA4_17 = input.LA(1);
+ if ( LA4_17==60 ) {return s27;}
+
+ NoViableAltException nvae =
+ new NoViableAltException("", 4, 17, input);
+
+ throw nvae;
+ }
+ };
+ DFA.State s26 = new DFA.State() {
+ public DFA.State transition(IntStream input) throws RecognitionException {
+ switch ( input.LA(1) ) {
+ case 59:
+ return s17;
+
+ case ID:
+ return s18;
+
+ case 18:
+ return s16;
+
+ default:
+ NoViableAltException nvae =
+ new NoViableAltException("", 4, 26, input);
+
+ throw nvae; }
+ }
+ };
DFA.State s16 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA4_16 = input.LA(1);
- if ( LA4_16==ID ) {return s24;}
+ if ( LA4_16==ID ) {return s26;}
NoViableAltException nvae =
new NoViableAltException("", 4, 16, input);
@@ -5267,14 +5397,21 @@
};
DFA.State s11 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA4_11 = input.LA(1);
- if ( LA4_11==18 ) {return s16;}
- if ( LA4_11==ID ) {return s17;}
+ switch ( input.LA(1) ) {
+ case 18:
+ return s16;
- NoViableAltException nvae =
- new NoViableAltException("", 4, 11, input);
+ case 59:
+ return s17;
- throw nvae;
+ case ID:
+ return s18;
+
+ default:
+ NoViableAltException nvae =
+ new NoViableAltException("", 4, 11, input);
+
+ throw nvae; }
}
};
DFA.State s5 = new DFA.State() {
@@ -5288,18 +5425,17 @@
throw nvae;
}
};
- DFA.State s71 = new DFA.State() {{alt=1;}};
- DFA.State s84 = new DFA.State() {{alt=1;}};
- DFA.State s93 = new DFA.State() {{alt=1;}};
- DFA.State s100 = new DFA.State() {{alt=1;}};
- DFA.State s101 = new DFA.State() {
+ DFA.State s105 = new DFA.State() {{alt=1;}};
+ DFA.State s114 = new DFA.State() {{alt=1;}};
+ DFA.State s120 = new DFA.State() {{alt=1;}};
+ DFA.State s122 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 27:
- return s100;
+ return s120;
case 26:
- return s99;
+ return s121;
case EOL:
case ID:
@@ -5355,24 +5491,26 @@
case 57:
case 58:
case 59:
- return s101;
+ case 60:
+ case 61:
+ return s122;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 101, input);
+ new NoViableAltException("", 4, 122, input);
throw nvae; }
}
};
- DFA.State s99 = new DFA.State() {
+ DFA.State s121 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
+ case 27:
+ return s120;
+
case 26:
- return s99;
+ return s121;
- case 27:
- return s100;
-
case EOL:
case ID:
case INT:
@@ -5427,24 +5565,26 @@
case 57:
case 58:
case 59:
- return s101;
+ case 60:
+ case 61:
+ return s122;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 99, input);
+ new NoViableAltException("", 4, 121, input);
throw nvae; }
}
};
- DFA.State s94 = new DFA.State() {
+ DFA.State s115 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
+ case 27:
+ return s120;
+
case 26:
- return s99;
+ return s121;
- case 27:
- return s100;
-
case EOL:
case ID:
case INT:
@@ -5499,23 +5639,25 @@
case 57:
case 58:
case 59:
- return s101;
+ case 60:
+ case 61:
+ return s122;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 94, input);
+ new NoViableAltException("", 4, 115, input);
throw nvae; }
}
};
- DFA.State s95 = new DFA.State() {
+ DFA.State s116 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 27:
- return s93;
+ return s114;
case 26:
- return s94;
+ return s115;
case EOL:
case ID:
@@ -5571,23 +5713,25 @@
case 57:
case 58:
case 59:
- return s95;
+ case 60:
+ case 61:
+ return s116;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 95, input);
+ new NoViableAltException("", 4, 116, input);
throw nvae; }
}
};
- DFA.State s85 = new DFA.State() {
+ DFA.State s106 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 27:
- return s93;
+ return s114;
case 26:
- return s94;
+ return s115;
case EOL:
case ID:
@@ -5643,23 +5787,25 @@
case 57:
case 58:
case 59:
- return s95;
+ case 60:
+ case 61:
+ return s116;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 85, input);
+ new NoViableAltException("", 4, 106, input);
throw nvae; }
}
};
- DFA.State s86 = new DFA.State() {
+ DFA.State s107 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 27:
- return s84;
+ return s105;
case 26:
- return s85;
+ return s106;
case EOL:
case ID:
@@ -5715,23 +5861,25 @@
case 57:
case 58:
case 59:
- return s86;
+ case 60:
+ case 61:
+ return s107;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 86, input);
+ new NoViableAltException("", 4, 107, input);
throw nvae; }
}
};
- DFA.State s72 = new DFA.State() {
+ DFA.State s87 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 27:
- return s84;
+ return s105;
case 26:
- return s85;
+ return s106;
case EOL:
case ID:
@@ -5787,23 +5935,26 @@
case 57:
case 58:
case 59:
- return s86;
+ case 60:
+ case 61:
+ return s107;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 72, input);
+ new NoViableAltException("", 4, 87, input);
throw nvae; }
}
};
- DFA.State s73 = new DFA.State() {
+ DFA.State s88 = new DFA.State() {{alt=1;}};
+ DFA.State s89 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 27:
- return s71;
+ return s88;
case 26:
- return s72;
+ return s87;
case EOL:
case ID:
@@ -5859,24 +6010,26 @@
case 57:
case 58:
case 59:
- return s73;
+ case 60:
+ case 61:
+ return s89;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 73, input);
+ new NoViableAltException("", 4, 89, input);
throw nvae; }
}
};
- DFA.State s58 = new DFA.State() {
+ DFA.State s67 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
+ case 26:
+ return s87;
+
case 27:
- return s71;
+ return s88;
- case 26:
- return s72;
-
case EOL:
case ID:
case INT:
@@ -5931,24 +6084,26 @@
case 57:
case 58:
case 59:
- return s73;
+ case 60:
+ case 61:
+ return s89;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 58, input);
+ new NoViableAltException("", 4, 67, input);
throw nvae; }
}
};
- DFA.State s59 = new DFA.State() {{alt=1;}};
- DFA.State s60 = new DFA.State() {
+ DFA.State s68 = new DFA.State() {{alt=1;}};
+ DFA.State s69 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 27:
- return s59;
+ return s68;
case 26:
- return s58;
+ return s67;
case EOL:
case ID:
@@ -6004,23 +6159,25 @@
case 57:
case 58:
case 59:
- return s60;
+ case 60:
+ case 61:
+ return s69;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 60, input);
+ new NoViableAltException("", 4, 69, input);
throw nvae; }
}
};
- DFA.State s46 = new DFA.State() {
+ DFA.State s53 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 26:
- return s58;
+ return s67;
case 27:
- return s59;
+ return s68;
case EOL:
case ID:
@@ -6076,321 +6233,406 @@
case 57:
case 58:
case 59:
- return s60;
+ case 60:
+ case 61:
+ return s69;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 46, input);
+ new NoViableAltException("", 4, 53, input);
throw nvae; }
}
};
- DFA.State s45 = new DFA.State() {
+ DFA.State s52 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA4_45 = input.LA(1);
- if ( LA4_45==26 ) {return s46;}
- if ( LA4_45==EOL||LA4_45==15 ) {return s45;}
+ int LA4_52 = input.LA(1);
+ if ( LA4_52==26 ) {return s53;}
+ if ( LA4_52==EOL||LA4_52==15 ) {return s52;}
NoViableAltException nvae =
- new NoViableAltException("", 4, 45, input);
+ new NoViableAltException("", 4, 52, input);
throw nvae;
}
};
- DFA.State s32 = new DFA.State() {
+ DFA.State s35 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA4_32 = input.LA(1);
- if ( LA4_32==EOL||LA4_32==15 ) {return s45;}
- if ( LA4_32==26 ) {return s46;}
+ int LA4_35 = input.LA(1);
+ if ( LA4_35==EOL||LA4_35==15 ) {return s52;}
+ if ( LA4_35==26 ) {return s53;}
NoViableAltException nvae =
- new NoViableAltException("", 4, 32, input);
+ new NoViableAltException("", 4, 35, input);
throw nvae;
}
};
- DFA.State s81 = new DFA.State() {
+ DFA.State s60 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
+ case 24:
+ return s50;
+
case 25:
- return s32;
+ return s35;
+ case EOL:
+ case 15:
+ return s60;
+
+ default:
+ NoViableAltException nvae =
+ new NoViableAltException("", 4, 60, input);
+
+ throw nvae; }
+ }
+ };
+ DFA.State s75 = new DFA.State() {
+ public DFA.State transition(IntStream input) throws RecognitionException {
+ switch ( input.LA(1) ) {
+ case EOL:
+ case 15:
+ return s60;
+
case 24:
- return s43;
+ return s50;
+ case 25:
+ return s35;
+
+ case 59:
+ return s59;
+
+ default:
+ NoViableAltException nvae =
+ new NoViableAltException("", 4, 75, input);
+
+ throw nvae; }
+ }
+ };
+ DFA.State s59 = new DFA.State() {
+ public DFA.State transition(IntStream input) throws RecognitionException {
+ int LA4_59 = input.LA(1);
+ if ( LA4_59==60 ) {return s75;}
+
+ NoViableAltException nvae =
+ new NoViableAltException("", 4, 59, input);
+
+ throw nvae;
+ }
+ };
+ DFA.State s102 = new DFA.State() {
+ public DFA.State transition(IntStream input) throws RecognitionException {
+ switch ( input.LA(1) ) {
+ case 25:
+ return s35;
+
+ case 24:
+ return s50;
+
case EOL:
case 15:
- return s81;
+ return s102;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 81, input);
+ new NoViableAltException("", 4, 102, input);
throw nvae; }
}
};
- DFA.State s68 = new DFA.State() {
+ DFA.State s84 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
+ case 59:
+ return s59;
+
case EOL:
case 15:
- return s81;
+ return s102;
case 25:
- return s32;
+ return s35;
case 24:
- return s43;
+ return s50;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 68, input);
+ new NoViableAltException("", 4, 84, input);
throw nvae; }
}
};
- DFA.State s67 = new DFA.State() {
+ DFA.State s83 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 25:
- return s32;
+ return s35;
case 24:
- return s43;
+ return s50;
case EOL:
case 15:
- return s67;
+ return s83;
case ID:
- return s68;
+ return s84;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 67, input);
+ new NoViableAltException("", 4, 83, input);
throw nvae; }
}
};
- DFA.State s55 = new DFA.State() {
+ DFA.State s64 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 18:
return s16;
+ case 59:
+ return s47;
+
case EOL:
case 15:
- return s67;
+ return s83;
case ID:
- return s68;
+ return s84;
case 25:
- return s32;
+ return s35;
case 24:
- return s43;
+ return s50;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 55, input);
+ new NoViableAltException("", 4, 64, input);
throw nvae; }
}
};
- DFA.State s54 = new DFA.State() {
+ DFA.State s63 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA4_54 = input.LA(1);
- if ( LA4_54==ID ) {return s55;}
- if ( LA4_54==EOL||LA4_54==15 ) {return s54;}
+ int LA4_63 = input.LA(1);
+ if ( LA4_63==ID ) {return s64;}
+ if ( LA4_63==EOL||LA4_63==15 ) {return s63;}
NoViableAltException nvae =
- new NoViableAltException("", 4, 54, input);
+ new NoViableAltException("", 4, 63, input);
throw nvae;
}
};
- DFA.State s43 = new DFA.State() {
+ DFA.State s50 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA4_43 = input.LA(1);
- if ( LA4_43==EOL||LA4_43==15 ) {return s54;}
- if ( LA4_43==ID ) {return s55;}
+ int LA4_50 = input.LA(1);
+ if ( LA4_50==EOL||LA4_50==15 ) {return s63;}
+ if ( LA4_50==ID ) {return s64;}
NoViableAltException nvae =
- new NoViableAltException("", 4, 43, input);
+ new NoViableAltException("", 4, 50, input);
throw nvae;
}
};
- DFA.State s51 = new DFA.State() {
+ DFA.State s49 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
+ case 59:
+ return s59;
+
+ case EOL:
+ case 15:
+ return s60;
+
case 24:
- return s43;
+ return s50;
case 25:
- return s32;
+ return s35;
- case EOL:
- case 15:
- return s51;
-
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 51, input);
+ new NoViableAltException("", 4, 49, input);
throw nvae; }
}
};
- DFA.State s42 = new DFA.State() {
+ DFA.State s48 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
+ case 24:
+ return s50;
+
+ case 25:
+ return s35;
+
case EOL:
case 15:
- return s51;
+ return s48;
- case 24:
- return s43;
+ case ID:
+ return s49;
- case 25:
- return s32;
-
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 42, input);
+ new NoViableAltException("", 4, 48, input);
throw nvae; }
}
};
- DFA.State s41 = new DFA.State() {
+ DFA.State s54 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
- case 24:
- return s43;
-
- case 25:
- return s32;
-
case EOL:
case 15:
- return s41;
+ return s48;
case ID:
- return s42;
+ return s49;
+ case 59:
+ return s47;
+
+ case 24:
+ return s50;
+
+ case 25:
+ return s35;
+
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 41, input);
+ new NoViableAltException("", 4, 54, input);
throw nvae; }
}
};
- DFA.State s31 = new DFA.State() {
+ DFA.State s47 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
+ int LA4_47 = input.LA(1);
+ if ( LA4_47==60 ) {return s54;}
+
+ NoViableAltException nvae =
+ new NoViableAltException("", 4, 47, input);
+
+ throw nvae;
+ }
+ };
+ DFA.State s34 = new DFA.State() {
+ public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 18:
return s16;
+ case 59:
+ return s47;
+
case EOL:
case 15:
- return s41;
+ return s48;
case ID:
- return s42;
+ return s49;
case 24:
- return s43;
+ return s50;
case 25:
- return s32;
+ return s35;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 31, input);
+ new NoViableAltException("", 4, 34, input);
throw nvae; }
}
};
- DFA.State s30 = new DFA.State() {
+ DFA.State s33 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case ID:
- return s31;
+ return s34;
case EOL:
case 15:
- return s30;
+ return s33;
case 25:
- return s32;
+ return s35;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 30, input);
+ new NoViableAltException("", 4, 33, input);
throw nvae; }
}
};
- DFA.State s23 = new DFA.State() {
+ DFA.State s25 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case EOL:
case 15:
- return s30;
+ return s33;
case ID:
- return s31;
+ return s34;
case 25:
- return s32;
+ return s35;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 23, input);
+ new NoViableAltException("", 4, 25, input);
throw nvae; }
}
};
- DFA.State s28 = new DFA.State() {
+ DFA.State s31 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA4_28 = input.LA(1);
- if ( LA4_28==23 ) {return s23;}
- if ( LA4_28==EOL||LA4_28==15 ) {return s28;}
+ int LA4_31 = input.LA(1);
+ if ( LA4_31==23 ) {return s25;}
+ if ( LA4_31==EOL||LA4_31==15 ) {return s31;}
NoViableAltException nvae =
- new NoViableAltException("", 4, 28, input);
+ new NoViableAltException("", 4, 31, input);
throw nvae;
}
};
- DFA.State s22 = new DFA.State() {
+ DFA.State s24 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA4_22 = input.LA(1);
- if ( LA4_22==EOL||LA4_22==15 ) {return s28;}
- if ( LA4_22==23 ) {return s23;}
+ int LA4_24 = input.LA(1);
+ if ( LA4_24==EOL||LA4_24==15 ) {return s31;}
+ if ( LA4_24==23 ) {return s25;}
NoViableAltException nvae =
- new NoViableAltException("", 4, 22, input);
+ new NoViableAltException("", 4, 24, input);
throw nvae;
}
};
- DFA.State s21 = new DFA.State() {
+ DFA.State s23 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
case 23:
- return s23;
+ return s25;
case EOL:
case 15:
- return s21;
+ return s23;
case ID:
- return s22;
+ return s24;
default:
NoViableAltException nvae =
- new NoViableAltException("", 4, 21, input);
+ new NoViableAltException("", 4, 23, input);
throw nvae; }
}
@@ -6401,15 +6643,18 @@
case 18:
return s16;
+ case 59:
+ return s17;
+
case EOL:
case 15:
- return s21;
+ return s23;
case ID:
- return s22;
+ return s24;
case 23:
- return s23;
+ return s25;
default:
NoViableAltException nvae =
@@ -6477,20 +6722,20 @@
public int predict(IntStream input) throws RecognitionException {
return predict(input, s0);
}
+ DFA.State s5 = new DFA.State() {{alt=1;}};
DFA.State s2 = new DFA.State() {{alt=2;}};
- DFA.State s5 = new DFA.State() {{alt=1;}};
DFA.State s3 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
- case 23:
- return s2;
+ case ID:
+ return s5;
case EOL:
case 15:
return s3;
- case ID:
- return s5;
+ case 23:
+ return s2;
default:
NoViableAltException nvae =
@@ -6511,6 +6756,7 @@
case ID:
case 18:
+ case 59:
return s5;
default:
@@ -6539,15 +6785,39 @@
}
DFA.State s3 = new DFA.State() {{alt=1;}};
DFA.State s2 = new DFA.State() {{alt=2;}};
- DFA.State s4 = new DFA.State() {
+ DFA.State s5 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
+ case ID:
+ return s3;
+
+ case EOL:
+ case 15:
+ return s5;
+
case 24:
case 25:
return s2;
+ default:
+ NoViableAltException nvae =
+ new NoViableAltException("", 13, 5, input);
+
+ throw nvae; }
+ }
+ };
+ DFA.State s9 = new DFA.State() {
+ public DFA.State transition(IntStream input) throws RecognitionException {
+ switch ( input.LA(1) ) {
case EOL:
case 15:
+ return s5;
+
+ case 24:
+ case 25:
+ return s2;
+
+ case 59:
return s4;
case ID:
@@ -6555,11 +6825,22 @@
default:
NoViableAltException nvae =
- new NoViableAltException("", 13, 4, input);
+ new NoViableAltException("", 13, 9, input);
throw nvae; }
}
};
+ ...
[truncated message content] |
|
From: <jbo...@li...> - 2006-05-09 09:55:39
|
Author: jfr...@jb...
Date: 2006-05-09 05:55:35 -0400 (Tue, 09 May 2006)
New Revision: 4151
Modified:
labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Get it build on x86_64 (dev17).
Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-09 07:52:29 UTC (rev 4150)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-09 09:55:35 UTC (rev 4151)
@@ -43,6 +43,24 @@
LD_LIBRARY_PATH=$TOOLS/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH
;;
+ dev17*)
+ ADDCONF="\
+ --with-pic \
+ --with-libdir=lib64 \
+ --with-jpeg-dir \
+ --with-png-dir \
+ --with-freetype-dir \
+ \
+ --with-xpm-dir=no \
+ --with-t1lib=no \
+ --with-imap=no \
+ --with-pgsql=no \
+ --with-pdo-pgsql=no \
+ --with-pspell=no \
+ --with-tidy=no \
+ "
+ ADDFLAGS="-fPIC"
+ ;;
*)
ADDCONF="\
--with-jpeg-dir \
@@ -145,7 +163,8 @@
#
(cd ../php5servlet
- gcc -c -I $TOOLS/PHP/include/php/main \
+ gcc -c $ADDFLAGS \
+ -I $TOOLS/PHP/include/php/main \
-I $TOOLS/PHP/include/php/Zend \
-I $TOOLS/PHP/include/php/TSRM \
-I $TOOLS/PHP/include/php \
|
Author: mic...@jb...
Date: 2006-05-09 03:52:29 -0400 (Tue, 09 May 2006)
New Revision: 4150
Added:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java
labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_PropertyChange.drl
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
Log:
property change support integration tests
Added: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java 2006-05-09 07:44:33 UTC (rev 4149)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java 2006-05-09 07:52:29 UTC (rev 4150)
@@ -0,0 +1,34 @@
+package org.drools;
+
+import java.beans.PropertyChangeListener;
+import java.beans.PropertyChangeSupport;
+
+public class State {
+ private PropertyChangeSupport changes = new PropertyChangeSupport( this );
+
+ private String state;
+
+ public State(String state) {
+ this.state = state;
+ }
+
+ public String getState() {
+ return this.state;
+ }
+
+ public void setState(String newState) {
+ String oldState = this.state;
+ this.state = newState;
+ this.changes.firePropertyChange( "state",
+ oldState,
+ newState );
+ }
+
+ public void addPropertyChangeListener(PropertyChangeListener l) {
+ changes.addPropertyChangeListener( l );
+ }
+
+ public void removePropertyChangeListener(PropertyChangeListener l) {
+ changes.removePropertyChangeListener( l );
+ }
+}
Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/State.java
___________________________________________________________________
Name: svn:eol-style
+ native
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-05-09 07:44:33 UTC (rev 4149)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java 2006-05-09 07:52:29 UTC (rev 4150)
@@ -41,6 +41,7 @@
import org.drools.QueryResults;
import org.drools.RuleBase;
import org.drools.Sensor;
+import org.drools.State;
import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsError;
@@ -217,7 +218,32 @@
assertEquals( bill,
list.get( 0 ) );
}
+
+ public void testPropertyChangeSupport() throws Exception {
+ PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "Test_PropertyChange.drl" ) ) );
+ Package pkg = builder.getPackage();
+ RuleBase ruleBase = getRuleBase();
+ ruleBase.addPackage( pkg );
+ WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+
+ List list = new ArrayList();
+ workingMemory.setGlobal( "list",
+ list );
+
+ State state = new State("initial");
+ workingMemory.assertObject( state, true );
+ workingMemory.fireAllRules();
+
+ assertEquals(1, list.size());
+
+ state.setState( "finished" );
+ workingMemory.fireAllRules();
+ assertEquals(2, list.size());
+
+ }
+
public void testBigDecimal() throws Exception {
PackageBuilder builder = new PackageBuilder();
Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_PropertyChange.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_PropertyChange.drl 2006-05-09 07:44:33 UTC (rev 4149)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_PropertyChange.drl 2006-05-09 07:52:29 UTC (rev 4150)
@@ -0,0 +1,12 @@
+package org.drools.test;
+
+import org.drools.State;
+
+global java.util.List list
+
+rule simple
+ when
+ State( )
+ then
+ list.add("fired");
+end
\ No newline at end of file
Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_PropertyChange.drl
___________________________________________________________________
Name: svn:eol-style
+ native
|
|
From: <jbo...@li...> - 2006-05-09 07:44:39
|
Author: mic...@jb... Date: 2006-05-09 03:44:33 -0400 (Tue, 09 May 2006) New Revision: 4149 Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/not_with_binding_error.drl Log: improved handling of parse errors Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/not_with_binding_error.drl =================================================================== --- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/not_with_binding_error.drl 2006-05-09 07:22:56 UTC (rev 4148) +++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/not_with_binding_error.drl 2006-05-09 07:44:33 UTC (rev 4149) @@ -0,0 +1,9 @@ +package HR2 + +rule simple_rule + when + a : (not ( Cheese(type == "stilton") )) + exists ( Foo() ) + then + funky(); +end \ No newline at end of file Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/lang/not_with_binding_error.drl ___________________________________________________________________ Name: svn:eol-style + native |
|
From: <jbo...@li...> - 2006-05-09 07:23:07
|
Author: mic...@jb... Date: 2006-05-09 03:22:56 -0400 (Tue, 09 May 2006) New Revision: 4148 Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/compiler/ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/compiler/bad_rule.drl Log: improved handling of parse errors Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/compiler/bad_rule.drl =================================================================== --- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/compiler/bad_rule.drl 2006-05-09 06:26:18 UTC (rev 4147) +++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/compiler/bad_rule.drl 2006-05-09 07:22:56 UTC (rev 4148) @@ -0,0 +1,9 @@ +package HR2 + +rule simple_rule + when + a : (not ( Cheese(type == "stilton") )) + exists ( Foo() ) + then + funky(); +end \ No newline at end of file Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/compiler/bad_rule.drl ___________________________________________________________________ Name: svn:eol-style + native |
|
From: <jbo...@li...> - 2006-05-09 06:26:20
|
Author: jfr...@jb...
Date: 2006-05-09 02:26:18 -0400 (Tue, 09 May 2006)
New Revision: 4147
Modified:
labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
mcrypt and mhash are old libraries (not in the RH distros).
Simply remove them for the build.
Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-09 06:23:31 UTC (rev 4146)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-09 06:26:18 UTC (rev 4147)
@@ -29,8 +29,6 @@
--with-freetype-dir=/usr/sfw \
--with-t1lib=no \
--with-imap=no \
- --with-mcrypt=no \
- --with-mhash=no \
--with-mysql=no \
--with-mysqli=no \
--with-pdo-mysql=no \
@@ -98,6 +96,8 @@
--with-sybase=no \
--with-sybase-ct=no \
--with-recode=no \
+ --with-mcrypt=no \
+ --with-mhash=no \
\
--with-msql=no \
\
|
|
From: <jbo...@li...> - 2006-05-09 06:23:35
|
Author: jfr...@jb...
Date: 2006-05-09 02:23:31 -0400 (Tue, 09 May 2006)
New Revision: 4146
Modified:
labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Use our own postgresql on Solaris.
Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-09 06:10:15 UTC (rev 4145)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-09 06:23:31 UTC (rev 4146)
@@ -21,16 +21,9 @@
case `uname -n` in
dev12)
# -with-libxml-dir=/usr/local but 2.6.11 needed.
- ADDCONF="--disable-libxml \
- --disable-simplexml \
- --disable-soap \
+ ADDCONF="--with-libxml-dir=$TOOLS/LIBXML2 \
--with-libexpat-dir=/usr/local \
- --disable-xmlreader \
- --with-xmlrpc=no \
- --disable-xmlwriter \
- --with-xsl=no \
--with-curl=no \
- --disable-dom \
--with-jpeg-dir=/usr/sfw \
--with-png-dir=/usr/sfw \
--with-freetype-dir=/usr/sfw \
@@ -41,12 +34,16 @@
--with-mysql=no \
--with-mysqli=no \
--with-pdo-mysql=no \
- --with-pgsql=no \
- --with-pdo-pgsql=no \
+ --with-pgsql=shared,$TOOLS/POSTGRESQL \
+ --with-pdo-pgsql=shared,$TOOLS/POSTGRESQL \
--with-pspell=no \
--with-readline=no \
--with-tidy=no \
"
+ # Make sure the right xml2 is used.
+ # the make install of php (PEAR) uses php and need libxml2.
+ LD_LIBRARY_PATH=$TOOLS/lib:$LD_LIBRARY_PATH
+ export LD_LIBRARY_PATH
;;
*)
ADDCONF="\
@@ -156,3 +153,4 @@
php5servlet.c
ld -G -o libphp5servlet.so php5servlet.o -L $TOOLS/PHP/lib -lphp5
)
+cp ../php5servlet/libphp5servlet.so $TOOLS/PHP/lib
|
Author: mic...@jb...
Date: 2006-05-09 02:10:15 -0400 (Tue, 09 May 2006)
New Revision: 4145
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
Log:
improved handling of parse errors
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2006-05-09 04:41:33 UTC (rev 4144)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java 2006-05-09 06:10:15 UTC (rev 4145)
@@ -156,6 +156,7 @@
public void addPackage(PackageDescr packageDescr) {
+
if ( packageDescr.getName() == null || "".equals( packageDescr.getName() ) ) {
throw new MissingPackageNameException( "Missing package name for rule package." );
@@ -169,15 +170,18 @@
this.pkg = newPackage( packageDescr );
}
- //iterate and compile
- for ( Iterator it = packageDescr.getFunctions().iterator(); it.hasNext(); ) {
- addFunction( (FunctionDescr) it.next() );
+ //only try to compile if there are no parse errors
+ if (!hasErrors()) {
+ //iterate and compile
+ for ( Iterator it = packageDescr.getFunctions().iterator(); it.hasNext(); ) {
+ addFunction( (FunctionDescr) it.next() );
+ }
+
+ //iterate and compile
+ for ( Iterator it = packageDescr.getRules().iterator(); it.hasNext(); ) {
+ addRule( (RuleDescr) it.next() );
+ }
}
-
- //iterate and compile
- for ( Iterator it = packageDescr.getRules().iterator(); it.hasNext(); ) {
- addRule( (RuleDescr) it.next() );
- }
}
private Package newPackage(PackageDescr packageDescr) {
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-05-09 04:41:33 UTC (rev 4144)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java 2006-05-09 06:10:15 UTC (rev 4145)
@@ -20,6 +20,7 @@
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.ObjectInput;
import java.io.ObjectInputStream;
import java.io.ObjectOutput;
@@ -112,6 +113,12 @@
assertLength( 1,
builder.getErrors() );
}
+
+ public void testErrorsInParser() throws Exception {
+ PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( new InputStreamReader(this.getClass().getResourceAsStream( "bad_rule.drl" )) );
+ assertTrue(builder.hasErrors());
+ }
public void testReload() throws Exception {
PackageBuilder builder = new PackageBuilder();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2006-05-09 04:41:33 UTC (rev 4144)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/lang/RuleParserTest.java 2006-05-09 06:10:15 UTC (rev 4145)
@@ -535,6 +535,12 @@
assertFalse( parser.hasErrors() );
}
+ public void testNotBindindShouldBarf() throws Exception {
+ RuleParser parser = parseResource( "not_with_binding_error.drl");
+ parser.compilation_unit();
+ assertTrue( parser.hasErrors() );
+ }
+
public void testSimpleQuery() throws Exception {
QueryDescr query = parseResource( "simple_query.drl" ).query();
|
|
From: <jbo...@li...> - 2006-05-09 04:41:39
|
Author: bagerman
Date: 2006-05-09 00:41:33 -0400 (Tue, 09 May 2006)
New Revision: 4144
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java
Log:
Xor group implementation for leaps
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java 2006-05-09 00:46:25 UTC (rev 4143)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/LeapsTest.java 2006-05-09 04:41:33 UTC (rev 4144)
@@ -27,6 +27,8 @@
import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.rule.Package;
+import org.drools.spi.AgendaGroup;
+import org.drools.spi.XorGroup;
/**
* This runs the integration test cases with the leaps implementation.
@@ -127,7 +129,38 @@
// Not working in leaps
}
+
+ // while Xor group behaviour is supported by leaps certain functionality is no
+ // due to the lazy nature of leaps and the fact that it does not accumulate
+ // activations before firing them we can not do counts on xor groups and
+ // agenda groups as in base integration test
public void testXorGroups() throws Exception {
- // Not Working in leaps
+ PackageBuilder builder = new PackageBuilder();
+ builder.addPackageFromDrl( new InputStreamReader( getClass().getResourceAsStream( "test_XorGroups.drl" ) ) );
+ Package pkg = builder.getPackage();
+
+ RuleBase ruleBase = getRuleBase();
+ ruleBase.addPackage( pkg );
+ WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+
+ List list = new ArrayList();
+ workingMemory.setGlobal( "list",
+ list );
+
+ Cheese brie = new Cheese( "brie",
+ 12 );
+ workingMemory.assertObject( brie );
+
+ workingMemory.fireAllRules();
+
+ assertEquals( 3,
+ list.size() );
+ assertTrue( "rule0",
+ list.contains( "rule0" ) );
+ assertTrue( "rule1",
+ list.contains( "rule1" ) );
+ assertTrue( "rule2",
+ list.contains( "rule2" ) );
}
+
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java 2006-05-09 00:46:25 UTC (rev 4143)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java 2006-05-09 04:41:33 UTC (rev 4144)
@@ -39,14 +39,24 @@
this.workingMemory = workingMemory;
}
- public synchronized void fireActivation(Activation activation) throws ConsequenceException {
- if ( activation.getRule() instanceof Query ) {
+ public synchronized void fireActivation( Activation activation )
+ throws ConsequenceException {
+ if (activation.getRule( ) instanceof Query) {
// put query results to the working memory location
- this.workingMemory.addToQueryResults( activation.getRule().getName(),
- activation.getTuple() );
- } else {
- // fire regular rule
- super.fireActivation( activation );
+ this.workingMemory.addToQueryResults( activation.getRule( ).getName( ),
+ activation.getTuple( ) );
}
+ else {
+ if (activation.getRule( ).getXorGroup( ) == null
+ || ( activation.getRule( ).getXorGroup( ) != null && this.getXorGroup( activation.getRule( )
+ .getXorGroup( ) )
+ .isEmpty( ) )) {
+ // fire regular rule
+ super.fireActivation( activation );
+ if (activation.getRule( ).getXorGroup( ) != null) {
+ this.getXorGroup( activation.getRule( ).getXorGroup( ) );
+ }
+ }
+ }
}
}
|
|
From: <jbo...@li...> - 2006-05-09 00:46:40
|
Author: mic...@jb...
Date: 2006-05-08 20:46:25 -0400 (Mon, 08 May 2006)
New Revision: 4143
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:
JBRULES-103
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-05-08 22:59:03 UTC (rev 4142)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParser.java 2006-05-09 00:46:25 UTC (rev 4143)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-05-05 12:51:43
+// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-05-09 10:21:45
package org.drools.lang;
import java.util.List;
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParserLexer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParserLexer.java 2006-05-08 22:59:03 UTC (rev 4142)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/RuleParserLexer.java 2006-05-09 00:46:25 UTC (rev 4143)
@@ -1,4 +1,4 @@
-// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-05-05 12:51:43
+// $ANTLR 3.0ea8 C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g 2006-05-09 10:21:45
package org.drools.lang;
@@ -1291,8 +1291,8 @@
int charPosition = getCharPositionInLine();
int channel = Token.DEFAULT_CHANNEL;
if ( backtracking>0 && alreadyParsedRule(input, 46) ) { return ; }
- // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:1001:17: ( '!' | '@' | '$' | '%' | '^' | '&' | '*' | '_' | '-' | '+' | '|' | ',' | '{' | '}' | '[' | ']' | '=' | '/' | '(' | ')' | '\'' | '\\' | '||' | '&&' | '<<<' | '++' | '--' | '>>>' | '==' | '+=' | '=+' | '-=' | '=-' | '*=' | '=*' | '/=' | '=/' )
- int alt1=37;
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:1001:17: ( '!' | '@' | '$' | '%' | '^' | '&' | '*' | '_' | '-' | '+' | '|' | ',' | '{' | '}' | '[' | ']' | '=' | '/' | '(' | ')' | '\'' | '\\' | '||' | '&&' | '<<<' | '++' | '--' | '>>>' | '==' | '+=' | '=+' | '-=' | '=-' | '*=' | '=*' | '/=' | '=/' | '>>=' | '\u00c0' .. '\u00ff' )
+ int alt1=39;
switch ( input.LA(1) ) {
case '!':
alt1=1;
@@ -1420,12 +1420,101 @@
alt1=25;
break;
case '>':
- alt1=28;
+ int LA1_24 = input.LA(2);
+ if ( LA1_24=='>' ) {
+ int LA1_46 = input.LA(3);
+ if ( LA1_46=='>' ) {
+ alt1=28;
+ }
+ else if ( LA1_46=='=' ) {
+ alt1=38;
+ }
+ else {
+ if (backtracking>0) {failed=true; return ;}
+ NoViableAltException nvae =
+ new NoViableAltException("1000:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' | \'>>=\' | \'\\u00c0\' .. \'\\u00ff\' );", 1, 46, input);
+
+ throw nvae;
+ }
+ }
+ else {
+ if (backtracking>0) {failed=true; return ;}
+ NoViableAltException nvae =
+ new NoViableAltException("1000:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' | \'>>=\' | \'\\u00c0\' .. \'\\u00ff\' );", 1, 24, input);
+
+ throw nvae;
+ }
break;
+ case '\u00C0':
+ case '\u00C1':
+ case '\u00C2':
+ case '\u00C3':
+ case '\u00C4':
+ case '\u00C5':
+ case '\u00C6':
+ case '\u00C7':
+ case '\u00C8':
+ case '\u00C9':
+ case '\u00CA':
+ case '\u00CB':
+ case '\u00CC':
+ case '\u00CD':
+ case '\u00CE':
+ case '\u00CF':
+ case '\u00D0':
+ case '\u00D1':
+ case '\u00D2':
+ case '\u00D3':
+ case '\u00D4':
+ case '\u00D5':
+ case '\u00D6':
+ case '\u00D7':
+ case '\u00D8':
+ case '\u00D9':
+ case '\u00DA':
+ case '\u00DB':
+ case '\u00DC':
+ case '\u00DD':
+ case '\u00DE':
+ case '\u00DF':
+ case '\u00E0':
+ case '\u00E1':
+ case '\u00E2':
+ case '\u00E3':
+ case '\u00E4':
+ case '\u00E5':
+ case '\u00E6':
+ case '\u00E7':
+ case '\u00E8':
+ case '\u00E9':
+ case '\u00EA':
+ case '\u00EB':
+ case '\u00EC':
+ case '\u00ED':
+ case '\u00EE':
+ case '\u00EF':
+ case '\u00F0':
+ case '\u00F1':
+ case '\u00F2':
+ case '\u00F3':
+ case '\u00F4':
+ case '\u00F5':
+ case '\u00F6':
+ case '\u00F7':
+ case '\u00F8':
+ case '\u00F9':
+ case '\u00FA':
+ case '\u00FB':
+ case '\u00FC':
+ case '\u00FD':
+ case '\u00FE':
+ case '\u00FF':
+ alt1=39;
+ break;
default:
if (backtracking>0) {failed=true; return ;}
NoViableAltException nvae =
- new NoViableAltException("1000:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' );", 1, 0, input);
+ new NoViableAltException("1000:1: MISC : ( \'!\' | \'@\' | \'$\' | \'%\' | \'^\' | \'&\' | \'*\' | \'_\' | \'-\' | \'+\' | \'|\' | \',\' | \'{\' | \'}\' | \'[\' | \']\' | \'=\' | \'/\' | \'(\' | \')\' | \'\\\'\' | \'\\\\\' | \'||\' | \'&&\' | \'<<<\' | \'++\' | \'--\' | \'>>>\' | \'==\' | \'+=\' | \'=+\' | \'-=\' | \'=-\' | \'*=\' | \'=*\' | \'/=\' | \'=/\' | \'>>=\' | \'\\u00c0\' .. \'\\u00ff\' );", 1, 0, input);
throw nvae;
}
@@ -1705,7 +1794,22 @@
}
break;
+ case 38 :
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:1004:33: '>>='
+ {
+ match(">>="); if (failed) return ;
+
+ }
+ break;
+ case 39 :
+ // C:\Projects\jboss-rules-new\drools-compiler\src\main\resources\org\drools\lang\drl.g:1004:41: '\u00c0' .. '\u00ff'
+ {
+ matchRange('\u00c0','\u00ff'); if (failed) return ;
+
+ }
+ break;
+
}
if ( token==null ) {emit(type,line,charPosition,channel,start,getCharIndex()-1);}
}
@@ -2896,981 +3000,981 @@
return predict(input, s0);
}
DFA.State s1 = new DFA.State() {{alt=1;}};
- DFA.State s458 = new DFA.State() {{alt=2;}};
- DFA.State s51 = new DFA.State() {{alt=53;}};
- DFA.State s422 = new DFA.State() {
+ DFA.State s459 = new DFA.State() {{alt=2;}};
+ DFA.State s52 = new DFA.State() {{alt=53;}};
+ DFA.State s423 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_422 = input.LA(1);
- if ( (LA16_422>='0' && LA16_422<='9')||(LA16_422>='A' && LA16_422<='Z')||LA16_422=='_'||(LA16_422>='a' && LA16_422<='z') ) {return s51;}
- return s458;
+ int LA16_423 = input.LA(1);
+ if ( (LA16_423>='0' && LA16_423<='9')||(LA16_423>='A' && LA16_423<='Z')||LA16_423=='_'||(LA16_423>='a' && LA16_423<='z') ) {return s52;}
+ return s459;
}
};
- DFA.State s379 = new DFA.State() {
+ DFA.State s380 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_379 = input.LA(1);
- if ( LA16_379=='e' ) {return s422;}
- return s51;
+ int LA16_380 = input.LA(1);
+ if ( LA16_380=='e' ) {return s423;}
+ return s52;
}
};
- DFA.State s319 = new DFA.State() {
+ DFA.State s320 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_319 = input.LA(1);
- if ( LA16_319=='g' ) {return s379;}
- return s51;
+ int LA16_320 = input.LA(1);
+ if ( LA16_320=='g' ) {return s380;}
+ return s52;
}
};
- DFA.State s242 = new DFA.State() {
+ DFA.State s243 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_242 = input.LA(1);
- if ( LA16_242=='a' ) {return s319;}
- return s51;
+ int LA16_243 = input.LA(1);
+ if ( LA16_243=='a' ) {return s320;}
+ return s52;
}
};
- DFA.State s159 = new DFA.State() {
+ DFA.State s160 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_159 = input.LA(1);
- if ( LA16_159=='k' ) {return s242;}
- return s51;
+ int LA16_160 = input.LA(1);
+ if ( LA16_160=='k' ) {return s243;}
+ return s52;
}
};
- DFA.State s53 = new DFA.State() {
+ DFA.State s54 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_53 = input.LA(1);
- if ( LA16_53=='c' ) {return s159;}
- return s51;
+ int LA16_54 = input.LA(1);
+ if ( LA16_54=='c' ) {return s160;}
+ return s52;
}
};
DFA.State s2 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_2 = input.LA(1);
- if ( LA16_2=='a' ) {return s53;}
- return s51;
+ if ( LA16_2=='a' ) {return s54;}
+ return s52;
}
};
- DFA.State s425 = new DFA.State() {{alt=3;}};
- DFA.State s382 = new DFA.State() {
+ DFA.State s426 = new DFA.State() {{alt=3;}};
+ DFA.State s383 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_382 = input.LA(1);
- if ( (LA16_382>='0' && LA16_382<='9')||(LA16_382>='A' && LA16_382<='Z')||LA16_382=='_'||(LA16_382>='a' && LA16_382<='z') ) {return s51;}
- return s425;
+ int LA16_383 = input.LA(1);
+ if ( (LA16_383>='0' && LA16_383<='9')||(LA16_383>='A' && LA16_383<='Z')||LA16_383=='_'||(LA16_383>='a' && LA16_383<='z') ) {return s52;}
+ return s426;
}
};
- DFA.State s322 = new DFA.State() {
+ DFA.State s323 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_322 = input.LA(1);
- if ( LA16_322=='t' ) {return s382;}
- return s51;
+ int LA16_323 = input.LA(1);
+ if ( LA16_323=='t' ) {return s383;}
+ return s52;
}
};
- DFA.State s245 = new DFA.State() {
+ DFA.State s246 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_245 = input.LA(1);
- if ( LA16_245=='r' ) {return s322;}
- return s51;
+ int LA16_246 = input.LA(1);
+ if ( LA16_246=='r' ) {return s323;}
+ return s52;
}
};
- DFA.State s162 = new DFA.State() {
+ DFA.State s163 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_162 = input.LA(1);
- if ( LA16_162=='o' ) {return s245;}
- return s51;
+ int LA16_163 = input.LA(1);
+ if ( LA16_163=='o' ) {return s246;}
+ return s52;
}
};
- DFA.State s56 = new DFA.State() {
+ DFA.State s57 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_56 = input.LA(1);
- if ( LA16_56=='p' ) {return s162;}
- return s51;
+ int LA16_57 = input.LA(1);
+ if ( LA16_57=='p' ) {return s163;}
+ return s52;
}
};
DFA.State s3 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_3 = input.LA(1);
- if ( LA16_3=='m' ) {return s56;}
- return s51;
+ if ( LA16_3=='m' ) {return s57;}
+ return s52;
}
};
- DFA.State s59 = new DFA.State() {{alt=5;}};
- DFA.State s60 = new DFA.State() {{alt=4;}};
+ DFA.State s60 = new DFA.State() {{alt=5;}};
+ DFA.State s61 = new DFA.State() {{alt=4;}};
DFA.State s4 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_4 = input.LA(1);
- if ( LA16_4=='*' ) {return s59;}
- return s60;
+ if ( LA16_4=='*' ) {return s60;}
+ return s61;
}
};
- DFA.State s427 = new DFA.State() {{alt=42;}};
- DFA.State s385 = new DFA.State() {
+ DFA.State s249 = new DFA.State() {{alt=15;}};
+ DFA.State s166 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_385 = input.LA(1);
- if ( (LA16_385>='0' && LA16_385<='9')||(LA16_385>='A' && LA16_385<='Z')||LA16_385=='_'||(LA16_385>='a' && LA16_385<='z') ) {return s51;}
- return s427;
+ int LA16_166 = input.LA(1);
+ if ( (LA16_166>='0' && LA16_166<='9')||(LA16_166>='A' && LA16_166<='Z')||LA16_166=='_'||(LA16_166>='a' && LA16_166<='z') ) {return s52;}
+ return s249;
}
};
- DFA.State s325 = new DFA.State() {
+ DFA.State s62 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_325 = input.LA(1);
- if ( LA16_325=='s' ) {return s385;}
- return s51;
+ int LA16_62 = input.LA(1);
+ if ( LA16_62=='d' ) {return s166;}
+ return s52;
}
};
- DFA.State s248 = new DFA.State() {
+ DFA.State s484 = new DFA.State() {{alt=36;}};
+ DFA.State s461 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_248 = input.LA(1);
- if ( LA16_248=='t' ) {return s325;}
- return s51;
+ int LA16_461 = input.LA(1);
+ if ( (LA16_461>='0' && LA16_461<='9')||(LA16_461>='A' && LA16_461<='Z')||LA16_461=='_'||(LA16_461>='a' && LA16_461<='z') ) {return s52;}
+ return s484;
}
};
- DFA.State s165 = new DFA.State() {
+ DFA.State s428 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_165 = input.LA(1);
- if ( LA16_165=='s' ) {return s248;}
- return s51;
+ int LA16_428 = input.LA(1);
+ if ( LA16_428=='s' ) {return s461;}
+ return s52;
}
};
- DFA.State s483 = new DFA.State() {{alt=6;}};
- DFA.State s460 = new DFA.State() {
+ DFA.State s386 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_460 = input.LA(1);
- if ( (LA16_460>='0' && LA16_460<='9')||(LA16_460>='A' && LA16_460<='Z')||LA16_460=='_'||(LA16_460>='a' && LA16_460<='z') ) {return s51;}
- return s483;
+ int LA16_386 = input.LA(1);
+ if ( LA16_386=='e' ) {return s428;}
+ return s52;
}
};
- DFA.State s429 = new DFA.State() {
+ DFA.State s326 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_429 = input.LA(1);
- if ( LA16_429=='r' ) {return s460;}
- return s51;
+ int LA16_326 = input.LA(1);
+ if ( LA16_326=='d' ) {return s386;}
+ return s52;
}
};
- DFA.State s388 = new DFA.State() {
+ DFA.State s251 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_388 = input.LA(1);
- if ( LA16_388=='e' ) {return s429;}
- return s51;
+ int LA16_251 = input.LA(1);
+ if ( LA16_251=='u' ) {return s326;}
+ return s52;
}
};
- DFA.State s328 = new DFA.State() {
+ DFA.State s169 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_328 = input.LA(1);
- if ( LA16_328=='d' ) {return s388;}
- return s51;
+ int LA16_169 = input.LA(1);
+ if ( LA16_169=='l' ) {return s251;}
+ return s52;
}
};
- DFA.State s251 = new DFA.State() {
+ DFA.State s431 = new DFA.State() {{alt=42;}};
+ DFA.State s389 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_251 = input.LA(1);
- if ( LA16_251=='n' ) {return s328;}
- return s51;
+ int LA16_389 = input.LA(1);
+ if ( (LA16_389>='0' && LA16_389<='9')||(LA16_389>='A' && LA16_389<='Z')||LA16_389=='_'||(LA16_389>='a' && LA16_389<='z') ) {return s52;}
+ return s431;
}
};
- DFA.State s166 = new DFA.State() {
+ DFA.State s329 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_166 = input.LA(1);
- if ( LA16_166=='a' ) {return s251;}
- return s51;
+ int LA16_329 = input.LA(1);
+ if ( LA16_329=='s' ) {return s389;}
+ return s52;
}
};
- DFA.State s485 = new DFA.State() {{alt=36;}};
- DFA.State s463 = new DFA.State() {
+ DFA.State s254 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_463 = input.LA(1);
- if ( (LA16_463>='0' && LA16_463<='9')||(LA16_463>='A' && LA16_463<='Z')||LA16_463=='_'||(LA16_463>='a' && LA16_463<='z') ) {return s51;}
- return s485;
+ int LA16_254 = input.LA(1);
+ if ( LA16_254=='t' ) {return s329;}
+ return s52;
}
};
- DFA.State s432 = new DFA.State() {
+ DFA.State s170 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_432 = input.LA(1);
- if ( LA16_432=='s' ) {return s463;}
- return s51;
+ int LA16_170 = input.LA(1);
+ if ( LA16_170=='s' ) {return s254;}
+ return s52;
}
};
- DFA.State s391 = new DFA.State() {
+ DFA.State s486 = new DFA.State() {{alt=6;}};
+ DFA.State s464 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_391 = input.LA(1);
- if ( LA16_391=='e' ) {return s432;}
- return s51;
+ int LA16_464 = input.LA(1);
+ if ( (LA16_464>='0' && LA16_464<='9')||(LA16_464>='A' && LA16_464<='Z')||LA16_464=='_'||(LA16_464>='a' && LA16_464<='z') ) {return s52;}
+ return s486;
}
};
- DFA.State s331 = new DFA.State() {
+ DFA.State s433 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_331 = input.LA(1);
- if ( LA16_331=='d' ) {return s391;}
- return s51;
+ int LA16_433 = input.LA(1);
+ if ( LA16_433=='r' ) {return s464;}
+ return s52;
}
};
- DFA.State s254 = new DFA.State() {
+ DFA.State s392 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_254 = input.LA(1);
- if ( LA16_254=='u' ) {return s331;}
- return s51;
+ int LA16_392 = input.LA(1);
+ if ( LA16_392=='e' ) {return s433;}
+ return s52;
}
};
- DFA.State s167 = new DFA.State() {
+ DFA.State s332 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_167 = input.LA(1);
- if ( LA16_167=='l' ) {return s254;}
- return s51;
+ int LA16_332 = input.LA(1);
+ if ( LA16_332=='d' ) {return s392;}
+ return s52;
}
};
- DFA.State s61 = new DFA.State() {
+ DFA.State s257 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- switch ( input.LA(1) ) {
- case 'i':
- return s165;
+ int LA16_257 = input.LA(1);
+ if ( LA16_257=='n' ) {return s332;}
+ return s52;
- case 'p':
- return s166;
-
- case 'c':
- return s167;
-
- default:
- return s51;
- }
}
};
- DFA.State s334 = new DFA.State() {{alt=44;}};
- DFA.State s257 = new DFA.State() {
+ DFA.State s171 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_257 = input.LA(1);
- if ( (LA16_257>='0' && LA16_257<='9')||(LA16_257>='A' && LA16_257<='Z')||LA16_257=='_'||(LA16_257>='a' && LA16_257<='z') ) {return s51;}
- return s334;
+ int LA16_171 = input.LA(1);
+ if ( LA16_171=='a' ) {return s257;}
+ return s52;
}
};
- DFA.State s170 = new DFA.State() {
+ DFA.State s63 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_170 = input.LA(1);
- if ( LA16_170=='l' ) {return s257;}
- return s51;
+ switch ( input.LA(1) ) {
+ case 'c':
+ return s169;
+ case 'i':
+ return s170;
+
+ case 'p':
+ return s171;
+
+ default:
+ return s52;
+ }
}
};
- DFA.State s62 = new DFA.State() {
+ DFA.State s335 = new DFA.State() {{alt=44;}};
+ DFA.State s260 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_62 = input.LA(1);
- if ( LA16_62=='a' ) {return s170;}
- return s51;
+ int LA16_260 = input.LA(1);
+ if ( (LA16_260>='0' && LA16_260<='9')||(LA16_260>='A' && LA16_260<='Z')||LA16_260=='_'||(LA16_260>='a' && LA16_260<='z') ) {return s52;}
+ return s335;
}
};
- DFA.State s260 = new DFA.State() {{alt=15;}};
- DFA.State s173 = new DFA.State() {
+ DFA.State s174 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_173 = input.LA(1);
- if ( (LA16_173>='0' && LA16_173<='9')||(LA16_173>='A' && LA16_173<='Z')||LA16_173=='_'||(LA16_173>='a' && LA16_173<='z') ) {return s51;}
- return s260;
+ int LA16_174 = input.LA(1);
+ if ( LA16_174=='l' ) {return s260;}
+ return s52;
}
};
- DFA.State s63 = new DFA.State() {
+ DFA.State s64 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_63 = input.LA(1);
- if ( LA16_63=='d' ) {return s173;}
- return s51;
+ int LA16_64 = input.LA(1);
+ if ( LA16_64=='a' ) {return s174;}
+ return s52;
}
};
DFA.State s5 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
+ case 'n':
+ return s62;
+
case 'x':
- return s61;
+ return s63;
case 'v':
- return s62;
+ return s64;
- case 'n':
- return s63;
-
default:
- return s51;
+ return s52;
}
}
};
- DFA.State s435 = new DFA.State() {{alt=7;}};
- DFA.State s394 = new DFA.State() {
+ DFA.State s436 = new DFA.State() {{alt=7;}};
+ DFA.State s395 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_394 = input.LA(1);
- if ( (LA16_394>='0' && LA16_394<='9')||(LA16_394>='A' && LA16_394<='Z')||LA16_394=='_'||(LA16_394>='a' && LA16_394<='z') ) {return s51;}
- return s435;
+ int LA16_395 = input.LA(1);
+ if ( (LA16_395>='0' && LA16_395<='9')||(LA16_395>='A' && LA16_395<='Z')||LA16_395=='_'||(LA16_395>='a' && LA16_395<='z') ) {return s52;}
+ return s436;
}
};
- DFA.State s336 = new DFA.State() {
+ DFA.State s337 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_336 = input.LA(1);
- if ( LA16_336=='l' ) {return s394;}
- return s51;
+ int LA16_337 = input.LA(1);
+ if ( LA16_337=='l' ) {return s395;}
+ return s52;
}
};
- DFA.State s262 = new DFA.State() {
+ DFA.State s263 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_262 = input.LA(1);
- if ( LA16_262=='a' ) {return s336;}
- return s51;
+ int LA16_263 = input.LA(1);
+ if ( LA16_263=='a' ) {return s337;}
+ return s52;
}
};
- DFA.State s176 = new DFA.State() {
+ DFA.State s177 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_176 = input.LA(1);
- if ( LA16_176=='b' ) {return s262;}
- return s51;
+ int LA16_177 = input.LA(1);
+ if ( LA16_177=='b' ) {return s263;}
+ return s52;
}
};
- DFA.State s66 = new DFA.State() {
+ DFA.State s67 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_66 = input.LA(1);
- if ( LA16_66=='o' ) {return s176;}
- return s51;
+ int LA16_67 = input.LA(1);
+ if ( LA16_67=='o' ) {return s177;}
+ return s52;
}
};
DFA.State s6 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_6 = input.LA(1);
- if ( LA16_6=='l' ) {return s66;}
- return s51;
+ if ( LA16_6=='l' ) {return s67;}
+ return s52;
}
};
- DFA.State s487 = new DFA.State() {{alt=8;}};
- DFA.State s466 = new DFA.State() {
+ DFA.State s353 = new DFA.State() {{alt=52;}};
+ DFA.State s340 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_466 = input.LA(1);
- if ( (LA16_466>='0' && LA16_466<='9')||(LA16_466>='A' && LA16_466<='Z')||LA16_466=='_'||(LA16_466>='a' && LA16_466<='z') ) {return s51;}
- return s487;
+ int LA16_340 = input.LA(1);
+ if ( (LA16_340>='0' && LA16_340<='9')||(LA16_340>='A' && LA16_340<='Z')||LA16_340=='_'||(LA16_340>='a' && LA16_340<='z') ) {return s52;}
+ return s353;
}
};
- DFA.State s437 = new DFA.State() {
+ DFA.State s266 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_437 = input.LA(1);
- if ( LA16_437=='n' ) {return s466;}
- return s51;
+ int LA16_266 = input.LA(1);
+ if ( LA16_266=='e' ) {return s340;}
+ return s52;
}
};
- DFA.State s397 = new DFA.State() {
+ DFA.State s180 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_397 = input.LA(1);
- if ( LA16_397=='o' ) {return s437;}
- return s51;
+ int LA16_180 = input.LA(1);
+ if ( LA16_180=='s' ) {return s266;}
+ return s52;
}
};
- DFA.State s339 = new DFA.State() {
+ DFA.State s70 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_339 = input.LA(1);
- if ( LA16_339=='i' ) {return s397;}
- return s51;
+ int LA16_70 = input.LA(1);
+ if ( LA16_70=='l' ) {return s180;}
+ return s52;
}
};
- DFA.State s265 = new DFA.State() {
+ DFA.State s488 = new DFA.State() {{alt=8;}};
+ DFA.State s467 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_265 = input.LA(1);
- if ( LA16_265=='t' ) {return s339;}
- return s51;
+ int LA16_467 = input.LA(1);
+ if ( (LA16_467>='0' && LA16_467<='9')||(LA16_467>='A' && LA16_467<='Z')||LA16_467=='_'||(LA16_467>='a' && LA16_467<='z') ) {return s52;}
+ return s488;
}
};
- DFA.State s179 = new DFA.State() {
+ DFA.State s438 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_179 = input.LA(1);
- if ( LA16_179=='c' ) {return s265;}
- return s51;
+ int LA16_438 = input.LA(1);
+ if ( LA16_438=='n' ) {return s467;}
+ return s52;
}
};
- DFA.State s69 = new DFA.State() {
+ DFA.State s400 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_69 = input.LA(1);
- if ( LA16_69=='n' ) {return s179;}
- return s51;
+ int LA16_400 = input.LA(1);
+ if ( LA16_400=='o' ) {return s438;}
+ return s52;
}
};
- DFA.State s354 = new DFA.State() {{alt=52;}};
- DFA.State s342 = new DFA.State() {
+ DFA.State s343 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_342 = input.LA(1);
- if ( (LA16_342>='0' && LA16_342<='9')||(LA16_342>='A' && LA16_342<='Z')||LA16_342=='_'||(LA16_342>='a' && LA16_342<='z') ) {return s51;}
- return s354;
+ int LA16_343 = input.LA(1);
+ if ( LA16_343=='i' ) {return s400;}
+ return s52;
}
};
- DFA.State s268 = new DFA.State() {
+ DFA.State s269 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_268 = input.LA(1);
- if ( LA16_268=='e' ) {return s342;}
- return s51;
+ int LA16_269 = input.LA(1);
+ if ( LA16_269=='t' ) {return s343;}
+ return s52;
}
};
- DFA.State s182 = new DFA.State() {
+ DFA.State s183 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_182 = input.LA(1);
- if ( LA16_182=='s' ) {return s268;}
- return s51;
+ int LA16_183 = input.LA(1);
+ if ( LA16_183=='c' ) {return s269;}
+ return s52;
}
};
- DFA.State s70 = new DFA.State() {
+ DFA.State s71 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_70 = input.LA(1);
- if ( LA16_70=='l' ) {return s182;}
- return s51;
+ int LA16_71 = input.LA(1);
+ if ( LA16_71=='n' ) {return s183;}
+ return s52;
}
};
DFA.State s7 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
- case 'u':
- return s69;
-
case 'a':
return s70;
+ case 'u':
+ return s71;
+
default:
- return s51;
+ return s52;
}
}
};
- DFA.State s73 = new DFA.State() {{alt=9;}};
+ DFA.State s74 = new DFA.State() {{alt=9;}};
DFA.State s8 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_8 = input.LA(1);
- return s73;
+ return s74;
}
};
- DFA.State s74 = new DFA.State() {{alt=10;}};
+ DFA.State s75 = new DFA.State() {{alt=10;}};
DFA.State s9 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_9 = input.LA(1);
- return s74;
+ return s75;
}
};
- DFA.State s75 = new DFA.State() {{alt=11;}};
+ DFA.State s76 = new DFA.State() {{alt=11;}};
DFA.State s10 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_10 = input.LA(1);
- return s75;
+ return s76;
}
};
- DFA.State s76 = new DFA.State() {{alt=12;}};
+ DFA.State s77 = new DFA.State() {{alt=12;}};
DFA.State s11 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_11 = input.LA(1);
- return s76;
+ return s77;
}
};
- DFA.State s77 = new DFA.State() {{alt=13;}};
+ DFA.State s78 = new DFA.State() {{alt=13;}};
DFA.State s12 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_12 = input.LA(1);
- return s77;
+ return s78;
}
};
- DFA.State s402 = new DFA.State() {{alt=14;}};
- DFA.State s345 = new DFA.State() {
+ DFA.State s403 = new DFA.State() {{alt=14;}};
+ DFA.State s346 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_345 = input.LA(1);
- if ( (LA16_345>='0' && LA16_345<='9')||(LA16_345>='A' && LA16_345<='Z')||LA16_345=='_'||(LA16_345>='a' && LA16_345<='z') ) {return s51;}
- return s402;
+ int LA16_346 = input.LA(1);
+ if ( (LA16_346>='0' && LA16_346<='9')||(LA16_346>='A' && LA16_346<='Z')||LA16_346=='_'||(LA16_346>='a' && LA16_346<='z') ) {return s52;}
+ return s403;
}
};
- DFA.State s271 = new DFA.State() {
+ DFA.State s272 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_271 = input.LA(1);
- if ( LA16_271=='y' ) {return s345;}
- return s51;
+ int LA16_272 = input.LA(1);
+ if ( LA16_272=='y' ) {return s346;}
+ return s52;
}
};
- DFA.State s185 = new DFA.State() {
+ DFA.State s186 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_185 = input.LA(1);
- if ( LA16_185=='r' ) {return s271;}
- return s51;
+ int LA16_186 = input.LA(1);
+ if ( LA16_186=='r' ) {return s272;}
+ return s52;
}
};
- DFA.State s78 = new DFA.State() {
+ DFA.State s79 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_78 = input.LA(1);
- if ( LA16_78=='e' ) {return s185;}
- return s51;
+ int LA16_79 = input.LA(1);
+ if ( LA16_79=='e' ) {return s186;}
+ return s52;
}
};
DFA.State s13 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_13 = input.LA(1);
- if ( LA16_13=='u' ) {return s78;}
- return s51;
+ if ( LA16_13=='u' ) {return s79;}
+ return s52;
}
};
- DFA.State s348 = new DFA.State() {{alt=16;}};
- DFA.State s274 = new DFA.State() {
+ DFA.State s349 = new DFA.State() {{alt=16;}};
+ DFA.State s275 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_274 = input.LA(1);
- if ( (LA16_274>='0' && LA16_274<='9')||(LA16_274>='A' && LA16_274<='Z')||LA16_274=='_'||(LA16_274>='a' && LA16_274<='z') ) {return s51;}
- return s348;
+ int LA16_275 = input.LA(1);
+ if ( (LA16_275>='0' && LA16_275<='9')||(LA16_275>='A' && LA16_275<='Z')||LA16_275=='_'||(LA16_275>='a' && LA16_275<='z') ) {return s52;}
+ return s349;
}
};
- DFA.State s188 = new DFA.State() {
+ DFA.State s189 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_188 = input.LA(1);
- if ( LA16_188=='e' ) {return s274;}
- return s51;
+ int LA16_189 = input.LA(1);
+ if ( LA16_189=='e' ) {return s275;}
+ return s52;
}
};
- DFA.State s81 = new DFA.State() {
+ DFA.State s82 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_81 = input.LA(1);
- if ( LA16_81=='l' ) {return s188;}
- return s51;
+ int LA16_82 = input.LA(1);
+ if ( LA16_82=='l' ) {return s189;}
+ return s52;
}
};
DFA.State s14 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_14 = input.LA(1);
- if ( LA16_14=='u' ) {return s81;}
- return s51;
+ if ( LA16_14=='u' ) {return s82;}
+ return s52;
}
};
- DFA.State s350 = new DFA.State() {{alt=17;}};
- DFA.State s277 = new DFA.State() {
+ DFA.State s351 = new DFA.State() {{alt=17;}};
+ DFA.State s278 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_277 = input.LA(1);
- if ( (LA16_277>='0' && LA16_277<='9')||(LA16_277>='A' && LA16_277<='Z')||LA16_277=='_'||(LA16_277>='a' && LA16_277<='z') ) {return s51;}
- return s350;
+ int LA16_278 = input.LA(1);
+ if ( (LA16_278>='0' && LA16_278<='9')||(LA16_278>='A' && LA16_278<='Z')||LA16_278=='_'||(LA16_278>='a' && LA16_278<='z') ) {return s52;}
+ return s351;
}
};
- DFA.State s191 = new DFA.State() {
+ DFA.State s192 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_191 = input.LA(1);
- if ( LA16_191=='n' ) {return s277;}
- return s51;
+ int LA16_192 = input.LA(1);
+ if ( LA16_192=='n' ) {return s278;}
+ return s52;
}
};
- DFA.State s84 = new DFA.State() {
+ DFA.State s85 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_84 = input.LA(1);
- if ( LA16_84=='e' ) {return s191;}
- return s51;
+ int LA16_85 = input.LA(1);
+ if ( LA16_85=='e' ) {return s192;}
+ return s52;
}
};
DFA.State s15 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
int LA16_15 = input.LA(1);
- if ( LA16_15=='h' ) {return s84;}
- return s51;
+ if ( LA16_15=='h' ) {return s85;}
+ return s52;
}
};
DFA.State s16 = new DFA.State() {{alt=18;}};
- DFA.State s352 = new DFA.State() {{alt=19;}};
- DFA.State s280 = new DFA.State() {
+ DFA.State s281 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_280 = input.LA(1);
- if ( (LA16_280>='0' && LA16_280<='9')||(LA16_280>='A' && LA16_280<='Z')||LA16_280=='_'||(LA16_280>='a' && LA16_280<='z') ) {return s51;}
- return s352;
+ int LA16_281 = input.LA(1);
+ if ( (LA16_281>='0' && LA16_281<='9')||(LA16_281>='A' && LA16_281<='Z')||LA16_281=='_'||(LA16_281>='a' && LA16_281<='z') ) {return s52;}
+ return s353;
}
};
- DFA.State s194 = new DFA.State() {
+ DFA.State s195 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_194 = input.LA(1);
- if ( LA16_194=='n' ) {return s280;}
- return s51;
+ int LA16_195 = input.LA(1);
+ if ( LA16_195=='e' ) {return s281;}
+ return s52;
}
};
- DFA.State s87 = new DFA.State() {
+ DFA.State s88 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_87 = input.LA(1);
- if ( LA16_87=='e' ) {return s194;}
- return s51;
+ int LA16_88 = input.LA(1);
+ if ( LA16_88=='u' ) {return s195;}
+ return s52;
}
};
- DFA.State s283 = new DFA.State() {
+ DFA.State s355 = new DFA.State() {{alt=19;}};
+ DFA.State s284 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_283 = input.LA(1);
- if ( (LA16_283>='0' && LA16_283<='9')||(LA16_283>='A' && LA16_283<='Z')||LA16_283=='_'||(LA16_283>='a' && LA16_283<='z') ) {return s51;}
- return s354;
+ int LA16_284 = input.LA(1);
+ if ( (LA16_284>='0' && LA16_284<='9')||(LA16_284>='A' && LA16_284<='Z')||LA16_284=='_'||(LA16_284>='a' && LA16_284<='z') ) {return s52;}
+ return s355;
}
};
- DFA.State s197 = new DFA.State() {
+ DFA.State s198 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_197 = input.LA(1);
- if ( LA16_197=='e' ) {return s283;}
- return s51;
+ int LA16_198 = input.LA(1);
+ if ( LA16_198=='n' ) {return s284;}
+ return s52;
}
};
- DFA.State s88 = new DFA.State() {
+ DFA.State s89 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_88 = input.LA(1);
- if ( LA16_88=='u' ) {return s197;}
- return s51;
+ int LA16_89 = input.LA(1);
+ if ( LA16_89=='e' ) {return s198;}
+ return s52;
}
};
DFA.State s17 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
- case 'h':
- return s87;
-
case 'r':
return s88;
+ case 'h':
+ return s89;
+
default:
- return s51;
+ return s52;
}
}
};
- DFA.State s286 = new DFA.State() {{alt=40;}};
- DFA.State s200 = new DFA.State() {
+ DFA.State s502 = new DFA.State() {{alt=20;}};
+ DFA.State s499 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_200 = input.LA(1);
- if ( (LA16_200>='0' && LA16_200<='9')||(LA16_200>='A' && LA16_200<='Z')||LA16_200=='_'||(LA16_200>='a' && LA16_200<='z') ) {return s51;}
- return s286;
+ int LA16_499 = input.LA(1);
+ if ( (LA16_499>='0' && LA16_499<='9')||(LA16_499>='A' && LA16_499<='Z')||LA16_499=='_'||(LA16_499>='a' && LA16_499<='z') ) {return s52;}
+ return s502;
}
};
- DFA.State s91 = new DFA.State() {
+ DFA.State s490 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_91 = input.LA(1);
- if ( LA16_91=='d' ) {return s200;}
- return s51;
+ int LA16_490 = input.LA(1);
+ if ( LA16_490=='s' ) {return s499;}
+ return s52;
}
};
- DFA.State s501 = new DFA.State() {{alt=20;}};
- DFA.State s498 = new DFA.State() {
+ DFA.State s470 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_498 = input.LA(1);
- if ( (LA16_498>='0' && LA16_498<='9')||(LA16_498>='A' && LA16_498<='Z')||LA16_498=='_'||(LA16_498>='a' && LA16_498<='z') ) {return s51;}
- return s501;
+ int LA16_470 = input.LA(1);
+ if ( LA16_470=='e' ) {return s490;}
+ return s52;
}
};
- DFA.State s489 = new DFA.State() {
+ DFA.State s441 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_489 = input.LA(1);
- if ( LA16_489=='s' ) {return s498;}
- return s51;
+ int LA16_441 = input.LA(1);
+ if ( LA16_441=='t' ) {return s470;}
+ return s52;
}
};
- DFA.State s469 = new DFA.State() {
+ DFA.State s405 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_469 = input.LA(1);
- if ( LA16_469=='e' ) {return s489;}
- return s51;
+ int LA16_405 = input.LA(1);
+ if ( LA16_405=='u' ) {return s441;}
+ return s52;
}
};
- DFA.State s440 = new DFA.State() {
+ DFA.State s357 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_440 = input.LA(1);
- if ( LA16_440=='t' ) {return s469;}
- return s51;
+ int LA16_357 = input.LA(1);
+ if ( LA16_357=='b' ) {return s405;}
+ return s52;
}
};
- DFA.State s404 = new DFA.State() {
+ DFA.State s287 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_404 = input.LA(1);
- if ( LA16_404=='u' ) {return s440;}
- return s51;
+ int LA16_287 = input.LA(1);
+ if ( LA16_287=='i' ) {return s357;}
+ return s52;
}
};
- DFA.State s356 = new DFA.State() {
+ DFA.State s201 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_356 = input.LA(1);
- if ( LA16_356=='b' ) {return s404;}
- return s51;
+ int LA16_201 = input.LA(1);
+ if ( LA16_201=='r' ) {return s287;}
+ return s52;
}
};
- DFA.State s288 = new DFA.State() {
+ DFA.State s92 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_288 = input.LA(1);
- if ( LA16_288=='i' ) {return s356;}
- return s51;
+ int LA16_92 = input.LA(1);
+ if ( LA16_92=='t' ) {return s201;}
+ return s52;
}
};
- DFA.State s203 = new DFA.State() {
+ DFA.State s444 = new DFA.State() {{alt=25;}};
+ DFA.State s408 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_203 = input.LA(1);
- if ( LA16_203=='r' ) {return s288;}
- return s51;
+ int LA16_408 = input.LA(1);
+ if ( LA16_408=='-' ) {return s444;}
+ return s52;
}
};
- DFA.State s92 = new DFA.State() {
+ DFA.State s360 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_92 = input.LA(1);
- if ( LA16_92=='t' ) {return s203;}
- return s51;
+ int LA16_360 = input.LA(1);
+ if ( LA16_360=='a' ) {return s408;}
+ return s52;
}
};
- DFA.State s443 = new DFA.State() {{alt=25;}};
- DFA.State s407 = new DFA.State() {
+ DFA.State s290 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_407 = input.LA(1);
- if ( LA16_407=='-' ) {return s443;}
- return s51;
+ int LA16_290 = input.LA(1);
+ if ( LA16_290=='d' ) {return s360;}
+ return s52;
}
};
- DFA.State s359 = new DFA.State() {
+ DFA.State s204 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_359 = input.LA(1);
- if ( LA16_359=='a' ) {return s407;}
- return s51;
+ int LA16_204 = input.LA(1);
+ if ( LA16_204=='n' ) {return s290;}
+ return s52;
}
};
- DFA.State s291 = new DFA.State() {
+ DFA.State s93 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_291 = input.LA(1);
- if ( LA16_291=='d' ) {return s359;}
- return s51;
+ int LA16_93 = input.LA(1);
+ if ( LA16_93=='e' ) {return s204;}
+ return s52;
}
};
- DFA.State s206 = new DFA.State() {
+ DFA.State s293 = new DFA.State() {{alt=40;}};
+ DFA.State s207 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_206 = input.LA(1);
- if ( LA16_206=='n' ) {return s291;}
- return s51;
+ int LA16_207 = input.LA(1);
+ if ( (LA16_207>='0' && LA16_207<='9')||(LA16_207>='A' && LA16_207<='Z')||LA16_207=='_'||(LA16_207>='a' && LA16_207<='z') ) {return s52;}
+ return s293;
}
};
- DFA.State s93 = new DFA.State() {
+ DFA.State s94 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_93 = input.LA(1);
- if ( LA16_93=='e' ) {return s206;}
- return s51;
+ int LA16_94 = input.LA(1);
+ if ( LA16_94=='d' ) {return s207;}
+ return s52;
}
};
- DFA.State s362 = new DFA.State() {{alt=23;}};
- DFA.State s294 = new DFA.State() {
+ DFA.State s363 = new DFA.State() {{alt=23;}};
+ DFA.State s295 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_294 = input.LA(1);
- if ( LA16_294=='-' ) {return s362;}
- return s51;
+ int LA16_295 = input.LA(1);
+ if ( LA16_295=='-' ) {return s363;}
+ return s52;
}
};
- DFA.State s209 = new DFA.State() {
+ DFA.State s210 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_209 = input.LA(1);
- if ( LA16_209=='o' ) {return s294;}
- return s51;
+ int LA16_210 = input.LA(1);
+ if ( LA16_210=='o' ) {return s295;}
+ return s52;
}
};
- DFA.State s94 = new DFA.State() {
+ DFA.State s95 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_94 = input.LA(1);
- if ( LA16_94=='t' ) {return s209;}
- return s51;
+ int LA16_95 = input.LA(1);
+ if ( LA16_95=='t' ) {return s210;}
+ return s52;
}
};
DFA.State s18 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
switch ( input.LA(1) ) {
- case 'n':
- return s91;
-
case 't':
return s92;
case 'g':
return s93;
- case 'u':
+ case 'n':
return s94;
+ case 'u':
+ return s95;
+
default:
- return s51;
+ return s52;
}
}
};
- DFA.State s492 = new DFA.State() {{alt=21;}};
- DFA.State s472 = new DFA.State() {
+ DFA.State s493 = new DFA.State() {{alt=21;}};
+ DFA.State s473 = new DFA.State() {
public DFA.State transition(IntStream input) throws RecognitionException {
- int LA16_472 = input.LA(1);
- if ( (LA16_472>='0' && LA16_472<='9')||(LA16_472>='A' && LA16_472<='Z')||LA16_472=='_'||(LA16_472>='a' && LA16_472<='z') ) {return s51;}
- return s492;
+ int LA16_473 = input.LA(1);
+ if ( (LA16_473>='0' && LA16_473<='9')||(LA16_473>='A' && LA16_473<='Z')||LA16_473=='_'||(LA16_473>='a' && LA16_473<='z') ) {return s52;}
+ return s493;
}
};
- DFA.State s446 = new DFA.State() {
+ DFA.State s447 = new DFA.State()...
[truncated message content] |
|
From: <jbo...@li...> - 2006-05-08 22:59:08
|
Author: mar...@jb...
Date: 2006-05-08 18:59:03 -0400 (Mon, 08 May 2006)
New Revision: 4142
Added:
labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/beta_node.svg
Modified:
labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/Section-Performance.xml
Log:
-Added an svg image for beta node
Modified: labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/Section-Performance.xml
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/Section-Performance.xml 2006-05-08 19:57:07 UTC (rev 4141)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/Section-Performance.xml 2006-05-08 22:59:03 UTC (rev 4142)
@@ -33,13 +33,24 @@
tries to match every tuple in the left memory according to the constraints
defined for the given BetaNode. Those elements that match are propagated
down through the network. The symmetrical behavior happens for when a
- tuple arrives at the left input of the node. See diagram bellow:
- <mediaobject>
+ tuple arrives at the left input of the node. See diagram bellow: </para>
+
+ <figure>
+ <title>Beta Node</title>
+
+ <mediaobject>
<imageobject>
- <imagedata fileref="beta_node.png" />
+ <imagedata align="center" contentwidth="300" fileref="beta_node.svg"
+ format="SVG" scalefit="1" />
</imageobject>
- </mediaobject></para>
+ <imageobject>
+ <imagedata align="center" fileref="beta_node.png" format="PNG"
+ scalefit="1" />
+ </imageobject>
+ </mediaobject>
+ </figure>
+
<para>When the number of elements in each of the Beta Node Memories starts
to grow, the matching process starts to slow down, as each new element
that arrives needs to try to match all the elements in the opposite memory
@@ -130,19 +141,21 @@
would be to disable left indexing, leaving only right indexing
enabled.</para>
- <section>
- <title>Re-arranging constraints</title>
- <para>Another tip to tune performance when using indexing is always to
- write your rules in a way that the most restrictive constraints are
- declared before the less restrictive ones in your rule. For example, if
- you have a rule with a column like this: <programlisting>Employee (department == $aDepartment, name == $aName)
+ <section>
+ <title>Re-arranging constraints</title>
+
+ <para>Another tip to tune performance when using indexing is always to
+ write your rules in a way that the most restrictive constraints are
+ declared before the less restrictive ones in your rule. For example, if
+ you have a rule with a column like this: <programlisting>Employee (department == $aDepartment, name == $aName)
</programlisting> Rewriting it as shown bellow will probably give you a better
- performance, as “name” is probably a more restrictive constraint than
- “department”: <programlisting>Employee (name == $aName, department == $aDepartment)
+ performance, as “name” is probably a more restrictive constraint than
+ “department”: <programlisting>Employee (name == $aName, department == $aDepartment)
</programlisting> (Unless you work in an organisation where there are more
- departments then employees, which could well be the case in a Government
- organisation ;)</para>
- </section>
+ departments then employees, which could well be the case in a Government
+ organisation ;)</para>
+ </section>
+
<para>Some other improvements are being developed for Drools in this area
and will be documented as they become available in future versions.</para>
</section>
Added: labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/beta_node.svg
===================================================================
--- labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/beta_node.svg 2006-05-08 19:57:07 UTC (rev 4141)
+++ labs/jbossrules/trunk/documentation/manual/en/Chapter-Performance_Tuning/beta_node.svg 2006-05-08 22:59:03 UTC (rev 4142)
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<!-- Generated by Microsoft Visio 11.0, SVG Export, v1.0 beta_node.svg Page-1 -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="7.67748in"
+ height="7.6578in" viewBox="0 0 552.779 551.361" xml:space="preserve" color-interpolation-filters="sRGB" class="st14">
+ <title>BetaNode</title>
+ <v:documentProperties v:langID="1046" v:metric="true" v:viewMarkup="false"/>
+
+ <style type="text/css">
+ <![CDATA[
+ .st1 {fill:#ffffff;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st2 {fill:url(#grad25-13);stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
+ .st3 {stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st4 {fill:#000000;font-family:Arial;font-size:1.00001em}
+ .st5 {fill:none;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
+ .st6 {fill:#000000;font-family:Arial;font-size:0.666664em}
+ .st7 {font-size:1em}
+ .st8 {fill:#000000;font-family:Arial;font-size:2.50001em;font-weight:bold}
+ .st9 {fill:url(#grad28-54);stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.72}
+ .st10 {stroke:#000000;stroke-dasharray:0.72,0.72;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st11 {fill:#c0c0c0;stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.24}
+ .st12 {fill:#000000;font-family:Arial;font-size:1.00001em;font-weight:bold}
+ .st13 {fill:#ffffff}
+ .st14 {fill:none;fill-rule:evenodd;font-size:12;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
+ ]]>
+ </style>
+
+ <defs id="Patterns_And_Gradients">
+ <linearGradient id="grad25-13" v:fillPattern="25" v:foreground="#c0c0c0" v:background="#ffffff" x1="0" y1="0" x2="1" y2="0">
+ <stop offset="0" style="stop-color:#c0c0c0;stop-opacity:1"/>
+ <stop offset="1" style="stop-color:#ffffff;stop-opacity:1"/>
+ </linearGradient>
+ <linearGradient id="grad28-54" v:fillPattern="28" v:foreground="#e6e6e6" v:background="#9a9a9a" x1="0" y1="0" x2="0" y2="1">
+ <stop offset="0" style="stop-color:#e6e6e6;stop-opacity:1"/>
+ <stop offset="1" style="stop-color:#9a9a9a;stop-opacity:1"/>
+ </linearGradient>
+ </defs>
+ <g v:mID="0" v:index="1" v:groupContext="foregroundPage">
+ <title>Page-1</title>
+ <v:pageProperties v:drawingScale="0.0393701" v:pageScale="0.0393701" v:drawingUnits="24" v:shadowOffsetX="8.50394"
+ v:shadowOffsetY="-8.50394"/>
+ <v:layer v:name="Conector" v:index="0"/>
+ <g id="shape1-1" v:mID="1" v:groupContext="shape" transform="translate(424.5,679.64) rotate(180)">
+ <title>Triangle</title>
+ <v:userDefs>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <path d="M320.66 551.36 L148.82 253.72 L-23.02 551.36 L320.66 551.36 Z" class="st1"/>
+ </g>
+ <g id="shape2-3" v:mID="2" v:groupContext="shape" transform="translate(477.899,-247.561) rotate(45) scale(-1,1)">
+ <title>45 degree single</title>
+ <v:userDefs>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <path d="M0 531.52 L19.84 511.68 L19.84 524.77 L100.22 524.77 L100.22 538.27 L19.84 538.27 L19.84 551.36 L0 531.52 Z"
+ class="st1"/>
+ </g>
+ <g id="shape3-5" v:mID="3" v:groupContext="shape" transform="translate(73.4622,-247.561) rotate(-45)">
+ <title>45 degree single.3</title>
+ <v:userDefs>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <path d="M0 531.52 L19.84 511.68 L19.84 524.77 L100.22 524.77 L100.22 538.27 L19.84 538.27 L19.84 551.36 L0 531.52 Z"
+ class="st1"/>
+ </g>
+ <g id="shape4-7" v:mID="4" v:groupContext="shape" transform="translate(808.51,486.155) rotate(88.8542) scale(-1,1)">
+ <title>45 degree single.4</title>
+ <v:userDefs>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <path d="M0 531.52 L19.84 511.68 L19.84 524.77 L70.88 524.77 L70.88 538.27 L19.84 538.27 L19.84 551.36 L0 531.52 Z"
+ class="st1"/>
+ </g>
+ <g id="group12-9" transform="translate(4.97197,-499.618)" v:mID="12" v:groupContext="group">
+ <v:userDefs>
+ <v:ud v:nameU="Margin" v:val="VT0(0.11811023622047):24"/>
+ <v:ud v:nameU="AntiScale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="Scale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <title>Note box deco</title>
+ <g id="shape13-10" v:mID="13" v:groupContext="shape">
+ <title>Sheet.13</title>
+ <v:userDefs>
+ <v:ud v:nameU="Margin" v:val="VT0(0.11811023622047):24"/>
+ </v:userDefs>
+ <path d="M0 551.36 L102.05 551.36 L102.05 500.34 L0 500.34 L0 551.36 Z M-4.25 508.84 L-4.25 517.35 L4.25 517.35 L4.25
+ 508.84 L-4.25 508.84 Z M-4.25 521.6 L-4.25 530.1 L4.25 530.1 L4.25 521.6 L-4.25 521.6 Z M-4.25 534.35
+ L-4.25 542.86 L4.25 542.86 L4.25 534.35 L-4.25 534.35 Z" class="st2"/>
+ </g>
+ <g id="shape14-14" v:mID="14" v:groupContext="shape" transform="translate(14.9737,-30.3679)">
+ <title>Sheet.14</title>
+ <desc>Left Input</desc>
+ <v:textBlock v:margins="rect(2,0,0,0)" v:tabSpace="42.5197" v:verticalAlign="2"/>
+ <v:textRect cx="51.5058" cy="543.159" width="54.13" height="16.4037"/>
+ <path d="M0 551.36 L78.57 551.36" class="st3"/>
+ <text x="28.55" y="547.76" class="st4" v:langID="1046"><v:paragraph v:horizAlign="2"/><v:tabList/>Left Input</text> </g>
+ <g id="shape15-18" v:mID="15" v:groupContext="shape" transform="translate(14.9737,-9.16442)">
+ <title>Sheet.15</title>
+ <desc>Tuples arrive through the Left Input</desc>
+ <v:textBlock v:margins="rect(2,0,0,0)" v:tabSpace="42.5197" v:verticalAlign="0"/>
+ <v:textRect cx="39.2848" cy="540.759" width="78.57" height="21.2035"/>
+ <rect x="0" y="530.158" width="78.5696" height="21.2035" class="st5"/>
+ <text x="0" y="539.36" class="st6" v:langID="1046"><v:paragraph/><v:tabList/>Tuples arrive through<v:newlineChar/><tspan
+ x="0" dy="1.2em" class="st7"> the Left Input</tspan></text> </g>
+ </g>
+ <g id="group16-22" transform="translate(450.011,-499.618)" v:mID="16" v:groupContext="group">
+ <v:userDefs>
+ <v:ud v:nameU="Margin" v:val="VT0(0.11811023622047):24"/>
+ <v:ud v:nameU="AntiScale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="Scale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <title>Note box deco.16</title>
+ <g id="shape17-23" v:mID="17" v:groupContext="shape">
+ <title>Sheet.17</title>
+ <v:userDefs>
+ <v:ud v:nameU="Margin" v:val="VT0(0.11811023622047):24"/>
+ </v:userDefs>
+ <path d="M0 551.36 L102.05 551.36 L102.05 500.34 L0 500.34 L0 551.36 Z M-4.25 508.84 L-4.25 517.35 L4.25 517.35 L4.25
+ 508.84 L-4.25 508.84 Z M-4.25 521.6 L-4.25 530.1 L4.25 530.1 L4.25 521.6 L-4.25 521.6 Z M-4.25 534.35
+ L-4.25 542.86 L4.25 542.86 L4.25 534.35 L-4.25 534.35 Z" class="st2"/>
+ </g>
+ <g id="shape18-26" v:mID="18" v:groupContext="shape" transform="translate(11.8643,-30.3679)">
+ <title>Sheet.18</title>
+ <desc>Right Input</desc>
+ <v:textBlock v:margins="rect(2,0,0,0)" v:tabSpace="42.5197" v:verticalAlign="2"/>
+ <v:textRect cx="50.6162" cy="543.159" width="62.13" height="16.4037"/>
+ <path d="M0 551.36 L81.68 551.36" class="st3"/>
+ <text x="23.67" y="547.76" class="st4" v:langID="1046"><v:paragraph v:horizAlign="2"/><v:tabList/>Right Input</text> </g>
+ <g id="shape19-30" v:mID="19" v:groupContext="shape" transform="translate(11.8643,-9.16442)">
+ <title>Sheet.19</title>
+ <desc>Objects arrive through the Right Input</desc>
+ <v:textBlock v:margins="rect(2,0,0,0)" v:tabSpace="42.5197" v:verticalAlign="0"/>
+ <v:textRect cx="40.8395" cy="540.759" width="81.68" height="21.2035"/>
+ <rect x="0" y="530.158" width="81.679" height="21.2035" class="st5"/>
+ <text x="-0" y="539.36" class="st6" v:langID="1046"><v:paragraph/><v:tabList/>Objects arrive through<v:newlineChar/><tspan
+ x="-0" dy="1.2em" class="st7">the Right Input</tspan></text> </g>
+ </g>
+ <g id="group20-34" transform="translate(226.074,-0.72)" v:mID="20" v:groupContext="group">
+ <v:userDefs>
+ <v:ud v:nameU="Margin" v:val="VT0(0.11811023622047):24"/>
+ <v:ud v:nameU="AntiScale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="Scale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <title>Note box deco.20</title>
+ <g id="shape21-35" v:mID="21" v:groupContext="shape">
+ <title>Sheet.21</title>
+ <v:userDefs>
+ <v:ud v:nameU="Margin" v:val="VT0(0.11811023622047):24"/>
+ </v:userDefs>
+ <path d="M0 551.36 L102.05 551.36 L102.05 500.34 L0 500.34 L0 551.36 Z M-4.25 508.84 L-4.25 517.35 L4.25 517.35 L4.25
+ 508.84 L-4.25 508.84 Z M-4.25 521.6 L-4.25 530.1 L4.25 530.1 L4.25 521.6 L-4.25 521.6 Z M-4.25 534.35
+ L-4.25 542.86 L4.25 542.86 L4.25 534.35 L-4.25 534.35 Z" class="st2"/>
+ </g>
+ <g id="shape22-38" v:mID="22" v:groupContext="shape" transform="translate(19.8646,-30.3679)">
+ <title>Sheet.22</title>
+ <desc>Output</desc>
+ <v:textBlock v:margins="rect(2,0,0,0)" v:tabSpace="42.5197" v:verticalAlign="2"/>
+ <v:textRect cx="53.623" cy="543.159" width="40.12" height="16.4037"/>
+ <path d="M0 551.36 L73.68 551.36" class="st3"/>
+ <text x="37.64" y="547.76" class="st4" v:langID="1046"><v:paragraph v:horizAlign="2"/><v:tabList/>Output</text> </g>
+ <g id="shape23-42" v:mID="23" v:groupContext="shape" transform="translate(19.8646,-9.16442)">
+ <title>Sheet.23</title>
+ <desc>Matched Tuples are propagated</desc>
+ <v:textBlock v:margins="rect(2,0,0,0)" v:tabSpace="42.5197" v:verticalAlign="0"/>
+ <v:textRect cx="36.8394" cy="540.759" width="73.68" height="21.2035"/>
+ <rect x="0" y="530.158" width="73.6787" height="21.2035" class="st5"/>
+ <text x="0" y="539.36" class="st6" v:langID="1046"><v:paragraph/><v:tabList/>Matched Tuples are<v:newlineChar/><tspan
+ x="0" dy="1.2em" class="st7">propagated</tspan></text> </g>
+ </g>
+ <g id="group5-46" transform="translate(104.185,-425.917)" v:mID="5" v:groupContext="group">
+ <v:custProps>
+ <v:cp v:nameU="Theme" v:lbl="Tema" v:prompt="O tema somente desta forma." v:type="1"
+ v:format="Clássico;Contemporâneo;Elegante;Bloco de notas;Retro" v:langID="1046" v:val="VT4(Clássico)"/>
+ </v:custProps>
+ <v:userDefs>
+ <v:ud v:nameU="Theme" v:val="VT0(0):26"/>
+ <v:ud v:nameU="Margin" v:val="VT0(0.059055118110236):24"/>
+ <v:ud v:nameU="AntiScale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="Scale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <title>Title block classic</title>
+ <g id="shape6-47" v:mID="6" v:groupContext="shape" transform="translate(92.772,-7.50996)">
+ <title>Sheet.6</title>
+ <desc>Beta Node</desc>
+ <v:textBlock v:margins="rect(0,0,0,0)"/>
+ <v:textRect cx="78.7241" cy="533.359" width="157.45" height="36.0037"/>
+ <rect x="0" y="515.358" width="157.448" height="36.0037" class="st5"/>
+ <text x="4.55" y="542.36" class="st8" v:langID="1046"><v:paragraph v:horizAlign="1"/><v:tabList/>Beta Node</text> </g>
+ </g>
+ <g id="group24-50" transform="translate(152.374,-346.547)" v:mID="24" v:groupContext="group">
+ <v:userDefs>
+ <v:ud v:nameU="Margin" v:val="VT0(0.11811023622047):24"/>
+ <v:ud v:nameU="AntiScale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="Scale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <title>Note box classic</title>
+ <g id="shape25-51" v:mID="25" v:groupContext="shape">
+ <title>Sheet.25</title>
+ <rect x="0" y="483.33" width="102.047" height="68.0315" class="st9"/>
+ </g>
+ <g id="shape26-55" v:mID="26" v:groupContext="shape" transform="translate(8.50394,-59.5276)">
+ <title>Sheet.26</title>
+ <path d="M0 551.36 L17.01 551.36" class="st3"/>
+ </g>
+ <g id="shape27-58" v:mID="27" v:groupContext="shape" transform="translate(8.50394,-8.50394)">
+ <title>Sheet.27</title>
+ <path d="M0 551.36 L51.02 551.36" class="st3"/>
+ </g>
+ <g id="shape28-61" v:mID="28" v:groupContext="shape" transform="translate(59.5276,-8.50394)">
+ <title>Sheet.28</title>
+ <path d="M0 551.36 L34.02 551.36" class="st10"/>
+ </g>
+ <g id="shape29-64" v:mID="29" v:groupContext="shape" transform="translate(8.50394,-8.50394)">
+ <title>Sheet.29</title>
+ <desc>LEFT Memory: Stores all tuples asserted</desc>
+ <v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="0"/>
+ <v:textRect cx="35.058" cy="518.739" width="70.12" height="36.8035"/>
+ <path d="M0 551.36 L0 500.34" class="st10"/>
+ <text x="4" y="511.54" class="st6" v:langID="1046"><v:paragraph/><v:tabList/>LEFT Memory:<v:newlineChar/><tspan
+ x="4" dy="1.2em" class="st7">Stores all tuples <v:newlineChar/></tspan><tspan x="4" dy="1.2em"
+ class="st7">asserted</tspan></text> </g>
+ </g>
+ <g id="group30-70" transform="translate(311.114,-346.547)" v:mID="30" v:groupContext="group">
+ <v:userDefs>
+ <v:ud v:nameU="Margin" v:val="VT0(0.11811023622047):24"/>
+ <v:ud v:nameU="AntiScale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="Scale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <title>Note box classic.30</title>
+ <g id="shape31-71" v:mID="31" v:groupContext="shape">
+ <title>Sheet.31</title>
+ <rect x="0" y="483.33" width="85.0394" height="68.0315" class="st9"/>
+ </g>
+ <g id="shape32-74" v:mID="32" v:groupContext="shape" transform="translate(8.50394,-59.5276)">
+ <title>Sheet.32</title>
+ <path d="M0 551.36 L17.01 551.36" class="st3"/>
+ </g>
+ <g id="shape33-77" v:mID="33" v:groupContext="shape" transform="translate(8.50394,-8.50394)">
+ <title>Sheet.33</title>
+ <path d="M0 551.36 L34.02 551.36" class="st3"/>
+ </g>
+ <g id="shape34-80" v:mID="34" v:groupContext="shape" transform="translate(42.5197,-8.50394)">
+ <title>Sheet.34</title>
+ <path d="M0 551.36 L34.02 551.36" class="st10"/>
+ </g>
+ <g id="shape35-83" v:mID="35" v:groupContext="shape" transform="translate(8.50394,-8.50394)">
+ <title>Sheet.35</title>
+ <desc>RIGHT Memory: Stores all objects asserted</desc>
+ <v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="0"/>
+ <v:textRect cx="37.058" cy="518.739" width="74.12" height="36.8035"/>
+ <path d="M0 551.36 L0 500.34" class="st10"/>
+ <text x="4" y="511.54" class="st6" v:langID="1046"><v:paragraph/><v:tabList/>RIGHT Memory:<v:newlineChar/><tspan
+ x="4" dy="1.2em" class="st7">Stores all objects <v:newlineChar/></tspan><tspan x="4" dy="1.2em"
+ class="st7">asserted</tspan></text> </g>
+ </g>
+ <g id="shape36-89" v:mID="36" v:groupContext="shape" transform="translate(231.566,790.191) scale(1,-1)">
+ <title>Pentagon</title>
+ <desc>Constraints</desc>
+ <v:userDefs>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
+ <v:textRect cx="46.8602" cy="511.676" width="93.73" height="79.3701"/>
+ <path d="M46.86 471.99 L-2.41 502.31 L16.41 551.36 L77.31 551.36 L96.13 502.31 L46.86 471.99 Z" class="st11"/>
+ <text x="13.51" y="-508.08" transform="scale(1,-1)" class="st12" v:langID="1046"><v:paragraph v:horizAlign="1"/><v:tabList/>Constraints</text> </g>
+ <g id="shape37-92" v:mID="37" v:groupContext="shape" v:layerMember="0" transform="translate(197.728,-346.547)">
+ <title>Elbow 2</title>
+ <v:userDefs>
+ <v:ud v:nameU="Scale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="AntiScale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <v:textBlock v:margins="rect(0,0,0,0)" v:tabSpace="42.5197"/>
+ <path d="M5.1 551.36 L5.1 602.81 L33.1 602.81 L33.1 599.41 L41.6 607.92 L33.1 616.42 L33.1 613.02 L-5.1 613.02 L-5.1
+ 551.36 L5.1 551.36 Z" class="st13"/>
+ <path d="M5.1 551.36 L5.1 602.81 L33.1 602.81 L33.1 599.41 L41.6 607.92 L33.1 616.42 L33.1 613.02 L-5.1 613.02 L-5.1
+ 551.36" class="st3"/>
+ </g>
+ <g id="shape38-95" v:mID="38" v:groupContext="shape" v:layerMember="0" transform="translate(359.057,-346.725)">
+ <title>Elbow 2.38</title>
+ <v:userDefs>
+ <v:ud v:nameU="Scale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="AntiScale" v:val="VT0(1):26"/>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <v:textBlock v:margins="rect(0,0,0,0)" v:tabSpace="42.5197"/>
+ <path d="M-5.1 551.36 L-5.1 602.81 L-33.1 602.81 L-33.1 599.41 L-41.6 607.92 L-33.1 616.42 L-33.1 613.02 L5.1 613.02
+ L5.1 551.36 L-5.1 551.36 Z" class="st13"/>
+ <path d="M-5.1 551.36 L-5.1 602.81 L-33.1 602.81 L-33.1 599.41 L-41.6 607.92 L-33.1 616.42 L-33.1 613.02 L5.1 613.02
+ L5.1 551.36" class="st3"/>
+ </g>
+ <g id="shape39-98" v:mID="39" v:groupContext="shape" transform="translate(-260.733,394.847) rotate(-89.1048)">
+ <title>45 degree single.39</title>
+ <v:userDefs>
+ <v:ud v:nameU="visVersion" v:val="VT0(10):26"/>
+ </v:userDefs>
+ <path d="M0 537.19 L14.17 523.01 L14.17 532.37 L85.05 532.37 L85.05 542.01 L14.17 542.01 L14.17 551.36 L0 537.19 Z"
+ class="st1"/>
+ </g>
+ </g>
+</svg>
|
|
From: <jbo...@li...> - 2006-05-08 19:58:19
|
Author: wrzep Date: 2006-05-08 15:57:07 -0400 (Mon, 08 May 2006) New Revision: 4141 Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos/to-copy/kosmos-portlet.war Log: JBLAB-643 Pawel Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos/to-copy/kosmos-portlet.war =================================================================== (Binary files differ) |
|
From: <jbo...@li...> - 2006-05-08 16:55:12
|
Author: wrzep
Date: 2006-05-08 12:55:05 -0400 (Mon, 08 May 2006)
New Revision: 4140
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-kosmos/conf/portlet/portlet.xml
Log:
JBLAB-643
Updated repo locations for kosmos.
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos/conf/portlet/portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos/conf/portlet/portlet.xml 2006-05-08 15:51:11 UTC (rev 4139)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos/conf/portlet/portlet.xml 2006-05-08 16:55:05 UTC (rev 4140)
@@ -77,14 +77,13 @@
<init-param>
<name>monitored.urls</name>
<value>
- http://anonsvn.labs.jboss.com/trunk/labs/demo/,
- http://anonsvn.labs.jboss.com/trunk/labs/jbossprofiler/,
- http://anonsvn.labs.jboss.com/trunk/labs/jbossweb/,
- http://anonsvn.labs.jboss.com/trunk/labs/jrunit/,
- http://anonsvn.labs.jboss.com/trunk/labs/kosmos/,
- http://anonsvn.labs.jboss.com/trunk/labs/portletswap/,
- http://anonsvn.labs.jboss.com/trunk/labs/reportingservices/,
- http://anonsvn.labs.jboss.com/trunk/forge/portal-extensions/
+ http://anonsvn.jboss.org/repos/jbossws/trunk/,
+ http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/,
+ http://anonsvn.labs.jboss.com/labs/kosmos/trunk/,
+ http://anonsvn.labs.jboss.com/labs/portletswap/,
+ http://anonsvn.labs.jboss.com/labs/reportingservices/trunk/,
+ http://anonsvn.labs.jboss.com/labs/jbosslabs/trunk/,
+ http://anonsvn.labs.jboss.com/labs/shotoku/trunk/
</value>
</init-param>
<supports>
|
|
From: <jbo...@li...> - 2006-05-08 15:05:15
|
Author: wrzep
Date: 2006-05-08 11:05:06 -0400 (Mon, 08 May 2006)
New Revision: 4138
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-kosmos/project.xml
Log:
JBLAB-643
fixes for new kosmos
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml 2006-05-08 14:55:14 UTC (rev 4137)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml 2006-05-08 15:05:06 UTC (rev 4138)
@@ -50,5 +50,9 @@
<ant:filename name="kosmos*/**" />
</ant:fileset>
</ant:copy>
+
+ <ant:copy todir="${local.deploy.dir}"
+ file="${maven.repo.local}/com.lowagie/jars/itext-1.4.jar"
+ overwrite="true" />
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos/project.xml 2006-05-08 14:55:14 UTC (rev 4137)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos/project.xml 2006-05-08 15:05:06 UTC (rev 4138)
@@ -12,19 +12,30 @@
<dependencies>
<dependency>
- <groupId>jboss-forge</groupId>
- <artifactId>forge-common</artifactId>
- <version>1.0</version>
+ <groupId>jboss-forge</groupId>
+ <artifactId>forge-common</artifactId>
+ <version>1.0</version>
</dependency>
+
+ <dependency>
+ <groupId>quartz</groupId>
+ <artifactId>quartz</artifactId>
+ <version>1.5.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ <version>1.4</version>
+ </dependency>
-
- <dependency>
- <groupId>kosmos</groupId>
- <artifactId>kosmos-server</artifactId>
- <version>1.0</version>
- <jar>kosmos-server.jar</jar>
- </dependency>
-
+ <dependency>
+ <groupId>kosmos</groupId>
+ <artifactId>kosmos-server</artifactId>
+ <version>1.0</version>
+ <jar>kosmos-server.jar</jar>
+ </dependency>
+
</dependencies>
<build>
|
Author: adamw Date: 2006-05-08 10:55:14 -0400 (Mon, 08 May 2006) New Revision: 4137 Added: labs/shotoku/trunk/shotoku-feeds/lib/informa.jar labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml Removed: labs/shotoku/trunk/shotoku-feeds/forge-feeds.iml labs/shotoku/trunk/shotoku-feeds/lib/informa/ Modified: labs/shotoku/trunk/shotoku-feeds/maven.xml labs/shotoku/trunk/shotoku-feeds/project.properties labs/shotoku/trunk/shotoku-feeds/project.xml labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/embedded/TomekTest.java Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-36 Deleted: labs/shotoku/trunk/shotoku-feeds/forge-feeds.iml =================================================================== --- labs/shotoku/trunk/shotoku-feeds/forge-feeds.iml 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/forge-feeds.iml 2006-05-08 14:55:14 UTC (rev 4137) @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> - <output url="file://$MODULE_DIR$/target" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> - </content> - <orderEntry type="inheritedJdk" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" name="jboss" level="application" /> - <orderEntry type="module" module-name="forge-common" /> - <orderEntry type="module" module-name="shotoku-base" /> - <orderEntry type="module" module-name="shotoku-aop" /> - <orderEntry type="library" name="feeds" level="application" /> - <orderEntry type="library" name="velocity" level="application" /> - <orderEntry type="library" name="commons" level="application" /> - <orderEntryProperties /> - </component> -</module> - Added: labs/shotoku/trunk/shotoku-feeds/lib/informa.jar =================================================================== (Binary files differ) Property changes on: labs/shotoku/trunk/shotoku-feeds/lib/informa.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: labs/shotoku/trunk/shotoku-feeds/maven.xml =================================================================== --- labs/shotoku/trunk/shotoku-feeds/maven.xml 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/maven.xml 2006-05-08 14:55:14 UTC (rev 4137) @@ -6,7 +6,6 @@ <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util"> <!-- Default war-project goals --> - <goal name="build"> <attainGoal name="war" /> </goal> @@ -20,6 +19,7 @@ <goal name="clean"> <attainGoal name="prj-clean" /> </goal> + <goal name="all"> <attainGoal name="clean" /> <attainGoal name="build" /> Modified: labs/shotoku/trunk/shotoku-feeds/project.properties =================================================================== --- labs/shotoku/trunk/shotoku-feeds/project.properties 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/project.properties 2006-05-08 14:55:14 UTC (rev 4137) @@ -1,4 +1,7 @@ maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ maven.junit.fork=yes maven.war.src=${basedir}/src/web -maven.jar.informa=lib/informa/jars/informa-0.6.0.jar + +maven.jar.override=on +maven.jar.informa=${shotoku.root.dir}/shotoku-feeds/lib/informa.jar + Modified: labs/shotoku/trunk/shotoku-feeds/project.xml =================================================================== --- labs/shotoku/trunk/shotoku-feeds/project.xml 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/project.xml 2006-05-08 14:55:14 UTC (rev 4137) @@ -15,99 +15,92 @@ <url>http://damon.sicore.org</url> </organization> <description></description> - + <dependencies> - <dependency> - <groupId>shotoku</groupId> - <artifactId>shotoku-base</artifactId> - <jar>shotoku-base.jar</jar> - </dependency> + <dependency> + <groupId>shotoku</groupId> + <artifactId>shotoku-base</artifactId> + <jar>shotoku-base.jar</jar> + </dependency> - <dependency> - <groupId>shotoku</groupId> - <artifactId>shotoku-base</artifactId> - <jar>shotoku-base.jar</jar> - </dependency> - - <dependency> - <groupId>aslibs</groupId> - <artifactId>javax.servlet</artifactId> - <version>1.0</version> - <jar>javax.servlet.jar</jar> - </dependency> - - <dependency> - <id>jdom</id> - <version>1.0</version> - </dependency> - - <dependency> - <id>rome</id> - <version>0.7</version> - </dependency> - <dependency> - <groupId>informa</groupId> - <artifactId>informa</artifactId> - <version>0.6.5</version> - <jar>informa.jar</jar> - <properties> - <war.bundle>true</war.bundle> - </properties> - </dependency> + <groupId>javax.servlet</groupId> + <artifactId>javax.servlet</artifactId> + <jar>javax.servlet.jar</jar> + </dependency> <dependency> - <groupId>taglibs</groupId> - <artifactId>jstl</artifactId> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> <version>1.0</version> - <jar>jstl.jar</jar> <properties> <war.bundle>true</war.bundle> </properties> </dependency> <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.0</version> - <jar>standard.jar</jar> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>0.8</version> <properties> <war.bundle>true</war.bundle> </properties> - </dependency> - - <dependency> + </dependency> + + <dependency> + <groupId>informa</groupId> + <artifactId>informa</artifactId> + <version>0.6.5</version> + <jar>informa.jar</jar> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> + + <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.1</version> <properties> <war.bundle>true</war.bundle> </properties> - </dependency> - + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - <version>2.6.2</version> + <version>2.8.0</version> + <properties> + <war.bundle>true</war.bundle> + </properties> </dependency> <dependency> <groupId>xerces</groupId> <artifactId>xmlParserAPIs</artifactId> - <version>2.6.2</version> + <version>2.8.0</version> + <properties> + <war.bundle>true</war.bundle> + </properties> </dependency> - - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.6.0</version> - </dependency> + + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + <properties> + <war.bundle>true</war.bundle> + </properties> + </dependency> </dependencies> - <build> + <build> <sourceDirectory>src/java</sourceDirectory> <resources> <resource> <directory>src/etc/</directory> - <include>**/*.xml</include></resource></resources></build> + <include>**/*.xml</include> + </resource> + </resources> + </build> </project> Added: labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml =================================================================== --- labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/shotoku-feeds.iml 2006-05-08 14:55:14 UTC (rev 4137) @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager"> + <output url="file://$MODULE_DIR$/target" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="shotoku" /> + <orderEntry type="module" module-name="shotoku-aop" /> + <orderEntry type="module" module-name="shotoku-base" /> + <orderEntry type="library" name="feeds" level="application" /> + <orderEntry type="library" name="jboss" level="application" /> + <orderEntry type="library" name="commons" level="application" /> + <orderEntry type="library" name="velocity" level="application" /> + <orderEntryProperties /> + </component> +</module> + Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsCache.java 2006-05-08 14:55:14 UTC (rev 4137) @@ -25,8 +25,8 @@ import org.jboss.shotoku.cache.ShotokuCacheItem; public class FeedsCache extends ShotokuCacheItem<Pair<String, String>, FeedsDescriptor> { - private FeedsDescriptor getDesc(String baseServerAddress) { - return new FeedsDescriptor(baseServerAddress); + private FeedsDescriptor getDesc(String id, String baseServerAddress) { + return new FeedsDescriptor(id, baseServerAddress); } public void update(Pair<String, String> key, FeedsDescriptor currentObject) { Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/FeedsDescriptor.java 2006-05-08 14:55:14 UTC (rev 4137) @@ -133,7 +133,7 @@ private String baseServerAddress; - public FeedsDescriptor(String baseServerAddress) { + public FeedsDescriptor(String id, String baseServerAddress) { this.baseServerAddress = baseServerAddress; String feedsBaseDir = ContentManager.getProperty(FEEDS_BASEDIR); Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java =================================================================== --- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/InformaBasedFeed.java 2006-05-08 14:55:14 UTC (rev 4137) @@ -46,12 +46,12 @@ } catch (ParseException e) { throw new IOException(e.getMessage()); } - - for (Iterator iter = childChannel.getItems().iterator(); iter.hasNext();) { - ItemIF nextItem = (ItemIF) iter.next(); - nextItem.setCreator(childChannel.getCreator()); - newItems.add(nextItem); - } + + for (Object o : childChannel.getItems()) { + ItemIF nextItem = (ItemIF) o; + nextItem.setCreator(childChannel.getCreator()); + newItems.add(nextItem); + } } Collections.sort(newItems, new ItemComparator(true)); Modified: labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/embedded/TomekTest.java =================================================================== --- labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/embedded/TomekTest.java 2006-05-08 14:38:34 UTC (rev 4136) +++ labs/shotoku/trunk/shotoku-test/src/java/org/jboss/shotoku/test/embedded/TomekTest.java 2006-05-08 14:55:14 UTC (rev 4137) @@ -16,13 +16,14 @@ return ret; } + public static void x(int[] a) { + a[2] = 10; + } + public static void main(String[] args) { - String[] t = "v".split("v", -1); - System.out.println("T content:"); - for (String x : t) { - System.out.println(x); - } - - System.out.println("---"); + int[] t = {1, 2, 3}; + System.out.println(t[2]); + x(t); + System.out.println(t[2]); } } |
|
From: <jbo...@li...> - 2006-05-08 14:38:40
|
Author: aron.gombas Date: 2006-05-08 10:38:34 -0400 (Mon, 08 May 2006) New Revision: 4136 Modified: labs/kosmos/trunk/web-server/WEB-INF/kosmos-services-servlet.xml Log: Sample config for CRON scheduler Modified: labs/kosmos/trunk/web-server/WEB-INF/kosmos-services-servlet.xml =================================================================== --- labs/kosmos/trunk/web-server/WEB-INF/kosmos-services-servlet.xml 2006-05-08 14:38:11 UTC (rev 4135) +++ labs/kosmos/trunk/web-server/WEB-INF/kosmos-services-servlet.xml 2006-05-08 14:38:34 UTC (rev 4136) @@ -141,7 +141,16 @@ <property name="startDelay" value="7200000"/><!-- start and repeat in every 2 hours --> <property name="repeatInterval" value="7200000"/> </bean> + <!-- + Alternatively, a cron-style trigger can be used. + For this, remove the previous bean definition and use this one: + <bean id="serviceResultUpdateTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean"> + <property name="jobDetail" ref="serviceResultUpdaterJob"/> + <property name="cronExpression" value="0 0 6 * * ?"/> + </bean> + --> + <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> <property name="triggers"> <list> @@ -155,9 +164,11 @@ <property name="webdavUrl" value="http://localhost:8080/slide/files"/><!-- Both HTTP and HTTPS protocol can be used here. --> <property name="webdavUser" value=""/> <property name="webdavPassword" value=""/> - <!-- This URL will be used as base URL for the generated images. - If you don't specify anything here, the value of "webdavUrl" - will be used. Uncomment this, if you want to override that. + <!-- + This URL will be used as base URL for the generated images. + If you don't specify anything here, the value of "webdavUrl" + will be used. Uncomment this, if you want to override that. + <property name="clientUrl" value="http://myserver/my-webdav/kosmos-images"/> --> </bean> |
|
From: <jbo...@li...> - 2006-05-08 14:38:17
|
Author: aron.gombas
Date: 2006-05-08 10:38:11 -0400 (Mon, 08 May 2006)
New Revision: 4135
Modified:
labs/kosmos/trunk/build/build.xml
Log:
"de" resources are packaged
Modified: labs/kosmos/trunk/build/build.xml
===================================================================
--- labs/kosmos/trunk/build/build.xml 2006-05-08 14:37:26 UTC (rev 4134)
+++ labs/kosmos/trunk/build/build.xml 2006-05-08 14:38:11 UTC (rev 4135)
@@ -73,6 +73,8 @@
<!-- convert resource files -->
<native2ascii encoding="ISO-8859-1" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring.properties"/>
<native2ascii encoding="ISO-8859-1" src="${taglib.i18n.dir}" dest="${dist-bin.classes.dir}" includes="**/kosmos-taglib.properties"/>
+ <native2ascii encoding="ISO-8859-1" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring_de.properties"/>
+ <native2ascii encoding="ISO-8859-1" src="${taglib.i18n.dir}" dest="${dist-bin.classes.dir}" includes="**/kosmos-taglib_de.properties"/>
<native2ascii encoding="ISO-8859-1" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring_fr.properties"/>
<native2ascii encoding="ISO-8859-1" src="${taglib.i18n.dir}" dest="${dist-bin.classes.dir}" includes="**/kosmos-taglib_fr.properties"/>
<native2ascii encoding="ISO-8859-2" src="${i18n.dir}" dest="${dist-bin.classes.dir}/hu/midori/kosmos/${module.name}" includes="**/*monitoring_hu.properties"/>
|
|
From: <jbo...@li...> - 2006-05-08 14:37:37
|
Author: aron.gombas Date: 2006-05-08 10:37:26 -0400 (Mon, 08 May 2006) New Revision: 4134 Modified: labs/kosmos/trunk/xdocs/reference/reference-manual.xml Log: Doc about the scheduler added Modified: labs/kosmos/trunk/xdocs/reference/reference-manual.xml =================================================================== --- labs/kosmos/trunk/xdocs/reference/reference-manual.xml 2006-05-08 12:42:52 UTC (rev 4133) +++ labs/kosmos/trunk/xdocs/reference/reference-manual.xml 2006-05-08 14:37:26 UTC (rev 4134) @@ -1391,8 +1391,39 @@ </listitem> <listitem> + <para> + The trigger for the update scheduler can be configured as a standard + Spring trigger bean, either a simple one or a cron-style one: +<programlisting> +<bean id="serviceResultUpdateTrigger" class="org.springframework.scheduling.quartz.SimpleTriggerBean"> + <property name="jobDetail" ref="serviceResultUpdaterJob"/> + <property name="startDelay" value="7200000"/><!-- start and repeat in every 2 hours --> + <property name="repeatInterval" value="7200000"/> +</bean> +<!-- + Alternatively, a cron-style trigger can be used. + For this, remove the previous bean definition and use this one: + <bean id="serviceResultUpdateTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean"> + <property name="jobDetail" ref="serviceResultUpdaterJob"/> + <property name="cronExpression" value="0 0 6 * * ?"/> + </bean> +--> +</programlisting> + All the information delivered by the services will be automatically refreshed in the given time. + For example, you can schedule a very expensive Subversion repository traversal at 2 o'clock in the morning every day, so the portal will reflect up-to-date results by the time you get to your browser. + </para> <para> + See the + <ulink url="http://static.springframework.org/spring/docs/2.0.x/reference/scheduling.html#d0e19434">Spring Framework documentation: + Wiring up jobs using triggers and the SchedulerFactoryBean</ulink> + for more examples. + </para> + </listitem> + + <listitem> + + <para> It's possible (and relatively easy) to do more complicated changes (like using separate or even inhomogenous cache stores per service, using more than one instance of the @@ -1827,7 +1858,7 @@ <para>There is another useful, infrastructure layer mechanism to achieve performance improvement: scheduled updates. Configuring the update trigger - in the <literal>kosmos-services-servlet.xml</literal>, you can schedule + in <literal>kosmos-services-servlet.xml</literal>, you can schedule automatic service reloads at given periods or times. For example, you can schedule a very expensive Subversion repository traversal at 2 o'clock in the morning every day, so the portal will reflect |
|
From: <jbo...@li...> - 2006-05-08 12:42:59
|
Author: tirelli
Date: 2006-05-08 08:42:52 -0400 (Mon, 08 May 2006)
New Revision: 4133
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BetaMemoryFactory.java
Log:
disabling beta node left index as default behavior
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BetaMemoryFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BetaMemoryFactory.java 2006-05-08 11:34:43 UTC (rev 4132)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BetaMemoryFactory.java 2006-05-08 12:42:52 UTC (rev 4133)
@@ -33,6 +33,7 @@
*/
public class BetaMemoryFactory {
private static final String INDEX_DISABLED = "false";
+ private static final String INDEX_ENABLED = "true";
public static final String INDEX_LEFT_BETA_MEMORY = "org.drools.reteoo.beta.index-left";
public static final String INDEX_RIGHT_BETA_MEMORY = "org.drools.reteoo.beta.index-right";
@@ -53,7 +54,7 @@
BetaLeftMemory memory = null;
BetaLeftMemory innerMostMemory = null;
FieldConstraint[] constraints = (binder != null) ? binder.getConstraints() : null;
- if ( (constraints != null) && (!INDEX_DISABLED.equalsIgnoreCase( System.getProperty( INDEX_LEFT_BETA_MEMORY ) )) ) {
+ if ( (constraints != null) && (INDEX_ENABLED.equalsIgnoreCase( System.getProperty( INDEX_LEFT_BETA_MEMORY ) )) ) {
for ( int i = 0; i < constraints.length; i++ ) {
if ( constraints[i] instanceof BoundVariableConstraint ) {
BoundVariableConstraint bvc = (BoundVariableConstraint) constraints[i];
|
|
From: <jbo...@li...> - 2006-05-08 11:34:46
|
Author: wrzep Date: 2006-05-08 07:34:43 -0400 (Mon, 08 May 2006) New Revision: 4132 Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml Log: JBLAB-643 Set kosmos updates every midnight (quartz cron). Pawel Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml 2006-05-08 10:11:54 UTC (rev 4131) +++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml 2006-05-08 11:34:43 UTC (rev 4132) @@ -98,10 +98,9 @@ </property> </bean> - <bean id="serviceResultUpdateTrigger" class="org.springframework.scheduling.quartz.SimpleTriggerBean"> + <bean id="serviceResultUpdateTrigger" class="org.springframework.scheduling.quartz.CronTriggerBean"> <property name="jobDetail" ref="serviceResultUpdaterJob"/> - <property name="startDelay" value="7200000"/><!-- start and repeat in every 2 hours --> - <property name="repeatInterval" value="7200000"/> + <property name="cronExpression" value="0 0 0 * * ?"/> <!-- update at midnight --> </bean> <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean"> |
|
From: <jbo...@li...> - 2006-05-08 10:11:57
|
Author: jfr...@jb... Date: 2006-05-08 06:11:54 -0400 (Mon, 08 May 2006) New Revision: 4131 Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh Log: Allow to build in a shared $HOME on different platforms. Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh =================================================================== --- labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-08 08:46:08 UTC (rev 4130) +++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh 2006-05-08 10:11:54 UTC (rev 4131) @@ -12,6 +12,10 @@ PHPVER=5.1.4 URL=http://de.php.net/distributions/php-${PHPVER}.tar.gz +# Platfrom directory and cache +TOOLS=$HOME/`uname -s`_`uname -p`_tools +CACHE=`uname -s`_`uname -p`_cache + # # depending on machine remove or add php extensions. case `uname -n` in @@ -66,7 +70,8 @@ echo "Adding to default configuration:: ${ADDCONF}" (cd php-${PHPVER} - ./configure --prefix=$HOME/PHP \ + ./configure --prefix=$TOOLS/PHP \ + --cache-file=$CACHE \ --with-tsrm-pthreads --enable-shared \ --enable-embed=shared \ --with-kerberos \ @@ -108,7 +113,17 @@ echo "Configure failed" exit 1 fi + (cd php-${PHPVER} +make clean +) +if [ $? -ne 0 ] +then + echo "Make clean failed" + exit 1 +fi + +(cd php-${PHPVER} make ) if [ $? -ne 0 ] @@ -116,6 +131,7 @@ echo "Make failed" exit 1 fi + (cd php-${PHPVER} make install ) @@ -132,11 +148,11 @@ # (cd ../php5servlet - gcc -c -I $HOME/PHP/include/php/main \ - -I $HOME/PHP/include/php/Zend \ - -I $HOME/PHP/include/php/TSRM \ - -I $HOME/PHP/include/php \ + gcc -c -I $TOOLS/PHP/include/php/main \ + -I $TOOLS/PHP/include/php/Zend \ + -I $TOOLS/PHP/include/php/TSRM \ + -I $TOOLS/PHP/include/php \ -DZTS -DPTHREADS \ php5servlet.c - ld -G -o libphp5servlet.so php5servlet.o -L $HOME/PHP/lib -lphp5 + ld -G -o libphp5servlet.so php5servlet.o -L $TOOLS/PHP/lib -lphp5 ) |
|
From: <jbo...@li...> - 2006-05-08 08:46:13
|
Author: mla...@jb... Date: 2006-05-08 04:46:08 -0400 (Mon, 08 May 2006) New Revision: 4130 Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat Log: Remove mt tasks. Since 0.9.8b they are part of origin build. Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat 2006-05-08 07:26:39 UTC (rev 4129) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat 2006-05-08 08:46:08 UTC (rev 4130) @@ -12,24 +12,17 @@ REM REM call vsvars32 REM - @if "%OS%" == "Windows_NT" setlocal @set PATH=%CD%;%PATH% perl Configure VC-NT call ms\do_nt -@if "%1" == "dll" goto doDLL -goto doLIB - -:doDLL +@if "%1" == "dll" goto DLL +@goto LIB +:DLL nmake -f ms\ntdll.mak -mt -nologo -manifest out32dll\libeay32.dll.manifest -outputresource:out32dll\libeay32.dll;2 -mt -nologo -manifest out32dll\ssleay32.dll.manifest -outputresource:out32dll\ssleay32.dll;2 -mt -nologo -manifest out32dll\openssl.exe.manifest -outputresource:out32dll\openssl.exe;1 -goto doEND - -:doLIB +@goto END +:LIB nmake -f ms\nt.mak - -:doEND +:END Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat 2006-05-08 07:26:39 UTC (rev 4129) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd.bat 2006-05-08 08:46:08 UTC (rev 4130) @@ -18,18 +18,11 @@ perl Configure VC-WIN64A call ms\do_win64a - -@if "%1" == "dll" goto doDLL -goto doLIB - -:doDLL +@if "%1" == "dll" goto DLL +@goto LIB +:DLL nmake -f ms\ntdll.mak -mt -nologo -manifest out32dll\libeay32.dll.manifest -outputresource:out32dll\libeay32.dll;2 -mt -nologo -manifest out32dll\ssleay32.dll.manifest -outputresource:out32dll\ssleay32.dll;2 -mt -nologo -manifest out32dll\openssl.exe.manifest -outputresource:out32dll\openssl.exe;1 -goto doEND - -:doLIB +@goto END +:LIB nmake -f ms\nt.mak - -:doEND +:END Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat =================================================================== --- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat 2006-05-08 07:26:39 UTC (rev 4129) +++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat 2006-05-08 08:46:08 UTC (rev 4130) @@ -18,17 +18,11 @@ perl Configure VC-NT call ms\do_masm -@if "%1" == "dll" goto doDLL -goto doLIB - -:doDLL +@if "%1" == "dll" goto DLL +@goto LIB +:DLL nmake -f ms\ntdll.mak -mt -nologo -manifest out32dll\libeay32.dll.manifest -outputresource:out32dll\libeay32.dll;2 -mt -nologo -manifest out32dll\ssleay32.dll.manifest -outputresource:out32dll\ssleay32.dll;2 -mt -nologo -manifest out32dll\openssl.exe.manifest -outputresource:out32dll\openssl.exe;1 -goto doEND - -:doLIB +@goto END +:LIB nmake -f ms\nt.mak - -:doEND +:END |
|
From: <jbo...@li...> - 2006-05-08 07:26:43
|
Author: mla...@jb...
Date: 2006-05-08 03:26:39 -0400 (Mon, 08 May 2006)
New Revision: 4129
Modified:
labs/jbossweb/trunk/src/share/native/NMAKEmakefile
labs/jbossweb/trunk/src/share/native/build/buildprep.sh
labs/jbossweb/trunk/src/share/native/build/buildworld.sh
Log:
Update SSL version to 0.9.8b and add install target
for windows nmakefile.
Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile 2006-05-08 07:04:23 UTC (rev 4128)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile 2006-05-08 07:26:39 UTC (rev 4129)
@@ -48,14 +48,18 @@
INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES)
+APRVER = "1.2.7"
+SSLVER = "0.9.8b"
+ZIPVER = "1.2.3"
+
!IFNDEF WITH_APR
-WITH_APR = srclib/apr
+WITH_APR = srclib/apr-$(APRVER)
!ENDIF
!IFNDEF WITH_OPENSSL
-WITH_OPENSSL = srclib/openssl
+WITH_OPENSSL = srclib/openssl-$(SSLVER)
!ENDIF
!IFNDEF WITH_ZLIB
-WITH_ZLIB = srclib/zlib
+WITH_ZLIB = srclib/zlib-$(ZIPVER)
!ENDIF
INCLUDES = $(INCLUDES) -I$(WITH_APR)/include -I$(WITH_APR)/include/arch/win32 -I$(WITH_OPENSSL)/inc32 -I$(WITH_ZLIB)
@@ -125,3 +129,22 @@
clean:
@$(CLEANTARGET)
+
+!IFNDEF INSTALLDIR
+INSTALLDIR = ../native-builds/$(BUILDIR)
+!ENDIF
+
+!IFDEF STATIC
+install: all
+ @gmkdir -p $(INSTALLDIR
+ @cp -f -t $(INSTALLDIR) $(BUILDLIB)
+ @cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32/openssl.exe
+!ELSE
+install: all
+ @gmkdir -p $(INSTALLDIR)
+ @cp -f -t $(INSTALLDIR) $(BUILDLIB)
+ @cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/openssl.exe
+ @cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/libeay32.dll
+ @cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/ssleay32.dll
+ @cp -f -t $(INSTALLDIR) $(WITH_APR)/$(BUILDIR)/libapr-1.dll
+!ENDIF
Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildprep.sh 2006-05-08 07:04:23 UTC (rev 4128)
+++ labs/jbossweb/trunk/src/share/native/build/buildprep.sh 2006-05-08 07:26:39 UTC (rev 4129)
@@ -31,7 +31,7 @@
fi
APRVER="1.2.7"
-SSLVER="0.9.8a"
+SSLVER="0.9.8b"
# Prebuild
cd ${NATIVEDIST}
Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.sh 2006-05-08 07:04:23 UTC (rev 4128)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.sh 2006-05-08 07:26:39 UTC (rev 4129)
@@ -7,7 +7,7 @@
#
TEST=test
-SSLVER="0.9.8a"
+SSLVER="0.9.8b"
SSLNUM="0.9.8"
APRVER="1.2.7"
TCNATIVE_BASE=`pwd`
|
|
From: <jbo...@li...> - 2006-05-08 07:04:35
|
Author: mic...@jb...
Date: 2006-05-08 03:04:23 -0400 (Mon, 08 May 2006)
New Revision: 4128
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseFactory.java
Log:
static fix
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseFactory.java 2006-05-08 06:43:20 UTC (rev 4127)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseFactory.java 2006-05-08 07:04:23 UTC (rev 4128)
@@ -34,7 +34,7 @@
/** Create a new default rule base (RETEOO type engine) */
public static RuleBase newRuleBase() {
- return RuleBaseFactory.getInstance().newRuleBase( RuleBase.RETEOO );
+ return RuleBaseFactory.newRuleBase( RuleBase.RETEOO );
}
/** Create a new RuleBase of the appropriate type */
|
550 messages has been excluded from this view by a project administrator.
