rleland 2002/10/25 22:38:07
Modified: . build-all-clean.bat.sample build.properties.sample
Log:
Pickup the fileupload which was moved to commons,
and use current versions of tomcat.
Revision Changes Path
1.2 +3 -2 jakarta-struts/build-all-clean.bat.sample
Index: build-all-clean.bat.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build-all-clean.bat.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build-all-clean.bat.sample 16 Oct 2002 15:04:47 -0000 1.1
+++ build-all-clean.bat.sample 26 Oct 2002 05:38:07 -0000 1.2
@@ -57,9 +57,10 @@
cd ..\validator
call ant clean dist
-cd ..\..\jakarta-commons-sandbox
cd fileupload
call maven
+
+cd ..\..\jakarta-commons-sandbox
cd ..\resources
call maven
1.17 +15 -10 jakarta-struts/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-struts/build.properties.sample,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- build.properties.sample 18 Oct 2002 15:20:53 -0000 1.16
+++ build.properties.sample 26 Oct 2002 05:38:07 -0000 1.17
@@ -10,9 +10,7 @@
# -----------------------------------------------------------------------------
# WARNING: The relative paths below assume that the build.xml file is in the
-# top-level directory of the jakarta-struts source distribution (as it still
-# is at the moment). If build.xml moves to under the "build" subdirectory,
-# we will need to add an extra level of "../" to each of these paths.
+# top-level directory of the jakarta-struts source distribution.
# commons-lib.home Where the CVS toplevel commons live
commons-lib.home=D:/Projects/Apache/jakarta-commons
@@ -25,7 +23,7 @@
# is the servlet container part of this distribution), from CVS module
# "jakarta-tomcat-4.0" at jakarta.apache.org). This is only required
# if you are going to execute the "deploy.catalina" target.
-catalina.home=${apache.home}/jakarta-tomcat-4.0.4
+catalina.home=${apache.home}/jakarta-tomcat-4.0.6
# The JAR file containing version 1.0 (or later) of the Beanutils package
# from the Jakarta Commons project.
@@ -46,7 +44,7 @@
# The JAR file containing version 1.0 (or later) of the FileUpload package
# from the Jakarta Commons project.
-commons-fileupload.jar=${commons-sandbox-lib.home}/fileupload/target/commons-fileupload-1.0-dev.jar
+commons-fileupload.jar=${commons-lib.home}/fileupload/target/commons-fileupload-1.0-dev.jar
# The JAR file containing version 1.0-b1 (or later) of the Lang package
# from the Jakarta Commons project.
@@ -88,21 +86,24 @@
# version 2.2 or 2.3)
servlet.jar=${apache.home}/jakarta-servletapi/lib/servlet.jar
-# The directory containing your binary distribution of Tomcat 3.2, from CVS
+# The directory containing your binary distribution of Tomcat 3.3, from CVS
# module "jakarta-tomcat" (and branch "TOMCAT_32") at jakarta.apache.org.
# This is only required if you are going to execute the "deploy.tomcat" target.
-tomcat.home=${apache.home}/jakarta-tomcat-3.2.3
+tomcat.home=${apache.home}/jakarta-tomcat-3.3.1
# The JAR file containing the Xerces parser. This is only required if you are
# going to execute the "deploy.catalina" target.
xerces.jar=${apache.home}/xerces-1_4_4/xerces.jar
+# Properties related to Struts Contrib
+# -----------------------------------------
+
# These links to the JSTL jar files are only required for building the
# Struts-EL contrib library. If they are not present, it will not build that
# contrib library (although it doesn't prevent you from building it directly in
# "contrib/struts-el".
-jstl.jar =
f:/applis/jakarta-taglibs/jstl-1.0/lib/jstl.jar
+jstl.jar = f:/applis/jakarta-taglibs/jstl-1.0/lib/jstl.jar
jstl-standard.jar = f:/applis/jakarta-taglibs/jstl-1.0/lib/standard.jar
# Properties related to Struts unit testing
@@ -119,6 +120,9 @@
# Cactus Ant custom tasks jar
cactus.ant.jar = ${cactus.lib}/cactus-ant.jar
+# Ant Optional Jars for Junit task
+ant.optional.jar = ${apache.home}/jakarta-ant-1.5.1/lib/optional.jar
+
# AspectJ from Cactus distribution
aspectjrt.jar = ${cactus.lib}/aspectjrt.jar
@@ -127,6 +131,7 @@
# Log4J from Jakrata-Commons
log4j.jar = D:/Java/Programs/Apache/jakarta-log4j-1.2.6/dist/lib/log4j-1.2.6.jar
+
# JUnit jar file
junit.jar = /Java/Lib/Junit3.7/junit.jar
@@ -136,5 +141,5 @@
# comment it's home property. For example, if you don't want to run the
# tests on Tomcat 4.0, comment the "tomcat.home.40" property.
-tomcat.home.32 = ${apache.home}/jakarta-tomcat-3.2.4
+tomcat.home.33 = ${apache.home}/jakarta-tomcat-3.3.1
tomcat.home.40 = ${apache.home}/jakarta-tomcat-4.0.6
--
To unsubscribe, e-mail: <mailto:struts-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:struts-dev-help@;jakarta.apache.org>
