turner 2003/07/01 10:49:26
Modified: . build.properties.sample build.xml
Added: src/share/org/apache/struts/validator/validwhen
ValidWhen.java ValidWhenLexer.java
ValidWhenParser.g ValidWhenParser.java
ValidWhenParserTokenTypes.java
ValidWhenParserTokenTypes.txt
Log:
Re-add validwhen validation removed for the 1.1 release.
NOTE: The nightly build machine is going to need to be
updated to have the required ANTLR support library
James
Revision Changes Path
1.43 +7 -1 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- build.properties.sample 29 Jun 2003 05:27:58 -0000 1.42
+++ build.properties.sample 1 Jul 2003 17:49:25 -0000 1.43
@@ -98,6 +98,12 @@
# going to execute the "deploy.catalina" target.
xerces.jar=${apache.home}/xerces-1_4_4/xerces.jar
+# The JAR file containing the ANTLR runtime support classes, needed for the
+# validwhen validator rule to work. You can get this file from:
+# http://www.antlr.org/
+antlr.jar = ../../..//antlr-2.7.1/antlr.jar
+
+
# Properties related to optional tasks
# ------------------------------------
1.112 +7 -0 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- build.xml 29 Jun 2003 05:25:32 -0000 1.111
+++ build.xml 1 Jul 2003 17:49:25 -0000 1.112
@@ -82,6 +82,10 @@
classes to compile against (currently,
either version 2.2 or 2.3 supported).
+ antlr.jar (required) The path to the ANTLR classes
+ to copy. Required for the validwhen
+ validator rule to parser it's args.
+
tomcat.home (optional). The path to the Tomcat 3.x
installation. This is required only when
executing the "deploy.tomcat" target.
@@ -204,6 +208,7 @@
<pathelement location="${jdbc20ext.jar}"/>
<pathelement location="${jsp.jar}"/>
<pathelement location="${servlet.jar}"/>
+ <pathelement location="${antlr.jar}"/>
<pathelement location="${xerces.jar}"/>
</path>
@@ -261,6 +266,8 @@
tofile="${build.home}/library/commons-validator.jar"/>
<copy file="${jakarta-oro.jar}"
tofile="${build.home}/library/jakarta-oro.jar"/>
+ <copy file="${antlr.jar}" failonerror="false"
+ tofile="${build.home}/library/antlr.jar"/>
<!-- Compile-time dependency only
<copy file="${jdbc20ext.jar}"
tofile="${build.home}/library/jdbc2_0-stdext.jar"/>
1.4 +0 -0
jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhen.java
1.3 +0 -0
jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenLexer.java
1.3 +0 -0
jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParser.g
1.5 +0 -0
jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParser.java
1.3 +0 -0
jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java
1.3 +0 -0
jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.txt
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
