cmlenz 02/03/18 04:03:49
Modified: . build.xml build.properties.sample
Log:
Some cleanup of JSTL related properties
Revision Changes Path
1.153 +9 -8 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- build.xml 8 Feb 2002 17:54:49 -0000 1.152
+++ build.xml 18 Mar 2002 12:03:49 -0000 1.153
@@ -68,9 +68,10 @@
<property name="struts.home" value="."/>
<property name="struts.jar"
value="${struts.home}/lib/struts.jar"/>
- <property name="taglibs.home" value="../jakarta-taglibs/dist"/>
- <property name="taglibs-standard.jar"
- value="${taglibs.home}/standard/standard.jar"/>
+ <property name="jstl.home"
+ value="../jakarta-taglibs/dist/standard"/>
+ <property name="jstl.jar"
+ value="${jstl.home}/standard.jar"/>
<property name="commons-httpclient.jar"
value="lib/commons-httpclient.jar"/>
<property name="tomcat.build" value="../jakarta-tomcat-4.0/build" />
@@ -201,7 +202,7 @@
<path id="taglib.classpath">
<pathelement location="${servlet.jar}"/>
<pathelement location="${struts.jar}"/>
- <pathelement location="${taglibs-standard.jar}"/>
+ <pathelement location="${jstl.jar}"/>
<pathelement location="${jta.jar}"/>
<pathelement location="${slide.build}/classes"/>
</path>
@@ -342,8 +343,8 @@
classname="org.apache.struts.action.Action"
classpath="${struts.jar}" />
<available property="jstl.present"
- classname="org.apache.taglibs.standard.lang.support.ExpressionEvaluatorManager"
- classpath="${taglibs-standard.jar}" />
+ classname="javax.servlet.jsp.jstl.fmt.LocaleSupport"
+ classpath="${jstl.jar}" />
<available property="jndi.present"
classname="javax.naming.Context"
classpath="${jndi.jar}" />
@@ -413,7 +414,7 @@
<echo message="commons-httpclient.jar=${commons-httpclient.jar}" />
<echo message="tomcat.build=${tomcat.build}" />
<echo message="struts.jar=${struts.jar}" />
- <echo message="taglibs-standard.jar=${taglibs-standard.jar}" />
+ <echo message="jstl.jar=${jstl.jar}" />
<echo message="slide.build=${slide.build}" />
<echo message="slide.dist=${slide.dist}" />
<echo message="webapp.dist=${webapp.dist}" />
@@ -1191,7 +1192,7 @@
if="jstl.present">
<copy file="${slide.dist}/slide/lib/slide-taglib-jstl.jar"
todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
- <copy file="${taglibs-standard.jar}"
+ <copy file="${jstl.jar}"
todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
<copy file="src/taglib/slide-jstl.tld"
todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF"/>
1.13 +7 -11 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-slide/build.properties.sample,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.properties.sample 16 Mar 2002 19:47:08 -0000 1.12
+++ build.properties.sample 18 Mar 2002 12:03:49 -0000 1.13
@@ -6,7 +6,7 @@
# Make any changes you need, and rename this file to
# "build.properties"
#
-# $Id: build.properties.sample,v 1.12 2002/03/16 19:47:08 cmlenz Exp $
+# $Id: build.properties.sample,v 1.13 2002/03/18 12:03:49 cmlenz Exp $
# -------------------------------------------------------------------
@@ -118,16 +118,6 @@
jndi.jar=${jndi.lib}/jndi.jar
-# ----- JSP Standard Tag Library, version 1.0 EA 3 or later -----
-taglibs.home=${base.path}/jakarta-taglibs
-jstl.home=${taglibs.home}/jstl-ea3
-jstl-tlds.home=${jstl.home}
-jstl.lib=${jstl.home}
-js.jar=${jstl.lib}/js.jar
-jstl.jar=${jstl.lib}/jstl.jar
-standard.jar=${jstl.lib}/standard.jar
-
-
# ----- log4j (http://jakarta.apache.org/log4j/) -----
log4j.home=${base.path}/jakarta-log4j-1.1.3
log4j.lib=${log4j.home}/dist/lib
@@ -138,5 +128,11 @@
struts.home=${base.path}/jakarta-struts-1.0.1
struts.lib=${struts.home}/lib
struts.jar=${struts.lib}/struts.jar
+
+
+# ----- JSP Standard Tag Library, version 1.0 Beta 1 -----
+jstl.home=${base.path}/jakarta-taglibs/jstl-beta1
+jstl.lib=${jstl.home}
+jstl.jar=${jstl.lib}/standard.jar
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
