this patch will allow building commons-modeler without having to download jakarta-commons source. I also have standardized the properties' name to follow Tomcat 4/5 convention. That will also decrease the file size of Tomcat 5 source.
Thanks,
-- Jeanfrancois
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons/modeler/build.properties.sample,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 build.properties.sample
--- build.properties.sample 30 Apr 2002 20:58:50 -0000 1.1.1.1
+++ build.properties.sample 5 Mar 2003 17:18:23 -0000
@@ -1,23 +1,24 @@
# build.properties.sample - Sample build.properties for "modeler"
# Base properties for expansion below
-commons.home=../../jakarta-commons
-sandbox.home=../../jakarta-commons-sandbox
-jaxp.home=/usr/local/jaxp-1.1
-junit.home=/usr/local/junit3.7
-jmx.home=/usr/local/jmx-ri_1.0.1/jmx
+base.path=/usr/local
+
+ant.home=${base.path}/ant
+jaxp.home=${base.path}/jaxp-1.1
+junit.home=${base.path}/junit3.7
+jmx.home=${base.path}/jmx-ri-1.0.1
# Derived home directories
-beanutils.home=${commons.home}/beanutils
-collections.home=${commons.home}/collections
-digester.home=${commons.home}/digester
-logging.home=${commons.home}/logging
+commons-beanutils.home=${base.path}/commons-beanutils-1.5
+commons-collections.home=${base.path}/commons-collections-2.1
+commons-digester.home=${base.path}/commons-digester-1.4
+commons-logging.home=${base.path}/commons-logging-1.0.2
# Jakarta JAR files
-commons-beanutils.jar=${beanutils.home}/dist/commons-beanutils.jar
-commons-collections.jar=${collections.home}/dist/commons-collections.jar
-commons-digester.jar=${digester.home}/dist/commons-digester.jar
-commons-logging.jar=${logging.home}/dist/commons-logging.jar
+commons-beanutils.jar=${commons-beanutils.home}/commons-beanutils.jar
+commons-collections.jar=${commons-collections.home}/commons-collections.jar
+commons-digester.jar=${commons-digester.home}/commons-digester.jar
+commons-logging.jar=${commons-logging.home}/commons-logging.jar
# JMX libraries
# jmx.jar must contain the JMX classes and interfaces, as well as the
@@ -25,7 +26,6 @@
jmx.jar=${jmx.home}/lib/jmxri.jar
# jmxtools.jar from the JMX RI is only used for the demonstration example.
jmxtools.jar=${jmx.home}/lib/jmxtools.jar
-
# External packages
jaxp.jaxp.jar=${jaxp.home}/jaxp.jar
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/modeler/build.xml,v
retrieving revision 1.8
diff -u -r1.8 build.xml
--- build.xml 16 Jan 2003 19:23:28 -0000 1.8
+++ build.xml 5 Mar 2003 17:18:23 -0000
@@ -10,26 +10,12 @@
<!-- ========== Initialize Properties ===================================== -->
- <property file="${user.home}/build.properties"/> <!-- User local -->
<property file="build.properties"/> <!-- Component local -->
<property file="../build.properties"/> <!-- Commons local -->
+ <property file="${user.home}/build.properties"/> <!-- User local -->
+ <property file="build.properties.sample"/> <!-- Component local -->
-<!-- ========== External Dependencies ===================================== -->
-
-
- <!-- The directories corresponding to your necessary dependencies -->
- <property name="base.path" value="/usr/local" />
- <property name="jaxp.home" value="${base.path}/jaxp-1.1"/>
- <property name="junit.home" value="${base.path}/junit3.7"/>
- <property name="commons.home" location="../../jakarta-commons"/>
- <property name="sandbox.home" location="../../jakarta-commons-sandbox"/>
- <property name="beanutils.home" value="${commons.home}/beanutils"/>
- <property name="collections.home" value="${commons.home}/collections"/>
- <property name="digester.home" value="${commons.home}/digester"/>
- <property name="jmx.home" value="${base.path}/jmx-ri_1.0.1/jmx"/>
- <property name="logging.home" value="${commons.home}/logging"/>
-
<!-- ========== Derived Values ============================================ -->
@@ -40,10 +26,6 @@
<property name="jaxp.xalan.jar" value="${jaxp.home}/xalan.jar"/>
<property name="jmx.jar" value="${jmx.home}/lib/jmxri.jar"/>
<property name="junit.jar" value="${junit.home}/junit.jar"/>
- <property name="commons-beanutils.jar"
value="${beanutils.home}/dist/commons-beanutils.jar"/>
- <property name="commons-collections.jar"
value="${collections.home}/dist/commons-collections.jar"/>
- <property name="commons-digester.jar"
value="${digester.home}/dist/commons-digester.jar"/>
- <property name="commons-logging.jar"
value="${logging.home}/target/commons-logging.jar"/>
<!-- ========== Component Declarations ==================================== -->--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
