mcconnell 2003/06/19 18:14:37
Modified: . .cvsignore build.xml
Removed: . ant.properties.sample default.properties
lib README.txt avalon-framework-4.1.3.jar
excalibur-datasource-1.0.jar excalibur-io-1.0.jar
excalibur-logger-1.0.jar excalibur-pool-1.0.jar
excalibur-thread-1.1.1.jar logkit-1.1.jar
phoenix-client.jar phoenix-metagenerate.jar
qdox-1.0.jar qdox.LICENSE.txt
Log:
Updating ant build to sync with revised structure and removal of antiquated lib
directory content.
Revision Changes Path
1.14 +3 -0 avalon-components/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon-components/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 19 Jun 2003 17:19:20 -0000 1.13
+++ .cvsignore 20 Jun 2003 01:14:36 -0000 1.14
@@ -8,4 +8,7 @@
*.ipr
maven.log
velocity.log
+target
+build
+
1.127 +158 -372 avalon-components/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-components/build.xml,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- build.xml 19 Jun 2003 20:31:27 -0000 1.126
+++ build.xml 20 Jun 2003 01:14:36 -0000 1.127
@@ -1,401 +1,187 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<project name="Avalon Components" default="main" basedir=".">
+<!--
+ build.xml generated by maven from project.xml version 1.0
+ on date June 20 2003, time 0219
+-->
- <!--
- Give user a chance to override without editing this file
- (and without typing -D each time he compiles it)
- -->
- <property file="ant.properties"/>
- <property file="${user.home}/.ant.properties"/>
-
- <property name="name" value="cornerstone"/>
- <property name="Name" value="Cornerstone"/>
- <property name="version" value="0.8"/>
- <property name="year" value="1999-2001"/>
-
- <property name="build.debug" value="on"/>
- <property name="build.optimize" value="off"/>
- <property name="build.deprecation" value="off"/>
-
- <!-- Set the installation variables for Cornerstone/Phoenix -->
- <property name="phoenix.home" value="../avalon-phoenix/dist"/>
- <property name="install.dir" value="${phoenix.home}"/>
+<project default="jar" name="cornerstone" basedir=".">
- <!-- Set the properties for intermediate directory -->
+ <property name="version" value="1.0"/>
<property name="build.dir" value="build"/>
- <property name="build.lib" value="${build.dir}/lib"/>
- <property name="build.src" value="${build.dir}/src"/>
- <property name="build.classes" value="${build.dir}/classes"/>
- <property name="build.testdocs" value="${build.docs}/test"/>
- <property name="build.reports" value="${build.dir}/reports"/>
- <property name="build.xdocs" value="${build.dir}/xdocs"/>
- <property name="build.context" value="${build.dir}/documentation"/>
-
- <!-- Set the properties for source directories -->
- <property name="gen.dir" value="gen"/>
- <property name="src.dir" value="src"/>
- <property name="lib.dir" value="lib"/>
- <property name="java.dir" value="${src.dir}/java"/>
- <property name="test.dir" value="${src.dir}/test"/>
- <property name="manifest.dir" value="${src.dir}/manifest"/>
- <property name="conf.dir" value="${src.dir}/conf"/>
- <property name="tools.dir" location="../avalon/tools"/>
- <property name="docs.dir" value="docs"/>
- <property name="www.dir" value="../avalon-site/docs/cornerstone"/>
- <property name="xdocs.dir" value="${src.dir}/xdocs"/>
- <property name="avalon-site.dir" value="../avalon-site"/>
-
-
- <property name="dist.name" value="${Name}-${version}"/>
- <property name="dist.base" value="distributions"/>
-
- <property name="xerces.jar" value="${tools.dir}/lib/xerces-2.0.1.jar"/>
- <property name="xml-apis.jar" value="${tools.dir}/lib/xml-apis.jar"/>
- <property name="junit.jar" value="${tools.dir}/lib/junit-3.7.jar"/>
- <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
-
- <path id="project.class.path">
- <pathelement location="${junit.jar}"/>
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xml-apis.jar}"/>
- <pathelement path="${java.class.path}" />
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- <pathelement path="${build.classes}" />
+ <property name="lib.dir" value="${build.dir}/lib"/>
+ <property name="classes.dir" value="${build.dir}/classes"/>
+ <property name="test-classes.dir" value="${build.dir}/test-classes"/>
+ <property name="test-report.dir" value="${build.dir}/test-reports"/>
+ <property name="dist.dir" value="${build.dir}/dist"/>
+ <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
+ <property name="final.name" value="cornerstone-${version}"/>
+
+ <path id="src.path">
+ <pathelement location="${basedir}/connection-api/src/java"/>
+ <pathelement location="${basedir}/datasources-api/src/java"/>
+ <pathelement location="${basedir}/scheduler-api/src/java"/>
+ <pathelement location="${basedir}/sockets-api/src/java"/>
+ <pathelement location="${basedir}/store-api/src/java"/>
+ <pathelement location="${basedir}/threads-api/src/java"/>
+ <pathelement location="${basedir}/connection-impl/src/java"/>
+ <pathelement location="${basedir}/datasources-impl/src/java"/>
+ <pathelement location="${basedir}/scheduler-impl/src/java"/>
+ <pathelement location="${basedir}/sockets-impl/src/java"/>
+ <pathelement location="${basedir}/store-impl/src/java"/>
+ <pathelement location="${basedir}/threads-impl/src/java"/>
</path>
- <path id="tools.class.path">
- <pathelement location="${junit.jar}"/>
- <pathelement location="${tools.jar}"/>
- <fileset dir="${avalon-site.dir}/lib"/>
- </path>
-
- <path id="test.class.path">
- <path refid="tools.class.path"/>
- <path refid="project.class.path"/>
- </path>
-
- <!-- Main target -->
- <target name="main" depends="jars" description="Generates the files minus
documentation" />
-
- <!-- Compile the project -->
- <target name="compile">
-
- <available property="jsse.present"
- classname="javax.net.ssl.SSLServerSocket"
- classpathref="project.class.path"/>
-
- <available classname="javax.xml.parsers.DocumentBuilderFactory"
- classpathref="project.class.path"
- property="DocumentBuilderFactory.present"/>
-
- <available classname="javax.xml.parsers.SAXParserFactory"
- classpathref="project.class.path"
- property="SAXParserFactory.present"/>
-
- <available classname="java.beans.XMLDecoder"
- classpathref="project.class.path"
- property="LTPJB.present"/>
-
- <available property="nio.present"
- classname="java.nio.channels.Channels"
- classpathref="project.class.path"/>
-
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${gen.dir}"/>
- <mkdir dir="${docs.dir}"/>
-
- <javac srcdir="${java.dir}"
- destdir="${build.classes}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- deprecation="${build.deprecation}">
- <classpath refid="project.class.path" />
- <src path="${test.dir}"/>
- <exclude name="org/apache/avalon/cornerstone/blocks/sockets/*SSL*.java"
- unless="jsse.present" />
- <exclude name="org/apache/avalon/cornerstone/blocks/sockets/*TLS*.java"
- unless="jsse.present" />
- <exclude name="org/apache/avalon/cornerstone/blocks/dom/**.java"
- unless="DocumentBuilderFactory.present" />
- <exclude name="org/apache/avalon/cornerstone/services/dom/**.java"
- unless="DocumentBuilderFactory.present" />
- <exclude name="org/apache/avalon/cornerstone/blocks/sax/**.java"
- unless="SAXParserFactory.present" />
- <exclude
name="org/apache/avalon/cornerstone/blocks/masterstore/xml/XMLFilePersistentObjectRepository.java"
- unless="LTPJB.present" />
- <exclude name="org/apache/avalon/cornerstone/services/sax/**.java"
- unless="SAXParserFactory.present" />
- <exclude name="org/apache/avalon/cornerstone/services/channels/*.java"
- unless="nio.present" />
- <exclude name="org/apache/avalon/cornerstone/blocks/channels/*.java"
- unless="nio.present" />
- </javac>
- </target>
-
- <!-- Creates all the .jar file -->
- <target name="jars" depends="compile,metagenerate">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/cornerstone.jar"
- basedir="${build.classes}">
- <include name="org/apache/avalon/cornerstone/blocks/**"/>
- <include name="org/apache/avalon/cornerstone/services/**"/>
- <fileset dir="${gen.dir}">
- <include name="**/*.xinfo"/>
- <include name="**/*.mxinfo"/>
- </fileset>
- <fileset dir="${src.dir}/java">
- <include name="**/*-schema.xml"/>
- <include name="**/*.xconfig"/>
- </fileset>
- </jar>
-
- <jar jarfile="${build.lib}/cornerstone-api.jar"
- basedir="${build.classes}">
- <include name="org/apache/avalon/cornerstone/services/**"/>
- </jar>
-
- <jar jarfile="${build.lib}/cornerstone-refimpl.jar"
- basedir="${build.classes}">
- <include name="org/apache/avalon/cornerstone/blocks/**"/>
- <fileset dir="${gen.dir}">
- <include name="**/*.xinfo"/>
- <include name="**/*.mxinfo"/>
- </fileset>
- </jar>
- </target>
-
- <target name="metagenerate" description="Generates the XML descriptors">
-
- <taskdef name="generatemeta"
classname="org.apache.avalon.phoenix.tools.metagenerate.MetaGenerateTask">
- <classpath refid="project.class.path" />
- </taskdef>
-
- <generatemeta dest="${gen.dir}">
- <fileset dir="${java.dir}">
- <include name="**/*.java"/>
- </fileset>
- </generatemeta>
-
- </target>
-
- <!-- Performs unit tests -->
- <target name="test" depends="compile" description="Perform unit tests">
- <mkdir dir="${build.reports}"/>
-
- <echo message="Performing Unit Tests" />
- <junit fork="true" printsummary="yes" dir="${build.reports}">
- <formatter type="plain"/>
+ <patternset id="src.java.includes">
+ <include name="**/*.dtd"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.xinfo"/>
+ <include name="**/*.xtype"/>
+ <include name="**/*.xprofile"/>
+ <include name="**/*.xconfig"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.xservice"/>
+ </patternset>
+
+ <target name="init" description="o Initializes some properties">
+ <mkdir dir="${lib.dir}"/>
+ <condition property="noget">
+ <equals arg2="only" arg1="${build.sysclasspath}">
+ </equals>
+ </condition>
+ </target>
+
+ <target name="compile" description="o Compile the code" depends="get-deps">
+ <mkdir dir="${classes.dir}">
+ </mkdir>
+ <javac destdir="${classes.dir}"
+ deprecation="false" debug="true" optimize="false"
excludes="**/package.html">
+ <src>
+ <path refid="src.path"/>
+ </src>
<classpath>
- <path refid="test.class.path"/>
- <pathelement location="${build.classes}"/>
- </classpath>
- <batchtest todir="${build.reports}">
- <fileset dir="${build.classes}">
- <exclude name="**/test/Abstract*TestCase.class"/>
- <include name="**/test/*TestCase.class"/>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar">
+ </include>
</fileset>
- </batchtest>
- </junit>
- </target>
-
- <target name="test-report" depends="compile" >
- <mkdir dir="${build.testdocs}"/>
- <mkdir dir="${build.reports}"/>
-
- <echo message="Performing Unit Tests" />
- <junit fork="true" printsummary="yes" dir="${build.reports}">
- <formatter type="xml"/>
- <classpath>
- <path refid="test.class.path"/>
- <pathelement location="${build.classes}"/>
</classpath>
- <batchtest todir="${build.reports}">
- <fileset dir="${build.classes}">
- <exclude name="**/test/Abstract*TestCase.class"/>
- <include name="**/test/*Profile.class" if="test.profile"/>
- <include name="**/test/*TestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
+ </javac>
- <junitreport todir="${build.reports}">
- <fileset dir="${build.reports}">
- <include name="TEST-*.xml"/>
+ <copy todir="${classes.dir}">
+ <fileset dir="${basedir}/connection-api/src/java">
+ <patternset refid="src.java.includes"/>
</fileset>
- <report format="frames" todir="${build.testdocs}"/>
- </junitreport>
- </target>
-
- <!-- Create the API documentation -->
- <target name="javadocs" description="Generates the Java Docs">
-
- <delete dir="${docs.dir}/api"/>
- <mkdir dir="${docs.dir}/api"/>
-
- <javadoc packagenames="org.*"
- sourcepath="${java.dir}"
- destdir="${docs.dir}/api">
- <classpath refid="project.class.path" />
- <doclet name="com.sun.tools.doclets.standard.Standard">
- <param name="-author"/>
- <param name="-version"/>
- <param name="-doctitle" value="${Name}"/>
- <param name="-windowtitle" value="${Name} API"/>
- <param name="-bottom"
- value=""Copyright © 1999-2002 Apache Jakarta Project. All
Rights Reserved.""/>
- </doclet>
- </javadoc>
-
- </target>
-
- <target name="anakia-avail">
- <available classname="org.apache.velocity.anakia.AnakiaTask"
- property="AnakiaTask.present">
- <classpath refid="tools.class.path"/>
- </available>
- </target>
-
- <target name="anakia-check" depends="anakia-avail" unless="AnakiaTask.present">
- <echo>
- AnakiaTask is not present! Please check to make sure that
- velocity.jar is in your classpath. The easiest way to build
- the documentation is to checkout avalon-site CVS and specify
- avalon-site.dir property.
- </echo>
- </target>
-
- <target name="xdocs" depends="anakia-check" description="Generate documentation
and website">
- <taskdef name="anakia"
- classname="org.apache.velocity.anakia.AnakiaTask">
- <classpath refid="tools.class.path"/>
- </taskdef>
-
- <anakia basedir="${xdocs.dir}"
- destdir="${docs.dir}"
- style="docs.vsl"
- projectfile="stylesheets/project.xml"
- includes="**/*.xml"
- excludes="stylesheets/** changes.xml"
- velocitypropertiesfile="${xdocs.dir}/stylesheets/velocity.properties"
- />
-
- <copy todir="${docs.dir}" filtering="off">
- <fileset dir="${xdocs.dir}">
- <include name="**/images/**"/>
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- <include name="**/*.css"/>
- <include name="**/*.js"/>
+ <fileset dir="${basedir}/connection-impl/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/datasources-api/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/datasources-impl/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/scheduler-api/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/scheduler-impl/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/sockets-api/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/sockets-impl/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/store-api/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/store-impl/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/threads-api/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/threads-impl/src/java">
+ <patternset refid="src.java.includes"/>
+ </fileset>
+ <fileset dir="${basedir}/threads-tutorial/src/java">
+ <patternset refid="src.java.includes"/>
</fileset>
</copy>
- </target>
-
- <target name="docs" depends="javadocs,xdocs"/>
-
- <!-- Create the binary distribution -->
- <target name="dist-lite" depends="main, docs, javadocs">
-
- <!-- bin.dist.dir usually already specified -->
- <property name="bin.dist.dir" value="dist"/>
- <property name="bin.dist.docs" value="${bin.dist.dir}/docs"/>
-
- <copy todir="${bin.dist.docs}">
- <fileset dir="${docs.dir}"/>
- </copy>
-
- <copy todir="${bin.dist.dir}">
- <fileset dir=".">
- <include name="LICENSE.txt"/>
+ <copy todir="${classes.dir}">
+ <fileset dir="${basedir}/site/etc">
+ <include name="LICENSE.txt"/>
</fileset>
</copy>
-
- <zip zipfile="${bin.dist.dir}/src.zip" compress="false">
- <zipfileset dir="src/java"/>
- </zip>
-
- <copy file="${build.lib}/cornerstone.jar"
tofile="${bin.dist.dir}/cornerstone-${version}.jar"/>
-
- <chmod dir="${bin.dist.dir}" perm="go-rwx" />
-
</target>
- <!-- Completely build all dists -->
- <target name="dist" description="Generates the distribution">
-
- <mkdir dir="${dist.base}"/>
-
- <antcall target="dist-lite" inheritall="false">
- <param name="bin.dist.dir" value="${dist.name}" />
- </antcall>
-
- <zip file="${dist.base}/${dist.name}-bin.zip"
- basedir="${dist.name}/.."
- includes="${dist.name}/**"/>
-
- <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
- <tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
- <include name="${dist.name}/**"/>
- </tarfileset>
- </tar>
-
- <gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
- src="${dist.base}/${dist.name}-bin.tar"/>
-
- <delete file="${dist.base}/${dist.name}-bin.tar"/>
- <delete dir="${dist.name}" />
-
+ <target name="jar" description="o Create the jar" depends="compile">
+ <jar jarfile="${build.dir}/${final.name}.jar" excludes="**/package.html"
+ basedir="${classes.dir}">
+ </jar>
</target>
- <!-- Update the www directory -->
- <target name="site-docs" depends="docs">
-
- <mkdir dir="${www.dir}"/>
-
- <!-- delete all old documents but keep CVS directories -->
- <!-- note that by doing an include the defaultexcludes (CVS dirs) will be kept
-->
- <delete>
- <fileset dir="${www.dir}">
- <include name="**"/>
- </fileset>
+ <target name="clean" description="o Clean up the generated directories">
+ <delete dir="${build.dir}">
</delete>
+ <delete dir="${dist.dir}">
+ </delete>
+ </target>
- <mkdir dir="${www.dir}"/>
- <copy todir="${www.dir}">
- <fileset dir="${docs.dir}" />
+ <target name="dist" description="o Create a distribution" depends="jar, javadoc">
+ <mkdir dir="${dist.dir}"/>
+ <copy todir="${dist.dir}">
+ <fileset dir="${build.dir}" includes="*.jar"/>
+ <fileset dir="${basedir}" includes="LICENSE*, README*"/>
</copy>
-
</target>
- <!-- Cleans up build and distribution directories -->
- <target name="clean" description="Cleans up artifacts from build process">
- <delete dir="${build.dir}" />
- <delete>
- <fileset dir="." includes="**/*~" defaultexcludes="no"/>
- </delete>
-
+ <target name="javadoc" description="o Generate javadoc" depends="jar">
+ <mkdir dir="${javadoc.dir}"/>
+ <tstamp>
+ <format pattern="2001-yyyy" property="year">
+ </format>
+ </tstamp>
+ <property name="copyright"
+ value="Copyright &copy; Apache Software Foundation. All Rights
Reserved."/>
+ <property name="title" value="Cornerstone 1.0"/>
+ <javadoc use="true" private="true" destdir="${javadoc.dir}"
+ author="true" version="true"
+ packagenames="org.apache.avalon.cornerstone.services.threads.*"
+ sourcepathref="src.path">
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar">
+ </include>
+ </fileset>
+ <pathelement location="${build.dir}/${final.name}.jar">
+ </pathelement>
+ </classpath>
+ </javadoc>
</target>
- <!-- Cleans absolutely everything up -->
- <target name="distclean" depends="clean" description="Cleans up all genereated
files and directories">
- <delete dir="${docs.dir}" />
- <delete dir="${dist.base}" />
- <delete dir="${gen.dir}" />
- </target>
+ <target name="get-deps" unless="noget" depends="init">
+ <get dest="${lib.dir}/avalon-framework-4.1.4.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/avalon-framework/jars/avalon-framework-4.1.4.jar"/>
+ <get dest="${lib.dir}/excalibur-datasource-1.1.1.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/excalibur-datasource/jars/excalibur-datasource-1.1.1.jar"/>
+ <get dest="${lib.dir}/excalibur-thread-1.1.1.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/excalibur-thread/jars/excalibur-thread-1.1.1.jar"/>
+ <get dest="${lib.dir}/excalibur-event-1.0.3.jar"
+ usetimestamp="true" ignoreerrors="true"
+
src="http://www.ibiblio.org/maven/excalibur-event/jars/excalibur-event-1.0.3.jar"/>
+ <get dest="${lib.dir}/junit-3.8.1.jar"
+ usetimestamp="true" ignoreerrors="true"
+ src="http://www.ibiblio.org/maven/junit/jars/junit-3.8.1.jar"/>
+ <get dest="${lib.dir}/ant-1.5.jar"
+ usetimestamp="true" ignoreerrors="true"
+ src="http://www.ibiblio.org/maven/ant/jars/ant-1.5.jar"/>
+ <get dest="${lib.dir}/ant-optional-1.5.jar"
+ usetimestamp="true" ignoreerrors="true"
+ src="http://www.ibiblio.org/maven/ant/jars/ant-optional-1.5.jar"/>
- <target name="patch">
- <replace dir="." summary="true"
- token="Avalon Components"
- value="Avalon Components" >
- <include name="**/**/*.*"/>
- <exclude name="**/target/*.*"/>
- </replace>
</target>
-
</project>
-
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
