craigmcc 2003/08/09 12:29:30
Modified: . build.xml
contrib/struts-el build.xml
contrib/struts-el/src/share/org/apache/strutsel/taglib/html
ELFormTag.java ELHtmlTag.java
ELJavascriptValidatorTag.java
contrib/struts-faces build.xml
contrib/struts-legacy build.xml
contrib/tag-doc build.xml
Log:
Correct loading order of properties files to go from most local (current
directory) to most global (${user.home}/build.properties). Since Ant
follows a "first definition wins" strategy, this makes the most sense
for our convention of allowing local overrides of global values. It also
means that I can now do an "ant dist" in the top level directory with only
one thing in my build.properties file (jdk.version=1.4), so this should fix
the nightly builds as well (verifying that is my next step).
Also fixed some compile errors in struts-el -- I don't know how that code
could have compiled for anyone. Could someone more familiar with that
library make sure I did the changes correctly?
Revision Changes Path
1.118 +5 -2 jakarta-struts/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/build.xml,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- build.xml 8 Aug 2003 06:00:55 -0000 1.117
+++ build.xml 9 Aug 2003 19:29:30 -0000 1.118
@@ -113,9 +113,9 @@
-->
<!-- Load local and user build preferences -->
- <property file="${user.home}/build.properties"/>
- <property file="../build.properties"/>
<property file="build.properties"/>
+ <property file="../build.properties"/>
+ <property file="${user.home}/build.properties"/>
<!-- Default values for unspecified properties -->
<property name="catalina.home" value="../jakarta-tomcat-4.0/build"/>
@@ -204,6 +204,9 @@
<!-- Web directory -->
<property name="web.dir" value="web"/>
+
+ <!-- Pointer to struts-legacy.jar -->
+ <property name="struts-legacy.jar"
value="${basedir}/contrib/struts-legacy/dist/struts-legacy.jar"/>
<!-- Compilation Classpath -->
<path id="compile.classpath">
1.17 +4 -4 jakarta-struts/contrib/struts-el/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-el/build.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.xml 13 Jun 2003 03:22:14 -0000 1.16
+++ build.xml 9 Aug 2003 19:29:30 -0000 1.17
@@ -51,10 +51,10 @@
-->
<!-- Load local and user build preferences -->
- <property file="${user.home}/build.properties"/>
- <property file="../../../build.properties"/>
- <property file="../../build.properties"/>
<property file="build.properties"/>
+ <property file="../../build.properties"/>
+ <property file="../../../build.properties"/>
+ <property file="${user.home}/build.properties"/>
<!-- Default values for unspecified properties -->
<property name="jdbc20ext.jar" value="../jdbc2_0-stdext.jar"/>
@@ -219,7 +219,7 @@
-->
<copy todir="${build.home}/library">
<fileset dir="${jstl.home}/tld" includes="*.tld"/>
- <fileset dir="${struts.home}/dist/lib" includes="*.tld"/>
+ <fileset dir="../../dist/lib" includes="*.tld"/>
</copy>
</target>
1.9 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java
Index: ELFormTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELFormTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ELFormTag.java 26 Jul 2003 05:48:02 -0000 1.8
+++ ELFormTag.java 9 Aug 2003 19:29:30 -0000 1.9
@@ -386,9 +386,9 @@
this, pageContext)) != null)
setScope(string);
- if ((bool = EvalHelper.evalBoolean("scriptLanguage",
getScriptLanguageExpr(),
- this, pageContext)) != null)
- setScriptLanguage(bool.booleanValue());
+ if ((string = EvalHelper.evalString("scriptLanguage",
getScriptLanguageExpr(),
+ this, pageContext)) != null)
+ setScriptLanguageExpr(string);
if ((string = EvalHelper.evalString("style", getStyleExpr(),
this, pageContext)) != null)
1.8 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java
Index: ELHtmlTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELHtmlTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ELHtmlTag.java 26 Jul 2003 05:48:03 -0000 1.7
+++ ELHtmlTag.java 9 Aug 2003 19:29:30 -0000 1.8
@@ -158,9 +158,9 @@
Boolean bool = null;
String string = null;
- if ((bool = EvalHelper.evalBoolean("lang", getLangExpr(),
- this, pageContext)) != null)
- setLang(bool.booleanValue());
+ if ((string = EvalHelper.evalString("lang", getLangExpr(),
+ this, pageContext)) != null)
+ setLangExpr(string);
if ((bool = EvalHelper.evalBoolean("locale", getLocaleExpr(),
this, pageContext)) != null)
1.9 +7 -7
jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java
Index: ELJavascriptValidatorTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-el/src/share/org/apache/strutsel/taglib/html/ELJavascriptValidatorTag.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ELJavascriptValidatorTag.java 26 Jul 2003 05:48:03 -0000 1.8
+++ ELJavascriptValidatorTag.java 9 Aug 2003 19:29:30 -0000 1.9
@@ -276,9 +276,9 @@
this, pageContext)) != null)
setPage(integer.intValue());
- if ((bool = EvalHelper.evalBoolean("scriptLanguage",
getScriptLanguageExpr(),
- this, pageContext)) != null)
- setScriptLanguage(bool.booleanValue());
+ if ((string = EvalHelper.evalString("scriptLanguage",
getScriptLanguageExpr(),
+ this, pageContext)) != null)
+ setScriptLanguageExpr(string);
if ((string = EvalHelper.evalString("src", getSrcExpr(),
this, pageContext)) != null)
1.3 +2 -0 jakarta-struts/contrib/struts-faces/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-faces/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 4 Jun 2003 17:38:13 -0000 1.2
+++ build.xml 9 Aug 2003 19:29:30 -0000 1.3
@@ -6,6 +6,8 @@
<!-- Initialize property values -->
<property file="build.properties"/>
+ <property file="../../build.properties"/>
+ <property file="../../../build.properties"/>
<property file="${user.home}/build.properties"/>
1.9 +3 -2 jakarta-struts/contrib/struts-legacy/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/struts-legacy/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 31 Jul 2003 20:15:50 -0000 1.8
+++ build.xml 9 Aug 2003 19:29:30 -0000 1.9
@@ -11,7 +11,8 @@
<!-- See "build.properties.sample" for the preferences you can set -->
<property file="build.properties"/> <!-- Component local -->
- <property file="../../build.properties"/> <!-- Struts local -->
+ <property file="../../build.properties"/> <!-- Struts local -->
+ <property file="../../../build.properties"/> <!-- Jakarta local -->
<property file="${user.home}/build.properties"/> <!-- User local -->
1.2 +3 -2 jakarta-struts/contrib/tag-doc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-struts/contrib/tag-doc/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 29 Mar 2003 05:51:40 -0000 1.1
+++ build.xml 9 Aug 2003 19:29:30 -0000 1.2
@@ -1,9 +1,10 @@
<project name="TaglibDoc" default="compile" basedir=".">
<!-- Load local and user build preferences -->
- <property file="${user.home}/build.properties"/>
- <property file="../build.properties"/>
<property file="build.properties"/>
+ <property file="../../build.properties"/>
+ <property file="../../../build.properties"/>
+ <property file="${user.home}/build.properties"/>
<property name="src.dir" value="src"/>
<property name="classes.dir" value="classes"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
