You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@apache.org on 2001/04/29 09:37:44 UTC
cvs commit: jakarta-slide build.properties.sample build.xml .cvsignore build.sh build.bat
remm 01/04/29 00:37:44
Modified: . build.xml .cvsignore
Added: . build.properties.sample
Removed: . build.sh build.bat
Log:
- Update the build system to the new style introced in the commons.
- Remove the build scripts (build.bat and build.sh). Use the Ant
command directly (see instructions in the documentation - installation page).
- Use some of the new Ant features.
Revision Changes Path
1.82 +202 -107 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- build.xml 2001/03/29 13:16:35 1.81
+++ build.xml 2001/04/29 07:37:42 1.82
@@ -2,6 +2,26 @@
<!-- =================================================================== -->
+ <!-- Load build.properties -->
+ <!-- =================================================================== -->
+ <property file="build.properties"/>
+ <property file="${user.home}/.build.properties"/>
+
+
+ <!-- =================================================================== -->
+ <!-- Compiler Options -->
+ <!-- =================================================================== -->
+ <!-- Should Java compilations set the 'debug' compiler option? -->
+ <property name="compile.debug" value="true"/>
+
+ <!-- Should Java compilations set the 'deprecation' compiler option? -->
+ <property name="compile.deprecation" value="true"/>
+
+ <!-- Should Java compilations set the 'optimize' compiler option? -->
+ <property name="compile.optimize" value="true"/>
+
+
+ <!-- =================================================================== -->
<!-- Properties -->
<!-- =================================================================== -->
<property name="name" value="Jakarta-Slide" />
@@ -11,9 +31,11 @@
<property name="final.name" value="${project}-${version}" />
<property name="ant.home" value="../jakarta-ant" />
<property name="build.compiler" value="classic" />
- <property name="catalina.build" value="../jakarta-tomcat-4.0/catalina/build" />
+ <property name="catalina.build"
+ value="../jakarta-tomcat-4.0/catalina/build" />
<property name="catalina.dist" value="../jakarta-tomcat-4.0/dist" />
- <property name="servlet.jar" value="../jakarta-servletapi/lib/servlet.jar" />
+ <property name="servlet.jar"
+ value="../jakarta-servletapi/lib/servlet.jar" />
<property name="jdom.home" value="./lib"/>
<property name="jdom.jar" value="${jdom.home}/jdom.jar"/>
<property name="jaxp.home" value="../jaxp"/>
@@ -25,6 +47,8 @@
<property name="junit.jar" value="./lib/junit.jar"/>
<property name="jta.jar" value="./lib/jta.jar"/>
<property name="log4j.jar" value="./lib/log4j.jar"/>
+ <property name="httpclient.jar"
+ value="../jakarta-commons/httpclient/build/commons-httpclient.jar"/>
<property name="tomcat.build" value="../jakarta-tomcat-4.0/build" />
<property name="avalon.dist" value="../dist/avalon" />
<property name="slide.build" value="./build" />
@@ -38,6 +62,95 @@
<!-- =================================================================== -->
+ <!-- Patterns -->
+ <!-- =================================================================== -->
+ <!-- patternset describing files to be copied from the doc directory -->
+ <patternset id="patternset-doc"/>
+
+ <!-- patternset describing test classes -->
+ <patternset id="patternset-test-classes">
+ <include name="**/Test*.class"/>
+ </patternset>
+
+ <!-- patternset describing non test classes -->
+ <patternset id="patternset-non-test-classes">
+ <include name="**/*.class"/>
+ <exclude name="**/Test*.class"/>
+ </patternset>
+
+ <!-- patternset describing non test source files (*.java, *html, etc.) -->
+ <patternset id="patternset-javadocable-sources">
+ <include name="**/*"/>
+ <exclude name="**/Test*.java"/>
+ </patternset>
+
+
+ <!-- =================================================================== -->
+ <!-- Classpaths -->
+ <!-- =================================================================== -->
+ <path id="util.classpath">
+ <pathelement location="${xmlapi.jar}"/>
+ </path>
+
+ <path id="main.classpath">
+ <pathelement location="${xmlapi.jar}"/>
+ <pathelement location="${jaxp.jar}"/>
+ <pathelement location="${jta.jar}"/>
+ <pathelement location="${jmx.jar}"/>
+ </path>
+
+ <path id="stores.classpath">
+ <pathelement location="${jta.jar}"/>
+ <pathelement location="${slide.build}/classes"/>
+ </path>
+
+ <path id="wrappers.classpath">
+ <pathelement location="${jta.jar}"/>
+ <pathelement location="${slide.build}/classes"/>
+ <pathelement location="${log4j.jar}"/>
+ <pathelement location="${catalina.build}/classes"/>
+ </path>
+
+ <path id="webdavservlet.classpath">
+ <pathelement location="${xmlapi.jar}"/>
+ <pathelement location="${jaxp.jar}"/>
+ <pathelement location="${servlet.jar}"/>
+ <pathelement location="${jdom.jar}"/>
+ <pathelement location="${jta.jar}"/>
+ <pathelement location="${slide.build}/classes"/>
+ </path>
+
+ <path id="webdavclient.classpath">
+ <pathelement location="${jaxp.jar}"/>
+ <pathelement location="${xmlapi.jar}"/>
+ <pathelement location="${httpclient.jar}"/>
+ <pathelement location="${slide.build}/classes"/>
+ </path>
+
+
+ <!-- =================================================================== -->
+ <!-- Test Execution Defaults -->
+ <!-- =================================================================== -->
+ <path id="test.classpath">
+ <pathelement location="${jaxp.jar}"/>
+ <pathelement location="${servlet.jar}"/>
+ <pathelement location="${jdom.jar}"/>
+ <pathelement location="${jta.jar}"/>
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${httpclient.jar}"/>
+ <pathelement location="${webdavclient.build}/classes"/>
+ <pathelement location="${slide.build}/classes"/>
+ <pathelement location="${slide.build}/tests"/>
+ </path>
+
+ <!-- Should all tests fail if one does? -->
+ <property name="test.failonerror" value="true"/>
+
+ <!-- The test runner to execute -->
+ <property name="test.runner" value="junit.textui.TestRunner"/>
+
+
+ <!-- =================================================================== -->
<!-- Targets -->
<!-- =================================================================== -->
<target name="targets">
@@ -108,6 +221,9 @@
<available property="jmx.present"
classname="javax.management.MBeanServer"
classpath="${jmx.jar}" />
+ <available property="httpclient.present"
+ classname="org.apache.commons.httpclient.HttpClient"
+ classpath="${httpclient.jar}" />
<available property="avalon.present"
classname="org.apache.avalon.blocks.Block" />
<available property="junit.present"
@@ -120,7 +236,7 @@
classname="org.apache.catalina.Container"
classpath="${catalina.build}/classes" />
<available property="xsl.present"
- classname="org.apache.tools.ant.taskdefs.optional.XalanLiaison" />
+ classname="org.apache.tools.ant.taskdefs.optional.TraXLiaison" />
<available property="jdom.present" classname="org.jdom.Element"
classpath="${jdom.jar}" />
@@ -137,6 +253,7 @@
<echo message="dom.present (must be present) = ${dom.present}" />
<echo message="sax.present (must be present) = ${sax.present}" />
<echo message="jta.present (must be present) = ${jta.present}" />
+ <echo message="httpclient.present (must be present) = ${httpclient.present}" />
<echo message="--- Optional Libraries ---" />
@@ -204,10 +321,14 @@
<target name="util" depends="prepare">
<echo message="Building Utils" />
- <javac srcdir="src/util" destdir="${slide.build}/classes"
- debug="off" deprecation="off"
- classpath="${xmlapi.jar}"
+ <javac
+ srcdir="src/util"
+ destdir="${slide.build}/classes"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
+ <classpath refid="util.classpath"/>
</javac>
</target>
@@ -219,10 +340,14 @@
<target name="main" depends="util">
<echo message="Building Slide Core API" />
- <javac srcdir="src/share" destdir="${slide.build}/classes"
- debug="on" deprecation="on"
- classpath="${jta.jar}:${jmx.jar}"
+ <javac
+ srcdir="src/share"
+ destdir="${slide.build}/classes"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
+ <classpath refid="main.classpath"/>
<exclude name="**/Slide.java" unless="jmx.present" />
<exclude name="**/SlideMBean.java" unless="jmx.present" />
</javac>
@@ -239,28 +364,42 @@
<echo message="Building Standard Stores" />
<javac srcdir="src/stores" destdir="${slide.build}/classes"
- debug="on" deprecation="on"
- classpath="${jta.jar}:${slide.build}/classes"
- excludes="**/CVS/**,**/package.html" />
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**,**/package.html">
+ <classpath refid="stores.classpath"/>
+ </javac>
<echo message="Building Default Roles" />
<javac srcdir="src/roles" destdir="${slide.build}/classes"
- debug="on" deprecation="on"
- classpath="${slide.build}/classes"
- excludes="**/CVS/**,**/package.html" />
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**,**/package.html">
+ <classpath refid="stores.classpath"/>
+ </javac>
<echo message="Building Slide WebDAV Servlet" />
<javac srcdir="src/webdav/server" destdir="${slide.build}/classes"
- debug="on" deprecation="on" includes="**/webdav/**"
- classpath="${servlet.jar}:${jta.jar}:${jdom.jar}:${slide.build}/classes"
- excludes="**/CVS/**,**/package.html" />
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ includes="**/webdav/**"
+ excludes="**/CVS/**,**/package.html">
+ <classpath refid="webdavservlet.classpath"/>
+ </javac>
<echo message="Building Slide Manager Servlet" />
<javac srcdir="src/manager" destdir="${slide.build}/classes"
- debug="on" deprecation="on" includes="**/manager/**"
- classpath="${servlet.jar}:${jta.jar}:${slide.build}/classes"
- excludes="**/CVS/**,**/package.html" />
-
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ includes="**/manager/**"
+ excludes="**/CVS/**,**/package.html">
+ <classpath refid="webdavservlet.classpath"/>
+ </javac>
+
</target>
@@ -290,57 +429,6 @@
<!-- =================================================================== -->
- <!-- Build Slide, without debug -->
- <!-- =================================================================== -->
- <target name="no-debug" depends="util">
-
- <echo message="Building Slide Core API" />
- <javac srcdir="src/share" destdir="${slide.build}/classes"
- debug="off" deprecation="off"
- classpath="${jta.jar}:${jmx.jar}"
- excludes="**/CVS/**,**/webdav/**,**/manager/**,**/package.html">
- <exclude name="**/Slide.java" unless="jmx.present" />
- <exclude name="**/SlideMBean.java" unless="jmx.present" />
- </javac>
- <copy todir="${slide.build}/classes">
- <fileset dir="src/share">
- <include name="**/*.properties"/>
- </fileset>
- </copy>
- <copy todir="${slide.build}/lib">
- <fileset dir="lib">
- <include name="**/*.jar"/>
- </fileset>
- </copy>
-
- <echo message="Building Standard Stores" />
- <javac srcdir="src/stores" destdir="${slide.build}/classes"
- debug="off" deprecation="off"
- classpath="${jta.jar}:${slide.build}/classes"
- excludes="**/CVS/**,**/package.html" />
-
- <echo message="Building Default Roles" />
- <javac srcdir="src/roles" destdir="${slide.build}/classes"
- debug="off" deprecation="off"
- classpath="${slide.build}/classes"
- excludes="**/CVS/**,**/package.html" />
-
- <echo message="Building Slide WebDAV Servlet" />
- <javac srcdir="src/webdav/server" destdir="${slide.build}/classes"
- debug="off" deprecation="off" includes="**/webdav/**"
- classpath="${servlet.jar}:${jta.jar}:${jdom.jar}:${slide.build}/classes"
- excludes="**/CVS/**,**/package.html" />
-
- <echo message="Building Slide Manager Servlet" />
- <javac srcdir="src/manager" destdir="${slide.build}/classes"
- debug="off" deprecation="off" includes="**/manager/**"
- classpath="${servlet.jar}:${jta.jar}:${slide.build}/classes"
- excludes="**/CVS/**,**/package.html" />
-
- </target>
-
-
- <!-- =================================================================== -->
<!-- Prepare WebDAV client -->
<!-- =================================================================== -->
<target name="webdav-client-prepare" depends="util">
@@ -365,37 +453,23 @@
<!-- Build WebDAV client -->
<!-- =================================================================== -->
<target name="webdav-client" depends="webdav-client-prepare">
- <javac srcdir="src/webdav/client/src"
- destdir="${webdavclient.build}/classes"
- debug="on" deprecation="on"
- classpath="${jaxp.jar}"
- excludes="**/CVS/**,**/package.html" />
- <copy todir="${webdavclient.build}/bin">
- <fileset dir="src/webdav/client/bin">
- <include name="**/*.bat" />
- <include name="**/*.sh" />
- </fileset>
- </copy>
- </target>
-
- <!-- =================================================================== -->
- <!-- Build WebDAV client (without debug) -->
- <!-- =================================================================== -->
- <target name="webdav-client-no-debug" depends="webdav-client-prepare">
<javac srcdir="src/webdav/client/src"
destdir="${webdavclient.build}/classes"
- classpath="${jaxp.jar}"
- debug="off" deprecation="off"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
excludes="**/CVS/**,**/package.html">
- <exclude name="**/tests/**" unless="junit.present" />
+ <classpath refid="webdavclient.classpath"/>
</javac>
+
<copy todir="${webdavclient.build}/bin">
<fileset dir="src/webdav/client/bin">
<include name="**/*.bat" />
<include name="**/*.sh" />
</fileset>
</copy>
+
</target>
@@ -425,16 +499,20 @@
<!-- Javadoc of the WebDAV client -->
<!-- =================================================================== -->
<target name="webdav-client-javadoc">
+
<property name="copyright" value="" />
<javadoc sourcepath="src/webdav/client/src"
destdir="${slide.build}/doc/clientjavadoc"
- classpath="${jaxp.jar}:${xmlapi.jar}:${slide.build}/classes"
doctitle="Slide WebDAV Client JavaDoc" package="true"
noindex="false" author="true"
- packagenames="org.apache.webdav.lib.*" />
+ packagenames="org.apache.webdav.lib.*">
+ <classpath refid="webdavclient.classpath"/>
+ </javadoc>
+
<copy todir="${slide.dist}/doc/clientjavadoc">
<fileset dir="${slide.build}/doc/clientjavadoc" />
</copy>
+
</target>
@@ -442,7 +520,7 @@
<!-- Build a DAV client distribution -->
<!-- =================================================================== -->
<target name="webdav-client-dist"
- depends="webdav-client-no-debug, webdav-client-dist-prepare,
+ depends="webdav-client, webdav-client-dist-prepare,
webdav-client-javadoc">
<copy todir="${webdavclient.dist}/bin">
@@ -480,14 +558,21 @@
<!-- Build some examples -->
<!-- =================================================================== -->
<target name="examples" depends="main">
+
<javac srcdir="src/examples" destdir="${slide.build}/examples"
- debug="on" deprecation="on" excludes="**/CVS/**"
- classpath="${slide.build}/classes:${jta.jar}" />
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**">
+ <classpath refid="stores.classpath"/>
+ </javac>
+
<copy todir="${slide.build}/examples">
<fileset dir="src/examples">
<exclude name="**/CVS/**" />
</fileset>
</copy>
+
</target>
@@ -496,9 +581,15 @@
<!-- =================================================================== -->
<target name="tests" depends="main, webdav-client-dist"
if="junit.present">
+
<javac srcdir="src/tests" destdir="${slide.build}/tests"
- debug="on" deprecation="on" excludes="**/CVS/**"
- classpath="${slide.build}/classes:${webdavclient.build}/classes:${jta.jar}:${junit.jar}" />
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
+ excludes="**/CVS/**">
+ <classpath refid="test.classpath"/>
+ </javac>
+
<copy todir="${slide.build}/tests">
<fileset dir="src/tests">
<exclude name="**/CVS/**" />
@@ -509,6 +600,7 @@
tofile="${slide.build}/tests/webdavlib.jar" />
<copy file="${junit.jar}"
tofile="${slide.build}/tests/junit.jar" />
+
</target>
@@ -528,9 +620,10 @@
<target name="javadoc" depends="prepare">
<property name="copyright" value="" />
<javadoc sourcepath="src/share" destdir="${slide.build}/doc/javadoc"
- classpath="${jta.jar}:${jaxp.jar}:${xmlapi.jar}:${jmx.jar}:${jdom.jar}:${servlet.jar}:${slide.build}/classes"
doctitle="Slide JavaDoc" package="true" noindex="true"
- author="true" packagenames="org.*" />
+ author="true" packagenames="org.*">
+ <classpath refid="main.classpath"/>
+ </javadoc>
</target>
@@ -553,7 +646,7 @@
<!-- =================================================================== -->
<!-- Build a Slide distribution -->
<!-- =================================================================== -->
- <target name="dist" depends="no-debug, examples, tests, prepare-dist, doc,
+ <target name="dist" depends="main, examples, tests, prepare-dist, doc,
javadoc">
<copy file="src/etc/MANIFEST.MF"
@@ -663,14 +756,16 @@
<!-- =================================================================== -->
<!-- Build an Avalon wrapper -->
<!-- =================================================================== -->
- <target name="wrappers" depends="no-debug">
+ <target name="wrappers" depends="main">
<javac srcdir="src/wrappers"
destdir="${slide.build}/classes"
- debug="off" deprecation="off"
+ debug="${compile.debug}"
+ deprecation="${compile.deprecation}"
+ optimize="${compile.optimize}"
includes="**"
- excludes="**/CVS/**"
- classpath="${slide.build}/classes:${catalina.build}/classes:${jta.jar}:${log4j.jar}">
+ excludes="**/CVS/**">
+ <classpath refid="wrappers.classpath"/>
<exclude name="**/SlideRealm*.*" unless="catalina.present" />
<exclude name="**/log4j/**" unless="log4j.present" />
</javac>
1.2 +1 -0 jakarta-slide/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-slide/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2001/02/04 04:45:34 1.1
+++ .cvsignore 2001/04/29 07:37:43 1.2
@@ -1,2 +1,3 @@
+build.properties
build
dist
1.1 jakarta-slide/build.properties.sample
Index: build.properties.sample
===================================================================
# -------------------------------------------------------------------
# build.properties.sample
#
# This is an example "build.properties" file, used to customize
# building Jakarta Slide for your local environment.
# Make any changes you need, and rename this file to
# "build.properties"
#
# $Id: build.properties.sample,v 1.1 2001/04/29 07:37:43 remm Exp $
# -------------------------------------------------------------------
# -------------------------------------------------------------------
# EXTERNAL DEPENDENCIES
# -------------------------------------------------------------------
# junit.jar -- JUnit classes (http://junit.org)
junit.jar=/java/junit/junit.jar
# jaxp.jar -- JAXP 1.1 (http://java.sun.com/xml/)
jaxp.jar=/java/jaxp/jaxp.jar
# xmlapi.jar -- JAXP 1.1 (http://java.sun.com/xml/)
xmlapi.jar=/java/jaxp/crimson.jar
# xalan.jar -- JAXP 1.1 (http://java.sun.com/xml/)
xalan.jar=/java/jaxp/xalan.jar
# servlet.jar -- Servlet 2.2 API (http://nagoya.betaversion.org/~costin/ws/jakarta-servletapi/lib/)
servlet.jar=/java/servlet/servlet.jar
# commons-httpclient.jar -- the HTTP client package from the Commons
commons-httpclient.jar=${basedir}/../jakarta-commons/httpclient/build/commons-httpclient.jar
# jta.jar -- Java Transaction API 1.0.1 (http://java.sun.com/products/jta/)
jta.jar=/java/jta/jta.jar
# jdom.jar -- JDOM (http://www.jdom.org/)
jdom.jar=/java/jdom/jdom.jar
# log4j.jar -- log4j (http://jakarta.apache.org/log4j/)
log4j.jar=/java/log4j/log4j.jar
# -------------------------------------------------------------------
# JAKARTA-COMMONS DEPENDENCIES
# -------------------------------------------------------------------
# commons-httpclient.jar -- the HTTP client package
commons-collections.jar=${basedir}/../collections/build/commons-collections.jar