You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2003/07/23 22:41:02 UTC
cvs commit: jakarta-commons/modeler build.properties.default build.properties.sample build.xml project.xml STATUS.html
dims 2003/07/23 13:41:02
Modified: modeler build.properties.default build.properties.sample
build.xml project.xml STATUS.html
Log:
- Reflect the reality that modeler does not depend on beanutils (or) collections.
- Ensure that build/test works even when digester jars are absent as this is an optional component now.
Revision Changes Path
1.2 +4 -16 jakarta-commons/modeler/build.properties.default
Index: build.properties.default
===================================================================
RCS file: /home/cvs/jakarta-commons/modeler/build.properties.default,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.default 20 Apr 2003 20:19:58 -0000 1.1
+++ build.properties.default 23 Jul 2003 20:41:02 -0000 1.2
@@ -11,30 +11,18 @@
#base.path=../repository
# --------------------------------------------------
-# REQUIRED LIBRARIES
+# OPTIONAL LIBRARIES
# --------------------------------------------------
-
-# ----- Commons Beanutils, version 1.4 or later -----
-commons-beanutils.home=${base.path}/commons-beanutils-1.6.1
-commons-beanutils.lib=${commons-beanutils.home}
-commons-beanutils.jar=${commons-beanutils.lib}/commons-beanutils.jar
-commons-beanutils.loc=http://www.apache.org/dist/jakarta/commons/beanutils/binaries/commons-beanutils-1.6.1.tar.gz
-
-
-# ----- Commons Collections, version 2.0 or later -----
-commons-collections.home=${base.path}/commons-collections-2.1
-commons-collections.lib=${commons-collections.home}
-commons-collections.jar=${commons-collections.lib}/commons-collections.jar
-commons-collections.loc=http://www.apache.org/dist/jakarta/commons/collections/binaries/collections-2.1.tar.gz
-
-
# ----- Commons Digester, version 1.4 or later -----
commons-digester.home=${base.path}/commons-digester-1.4.1
commons-digester.lib=${commons-digester.home}
commons-digester.jar=${commons-digester.lib}/commons-digester.jar
commons-digester.loc=http://www.apache.org/dist/jakarta/commons/digester/binaries/commons-digester-1.4.1.tar.gz
+# --------------------------------------------------
+# REQUIRED LIBRARIES
+# --------------------------------------------------
# ----- Commons Logging, version 1.0.1 or later -----
commons-logging.home=${base.path}/commons-logging-1.0.3
1.2 +0 -4 jakarta-commons/modeler/build.properties.sample
Index: build.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-commons/modeler/build.properties.sample,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.properties.sample 30 Apr 2002 20:58:50 -0000 1.1
+++ build.properties.sample 23 Jul 2003 20:41:02 -0000 1.2
@@ -8,14 +8,10 @@
jmx.home=/usr/local/jmx-ri_1.0.1/jmx
# Derived home directories
-beanutils.home=${commons.home}/beanutils
-collections.home=${commons.home}/collections
digester.home=${commons.home}/digester
logging.home=${commons.home}/logging
# 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
1.19 +3 -19 jakarta-commons/modeler/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/modeler/build.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- build.xml 20 Apr 2003 20:37:05 -0000 1.18
+++ build.xml 23 Jul 2003 20:41:02 -0000 1.19
@@ -25,8 +25,6 @@
<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"/>
@@ -41,8 +39,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"/>
@@ -95,8 +91,6 @@
<pathelement location="${jaxp.jaxp.jar}"/>
<pathelement location="${jaxp.parser.jar}"/>
<pathelement location="${jaxp.xalan.jar}"/>
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${jmx.jar}"/>
@@ -114,8 +108,6 @@
<pathelement location="${jaxp.jaxp.jar}"/>
<pathelement location="${jaxp.parser.jar}"/>
<pathelement location="${jaxp.xalan.jar}"/>
- <pathelement location="${commons-beanutils.jar}"/>
- <pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-digester.jar}"/>
<pathelement location="${commons-logging.jar}"/>
<pathelement location="${jmx.jar}"/>
@@ -160,6 +152,7 @@
<target name="compile-only" >
<available property="ant16.available" classname="org.apache.tools.ant.PropertyHelper" />
+ <available property="digester.available" classname="org.apache.commons.digester.Digester" />
<javac srcdir="${source.home}"
destdir="${build.home}/classes"
@@ -168,6 +161,7 @@
optimize="${compile.optimize}">
<classpath refid="compile.classpath"/>
<exclude name="org/apache/commons/modeler/ant/*PropertyHelper.java" unless="ant16.available" />
+ <exclude name="org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java" unless="digester.available" />
</javac>
<copy todir="${build.home}/classes" filtering="on">
<fileset dir="${source.home}"
@@ -416,16 +410,6 @@
<antcall target="downloadgz">
<param name="sourcefile" value="${commons-digester.loc}"/>
<param name="destfile" value="${commons-digester.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-beanutils.loc}"/>
- <param name="destfile" value="${commons-beanutils.jar}"/>
- </antcall>
-
- <antcall target="downloadgz">
- <param name="sourcefile" value="${commons-collections.loc}"/>
- <param name="destfile" value="${commons-collections.jar}"/>
</antcall>
<antcall target="downloadgz">
1.4 +0 -10 jakarta-commons/modeler/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-commons/modeler/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 29 Jan 2003 11:40:40 -0000 1.3
+++ project.xml 23 Jul 2003 20:41:02 -0000 1.4
@@ -25,16 +25,6 @@
<dependencies>
<dependency>
- <id>commons-beanutils</id>
- <version>SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <id>commons-collections</id>
- <version>2.0</version>
- </dependency>
-
- <dependency>
<id>commons-digester</id>
<version>1.2</version>
</dependency>
1.4 +2 -4 jakarta-commons/modeler/STATUS.html
Index: STATUS.html
===================================================================
RCS file: /home/cvs/jakarta-commons/modeler/STATUS.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- STATUS.html 22 Jul 2003 16:03:18 -0000 1.3
+++ STATUS.html 23 Jul 2003 20:41:02 -0000 1.4
@@ -33,9 +33,7 @@
<ul>
<li><a href="http://java.sun.com/j2se">Java Development Kit</a>
(Version 1.2 or later)</li>
-<li><a href="http://jakarta.apache.org/commons/beanutils/">Jakarta Commons BeanUtils</a></li>
-<li><a href="http://jakarta.apache.org/commons/collections/">Jakarta Commons Collections</a></li>
-<li><a href="http://jakarta.apache.org/commons/digester"/>Jakarta Commons Digester</a></li>
+<li><a href="http://jakarta.apache.org/commons/digester"/>Jakarta Commons Digester</a> (Optional)</li>
<li><a href="http://jakarta.apache.org/commons/logging"/>Jakarta Commons Logging</a></li>
<li>A JMX compliant implementation, like the <a href="http://java.sun.com/products/JavaManagement/download.html">JMX Instrumentation and Agent Specification reference implementation</a> or <a href="http://www.open-jmx.org">OpenJMX</a></li>
</ul>
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org