jefft 02/04/12 22:50:14
Modified: . depchecker.xml dependencies.txt
all build.xml default.properties
datasource build.xml default.properties
Removed: all/src/java/org/apache/avalon/excalibur/datasource
AbstractJdbcConnection.java
DataSourceComponent.java InformixDataSource.java
J2eeDataSource.java Jdbc3Connection.java
JdbcConnection.java JdbcConnectionFactory.java
JdbcConnectionPool.java JdbcDataSource.java
NoAvailableConnectionException.java
NoValidConnectionException.java package.html
Log:
Split datasource off to a separate subproject
Revision Changes Path
1.13 +7 -0 jakarta-avalon-excalibur/depchecker.xml
Index: depchecker.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/depchecker.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- depchecker.xml 13 Apr 2002 01:39:56 -0000 1.12
+++ depchecker.xml 13 Apr 2002 05:50:14 -0000 1.13
@@ -250,6 +250,13 @@
<property name="proj.home" value="${basedir}/../logger"/>
</ant>
</target>
+ <target name="checkDatasource">
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
+ <property name="name" value="excalibur-datasource.jar"/>
+ <property name="path" value="${excalibur-datasource.jar}"/>
+ <property name="proj.home" value="${basedir}/../datasource"/>
+ </ant>
+ </target>
<target name="checkManagerInterfaces">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
<property name="name"
value="excalibur-instrument-manager-interfaces.jar"/>
1.12 +2 -1 jakarta-avalon-excalibur/dependencies.txt
Index: dependencies.txt
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/dependencies.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dependencies.txt 13 Apr 2002 02:15:28 -0000 1.11
+++ dependencies.txt 13 Apr 2002 05:50:14 -0000 1.12
@@ -20,10 +20,11 @@
* altrmi -> framework
* util -> framework
* baxter -> jmxri.jar
+* datasource -> pool, logkit, framework
* event -> collections, concurrent, core, framework, event, util, thread,
threadcontext, pool
* all -> collections, concurrent, instrument, event, component, pool,
logkit, logger, (recursive on fortress, commented out)
* component -> logkit, framework, collections, logger, pool [Unit tests:
junit, util, testcase, instrument (runtime)]
-** fortress -> instrument, instrument-manager, framework, testcase, event
(recursive on mpool in scratchpad), component (test class), logger, util
+* fortress -> instrument, instrument-manager, framework, testcase, event
(recursive on mpool in scratchpad), component (test class), logger, util
instrument-client -> altrmi-client-impl
* instrument-manager -> logkit, logger, framework, core, collections,
instrument, altrmi-common, altrmi-server-impl, altrmi-server-interfaces,
component, pool
* logger -> logkit, framework. [Unit tests: junit, testcase, component,
collections, pool]
1.137 +658 -720 jakarta-avalon-excalibur/all/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/build.xml,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- build.xml 13 Apr 2002 01:07:30 -0000 1.136
+++ build.xml 13 Apr 2002 05:50:14 -0000 1.137
@@ -31,776 +31,714 @@
<!-- Classpath for product -->
<path id="project.class.path">
+ <pathelement path="${java.class.path}" />
+ <pathelement path="${build.classes}" />
+ <pathelement location="${checkstyle.jar}"/>
<pathelement location="${avalon-framework.jar}"/>
+ <pathelement location="${avalon-logkit.jar}"/>
+ <pathelement location="${excalibur-pool.jar}"/>
<pathelement location="${excalibur-collections.jar}"/>
<pathelement location="${excalibur-concurrent.jar}"/>
<pathelement location="${excalibur-instrument.jar}"/>
<pathelement location="${excalibur-component.jar}"/>
<pathelement location="${excalibur-event.jar}"/>
- <pathelement location="${excalibur-pool.jar}"/>
<pathelement location="${excalibur-logger.jar}"/>
+ <pathelement location="${excalibur-datasource.jar}"/>
<!--
for one class in scratchpad. Commented out as this is recursive
<pathelement location="${excalibur-fortress.jar}"/>
-->
<pathelement location="${j2ee.jar}"/>
- <pathelement location="${avalon-logkit.jar}"/>
<pathelement location="${bsf.jar}"/>
<pathelement location="${xerces.jar}"/>
<pathelement location="${xalan.jar}"/>
<pathelement location="${xml-apis.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${junitperf.jar}"/>
<pathelement location="${jaxen.jar}"/>
<pathelement location="${saxpath.jar}"/>
- <pathelement path="${java.class.path}" />
<fileset dir="${lib.dir}">
<include name="*.jar" />
<exclude name="logkit*.jar"/>
<exclude name="avalon-framework*.jar"/>
</fileset>
- <pathelement path="${build.classes}" />
<pathelement path="${build.scratchpad}" />
+ <!-- Unit testing deps -->
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${junitperf.jar}"/>
+ </path>
+ <property name="cp" refid="project.class.path"/>
+
+ <path id="tools.class.path">
+ <pathelement location="${xerces.jar}"/>
+ <pathelement location="${xalan.jar}"/>
+ <pathelement location="${xml-apis.jar}"/>
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${tools.jar}"/>
+ <fileset dir="${tools.dir}/lib">
+ <include name="*.jar" />
+ <exclude name="xerces.jar"/>
+ </fileset>
</path>
- <property name="cp" refid="project.class.path"/>
- <path id="tools.class.path">
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xalan.jar}"/>
- <pathelement location="${xml-apis.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${tools.jar}"/>
- <fileset dir="${tools.dir}/lib">
- <include name="*.jar" />
- <exclude name="xerces.jar"/>
- </fileset>
- </path>
-
- <path id="test.class.path">
- <path refid="tools.class.path"/>
- <path refid="project.class.path"/>
- </path>
-
- <!-- Main target -->
- <target name="main" depends="all" description="generates the Avalon
distribution without the javadocs"/>
-
- <!-- Help on usage -->
- <target name="usage">
- <echo message="Use the -projecthelp option instead"/>
- </target>
-
- <target name="help" depends="usage"/>
-
- <!-- Set up dist properties -->
- <target name="setup-properties" >
-
- <property name="dist.dir" value="dist"/>
- <property name="dist.bin" value="${dist.dir}/bin"/>
- <property name="dist.apps" value="${dist.dir}/apps"/>
- <property name="dist.lib" value="${dist.dir}/lib"/>
- <property name="dist.docs" value="${dist.dir}/docs"/>
- <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
-
- <property name="src.dist.dir" value="dist-src"/>
- <property name="src.dist.src" value="${src.dist.dir}/src"/>
- <property name="src.dist.docs" value="${src.dist.dir}/docs"/>
- <property name="src.dist.javadocs" value="${src.dist.dir}/docs/api"/>
- <property name="src.dist.lib" value="${src.dist.dir}/lib"/>
- <property name="src.dist.tools" value="${src.dist.dir}/tools"/>
- </target>
-
- <!-- Checks the environment for existing resources -->
- <target name="check-environment">
- <available property="log4j.present"
classname="org.apache.log4j.Category">
- <classpath refid="project.class.path"/>
- </available>
- <available property="xpath.present"
classname="org.apache.xpath.XPathAPI">
- <classpath refid="project.class.path"/>
- </available>
- <available property="datasource.present"
classname="javax.sql.DataSource">
- <classpath refid="project.class.path"/>
- </available>
- <available property="jdbc3.present" classname="java.sql.Savepoint">
- <classpath refid="project.class.path"/>
- </available>
- <available property="informix.present"
classname="com.informix.jdbc.IfxDriver">
- <classpath refid="project.class.path"/>
- </available>
- <available property="servlet.present" classname="javax.servlet.Servlet">
- <classpath refid="project.class.path"/>
- </available>
- <available property="jaxen.present" classname="org.jaxen.dom.XPath">
- <classpath refid="project.class.path"/>
- </available>
- <available property="jms.present" classname="javax.jms.Queue">
- <classpath refid="project.class.path"/>
- </available>
- <available property="jaxen.present" classname="org.jaxen.dom.XPath">
- <classpath refid="project.class.path"/>
- </available>
- </target>
-
- <target name="check-datasource" depends="check-environment"
if="datasource.present">
- <property name="j2ee.present" value="true"/>
- </target>
-
- <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
-
- <target name="filter-jdbc" unless="jdbc3.present">
- <filter token="JDBC3_START" value="/*"/>
- <filter token="JDBC3_END" value="*/"/>
- </target>
-
- <target name="nofilter-jdbc" if="jdbc3.present">
- <filter token="JDBC3_START" value=""/>
- <filter token="JDBC3_END" value=""/>
- </target>
-
- <!-- Prepares the build directory -->
- <target name="prepare"
depends="check-datasource,setup-properties,prepare-jdbc">
- <tstamp/>
- <mkdir dir="${build.dir}"/>
- </target>
-
- <target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFramework"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogkit"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkCommon"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCollections"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkConcurrent"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkComponent"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkEvent"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkPool"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
- <ant antfile="${depchecker.prefix}/depchecker.xml" target="checkLogger"/>
- <!--
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="name" value="excalibur-fortress.jar"/>
- <property name="path" value="${excalibur-fortress.jar}"/>
- <property name="proj.home" value="${basedir}/../fortress"/>
- </ant>
- -->
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="name" value="xerces.jar"/>
- <property name="path" value="${xerces.jar}"/>
- </ant>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
- <property name="name" value="xalan.jar"/>
- <property name="path" value="${xalan.jar}"/>
- </ant>
- <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredClass">
- <property name="name" value="xml-apis.jar"/>
- <property name="class" value="javax.xml.parsers.SAXParser"/>
- <property name="classpath" value="${cp}"/>
- </ant>
- </target>
-
- <!-- Compiles the source code -->
- <target name="compile" depends="prepare, dependencies"
description="Compiles the source code">
-
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.scratchpad}"/>
-
- <!-- Copy patched versions of JdbcConnection classes -->
- <copy
file="${java.dir}/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"
-
tofile="${build.src}/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"
- filtering="yes"/>
- <copy
file="${java.dir}/org/apache/avalon/excalibur/datasource/JdbcConnection.java"
-
tofile="${build.src}/org/apache/avalon/excalibur/datasource/JdbcConnection.java"
- filtering="yes"/>
-
-<!--
- <copy todir="${build.scratchpad}">
- <fileset dir="${scratchpad.dir}">
- <include name="**/test/**"/>
- <exclude name="**/test/*.java"/>
- </fileset>
- </copy>
-
- <copy todir="${build.classes}">
- <fileset dir="${test.dir}">
- <include name="**/test/**"/>
- <exclude name="**/test/*.java"/>
- </fileset>
- </copy>
--->
+ <path id="test.class.path">
+ <path refid="tools.class.path"/>
+ <path refid="project.class.path"/>
+ </path>
-<!--
- <depend closure="yes"
+ <!-- Main target -->
+ <target name="main" depends="all" description="generates the Avalon
distribution without the javadocs"/>
+
+ <!-- Help on usage -->
+ <target name="usage">
+ <echo message="Use the -projecthelp option instead"/>
+ </target>
+
+ <target name="help" depends="usage"/>
+
+ <!-- Set up dist properties -->
+ <target name="setup-properties" >
+
+ <property name="dist.dir" value="dist"/>
+ <property name="dist.bin" value="${dist.dir}/bin"/>
+ <property name="dist.apps" value="${dist.dir}/apps"/>
+ <property name="dist.lib" value="${dist.dir}/lib"/>
+ <property name="dist.docs" value="${dist.dir}/docs"/>
+ <property name="dist.javadocs" value="${dist.dir}/docs/api"/>
+
+ <property name="src.dist.dir" value="dist-src"/>
+ <property name="src.dist.src" value="${src.dist.dir}/src"/>
+ <property name="src.dist.docs" value="${src.dist.dir}/docs"/>
+ <property name="src.dist.javadocs" value="${src.dist.dir}/docs/api"/>
+ <property name="src.dist.lib" value="${src.dist.dir}/lib"/>
+ <property name="src.dist.tools" value="${src.dist.dir}/tools"/>
+ </target>
+
+
+
+ <!-- Checks the environment for existing resources -->
+ <target name="check-environment">
+ <available property="log4j.present"
classname="org.apache.log4j.Category">
+ <classpath refid="project.class.path"/>
+ </available>
+ <available property="xpath.present"
classname="org.apache.xpath.XPathAPI">
+ <classpath refid="project.class.path"/>
+ </available>
+ <available property="datasource.present"
classname="javax.sql.DataSource">
+ <classpath refid="project.class.path"/>
+ </available>
+ <available property="servlet.present"
classname="javax.servlet.Servlet">
+ <classpath refid="project.class.path"/>
+ </available>
+ <available property="jaxen.present" classname="org.jaxen.dom.XPath">
+ <classpath refid="project.class.path"/>
+ </available>
+ <available property="jms.present" classname="javax.jms.Queue">
+ <classpath refid="project.class.path"/>
+ </available>
+ <available property="jaxen.present" classname="org.jaxen.dom.XPath">
+ <classpath refid="project.class.path"/>
+ </available>
+ </target>
+
+ <!-- Prepares the build directory -->
+ <target name="prepare" depends="setup-properties">
+ <tstamp/>
+ <mkdir dir="${build.dir}"/>
+ </target>
+
+ <target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFramework"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkLogkit"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCollections"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkConcurrent"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkInstrument"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkComponent"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkEvent"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkPool"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkLogger"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkDatasource"/>
+ <!--
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
+ <property name="name" value="excalibur-fortress.jar"/>
+ <property name="path" value="${excalibur-fortress.jar}"/>
+ <property name="proj.home" value="${basedir}/../fortress"/>
+ </ant>
+ -->
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
+ <property name="name" value="xerces.jar"/>
+ <property name="path" value="${xerces.jar}"/>
+ </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredFile">
+ <property name="name" value="xalan.jar"/>
+ <property name="path" value="${xalan.jar}"/>
+ </ant>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkRequiredClass">
+ <property name="name" value="xml-apis.jar"/>
+ <property name="class" value="javax.xml.parsers.SAXParser"/>
+ <property name="classpath" value="${cp}"/>
+ </ant>
+ </target>
+
+ <target name="compile" depends="compile-main, compile-scratchpad"
description="Compiles the source code"/>
+
+ <!-- Compiles the source code -->
+ <target name="compile-main" depends="prepare, dependencies">
+
+ <mkdir dir="${build.classes}"/>
+
+ <!--
+ <copy todir="${build.classes}">
+ <fileset dir="${test.dir}">
+ <include name="**/test/**"/>
+ <exclude name="**/test/*.java"/>
+ </fileset>
+ </copy>
+ -->
+
+ <!--
+ <depend closure="yes"
cache="${dep}"
srcdir="${java.dir}"
destdir="${build.classes}" />
--->
- <!-- Compile the Special Classes that had to be patched. -->
- <javac srcdir="${build.src}"
- destdir="${build.classes}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- deprecation="${build.deprecation}"
- target="1.2">
- <classpath refid="project.class.path" />
- </javac>
-
- <!-- Compile all classes excluding the tests. They are compiled in
their own task -->
- <javac srcdir="${java.dir}"
- destdir="${build.classes}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- deprecation="${build.deprecation}"
- target="1.2">
- <classpath refid="project.class.path" />
- <exclude name="**/test/**"/>
- <exclude name="**/Log4J*"
- unless="log4j.present"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/J2eeDataSource.java"
- unless="j2ee.present"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/InformixDataSource.java"
- unless="informix.present"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/Jdbc2Connection.java"/>
- <exclude name="**/Jaxen*"
- unless="jaxen.present"/>
- <exclude
name="org/apache/avalon/excalibur/xml/xpath/XPathProcessorImpl.java"
- unless="xpath.present"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/Jdbc3Connection.java"
- unless="jdbc3.present"/>
- <exclude
name="org/apache/avalon/excalibur/logger/factory/ServletTargetFactory.java"
- unless="servlet.present"/>
- <exclude
name="org/apache/avalon/excalibur/logger/factory/JMSTargetFactory.java"
- unless="jms.present"/>
- <exclude
name="org/apache/avalon/excalibur/logger/factory/JDBCTargetFactory.java"
- unless="datasource.present"/>
- <exclude
name="org/apache/avalon/excalibur/xml/xpath/JaxenProcessorImpl.java"
- unless="jaxen.present"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/JdbcConnection.java"/>
- </javac>
-
- <javac srcdir="${scratchpad.dir}"
- destdir="${build.scratchpad}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- deprecation="${build.deprecation}"
- target="1.2">
- <classpath refid="project.class.path" />
- <exclude name="**/test/**"/>
- </javac>
- </target>
-
- <!-- Compiles all of the tests after copying them into a new src directory
-->
- <target name="compile-tests" depends="compile">
- <!-- Copy over all of the tests applying test filters -->
- <mkdir dir="${build.testsrc}"/>
- <copy todir="${build.testsrc}">
- <filterset>
- <filter token="test.jdbc.driver" value="${test.jdbc.driver}"/>
- <filter token="test.jdbc.url" value="${test.jdbc.url}"/>
- <filter token="test.jdbc.user" value="${test.jdbc.user}"/>
- <filter token="test.jdbc.password" value="${test.jdbc.password}"/>
- </filterset>
-
- <!-- All tests in the src/test directory -->
- <fileset dir="${test.dir}">
- <include name="**/test/**"/>
- <include name="*Test.java"/>
- </fileset>
-
- <!-- All tests in the src/scratchpad directory -->
- <fileset dir="${scratchpad.dir}">
- <include name="**/test/**"/>
- <include name="*Test.java"/>
- </fileset>
- </copy>
-
- <!-- Compile all of the tests -->
- <mkdir dir="${build.testclasses}"/>
- <copy todir="${build.testclasses}">
- <fileset dir="${build.testsrc}">
- <exclude name="**/*.java"/>
- </fileset>
- </copy>
- <javac srcdir="${build.testsrc}"
- destdir="${build.testclasses}"
- debug="${build.debug}"
- optimize="${build.optimize}"
- deprecation="${build.deprecation}"
- target="1.2">
- <classpath refid="test.class.path" />
- </javac>
- </target>
-
- <!-- Run all of the tests and generate an html report -->
- <target name="test" depends="check"/>
- <target name="check" depends="compile-tests" description="perform unit
tests">
- <mkdir dir="${build.testdocs}"/>
- <mkdir dir="${build.reports}"/>
-
- <echo message="Performing Unit Tests" />
- <junit fork="true" printsummary="yes" dir="${build.reports}">
- <formatter type="xml"/> <!-- xml reports for junitreport -->
- <formatter type="plain"/> <!-- text reports for humans -->
-
- <sysproperty key="test.jdbc.driver" value="${test.jdbc.driver}"/>
- <sysproperty key="test.jdbc.url" value="${test.jdbc.url}"/>
- <sysproperty key="test.jdbc.user" value="${test.jdbc.user}"/>
- <sysproperty key="test.jdbc.password" value="${test.jdbc.password}"/>
-
- <classpath>
- <path refid="test.class.path"/>
- <pathelement location="${build.testclasses}"/>
- </classpath>
- <batchtest todir="${build.reports}">
- <fileset dir="${build.testclasses}">
- <include name="**/test/*TestCase.class"/>
- <exclude name="**/test/Abstract*TestCase.class"/>
- <exclude name="**/test/*PerformanceTestCase.class"
unless="test.profile"/>
- <exclude name="**/test/*Profile.class" unless="test.profile"/>
-
- <!-- **** Excalibur tests **** -->
- <!-- Jdbc based tests -->
- <exclude name="**/*JdbcTestCase.class" unless="test.jdbc"/>
-
- <!-- Slow tests only run when test.all property set -->
- <exclude
name="org/apache/avalon/excalibur/logger/test/LogKitManagementTestCase.class"
unless="test.all"/>
- <exclude
name="org/apache/avalon/excalibur/concurrent/test/ReadWriteLockTestCase.class"
unless="test.all"/>
- <exclude
name="org/apache/avalon/excalibur/monitor/test/MonitorTestCase.class"
unless="test.all"/>
-
- <!-- **** Scratchpad tests **** -->
- <!-- Slow tests only run when test.all property set -->
- <exclude
name="org/apache/avalon/excalibur/pool/test/*Multithread*TestCase.class"
unless="test.all"/>
- </fileset>
- </batchtest>
- </junit>
+ -->
- <junitreport todir="${build.reports}">
- <fileset dir="${build.reports}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="frames" todir="${build.testdocs}"/>
- </junitreport>
-
- <!-- Clean up the xml reports used by the junitreport task -->
- <delete>
- <fileset dir="${build.reports}" includes="TEST-*.xml"/>
- <fileset dir="${build.reports}" includes="TESTS-*.xml"/>
- </delete>
- </target>
- <target name="test-all-prep">
- <property name="test.all" value="true"/>
- </target>
- <target name="test-all" depends="test-all-prep, check"/>
-
- <!-- Run a subset of the tests -->
- <target name="test-subset-check" unless="junit.test">
- <fail message="junit.test not specified. Example usage: build
-Djunit.test=**/ResourceLimiting*TestCase.class test-subset" />
- </target>
- <target name="test-subset" depends="test-subset-check, compile-tests"
description="perferm a subset of unit tests">
- <mkdir dir="${build.reports}"/>
-
- <junit fork="true" printsummary="yes" dir="${build.reports}">
- <formatter type="plain" usefile="no"/> <!-- text reports for humans
-->
-
- <sysproperty key="test.jdbc.driver" value="${test.jdbc.driver}"/>
- <sysproperty key="test.jdbc.url" value="${test.jdbc.url}"/>
- <sysproperty key="test.jdbc.user" value="${test.jdbc.user}"/>
- <sysproperty key="test.jdbc.password" value="${test.jdbc.password}"/>
-
- <classpath>
- <path refid="test.class.path"/>
- <pathelement location="${build.testclasses}"/>
- </classpath>
- <batchtest todir="${build.reports}">
- <fileset dir="${build.testclasses}">
- <include name="${junit.test}"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
- <!-- Create the API documentation in build directory -->
- <target name="javadocs-main" depends="prepare-jdbc">
- <delete dir="${build.javadocs}"/>
- <mkdir dir="${build.javadocs}"/>
-
- <mkdir dir="${build.src}"/>
-
- <!-- Copy patched versions of JdbcConnection classes -->
- <copy
file="${java.dir}/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"
-
tofile="${build.src}/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"
- filtering="yes"/>
- <copy
file="${java.dir}/org/apache/avalon/excalibur/datasource/JdbcConnection.java"
-
tofile="${build.src}/org/apache/avalon/excalibur/datasource/JdbcConnection.java"
- filtering="yes"/>
-
- <!-- Ugly hack work around to remove duplicates
- of JdbcConnection so javadoc won't be confused -->
- <copy todir="${build.src}">
- <fileset dir="${java.dir}">
- <!-- copied above with filters -->
- <exclude
name="org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/JdbcConnection.java"/>
-
- <!-- not wanted for javadocs -->
- <exclude
name="org/apache/avalon/excalibur/datasource/Jdbc3Connection.java"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/Jdbc2Connection.java"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/J2eeDataSource.java"
- unless="j2ee.present"/>
- <exclude
name="org/apache/avalon/excalibur/datasource/InformixDataSource.java"
- unless="informix.present"/>
- </fileset>
- </copy>
-
- <javadoc packagenames="org.apache.*"
- sourcepath="${build.src}"
- destdir="${build.javadocs}">
- <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="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
- <param name="-link"
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
- <param name="-link" value="http://jakarta.apache.org/avalon/api/"/>
- <param name="-bottom"
- value=""Copyright © 2001 Apache Jakarta Project. All
Rights Reserved.""/>
- </doclet>
- </javadoc>
-
- <delete dir="${build.src}"/>
- </target>
- <target name="javadocs-scratchpad">
- <delete dir="${build.javadocs-scratchpad}"/>
- <mkdir dir="${build.javadocs-scratchpad}"/>
-
- <javadoc packagenames="org.apache.*"
- sourcepath="${scratchpad.dir}"
- destdir="${build.javadocs-scratchpad}"
- excludepackagenames="**/test">
- <classpath refid="project.class.path" />
- <doclet name="com.sun.tools.doclets.standard.Standard">
- <param name="-author"/>
- <param name="-version"/>
- <param name="-doctitle" value="${Name} Scratchpad"/>
- <param name="-windowtitle" value="${Name} Scratchpad API"/>
- <param name="-link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
- <param name="-link"
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
- <param name="-link" value="http://jakarta.apache.org/avalon/api/"/>
- <param name="-bottom"
- value=""Copyright © 2001 Apache Jakarta Project. All
Rights Reserved.""/>
- </doclet>
- </javadoc>
- </target>
- <target name="javadocs" depends="javadocs-main, javadocs-scratchpad"
description="generates the API documentation"/>
-
- <!-- Create the API documentation in doc/api directory -->
- <target name="local-javadocs" depends="javadocs">
- <!-- Copy the main javadocs -->
- <delete dir="${javadocs.dir}"/>
- <mkdir dir="${javadocs.dir}"/>
-
- <copy todir="${javadocs.dir}">
- <fileset dir="${build.javadocs}" />
- </copy>
-
- <!-- Copy the scratchpad javadocs -->
- <delete dir="${javadocs-scratchpad.dir}"/>
- <mkdir dir="${javadocs-scratchpad.dir}"/>
-
- <copy todir="${javadocs-scratchpad.dir}">
- <fileset dir="${build.javadocs-scratchpad}" />
- </copy>
- </target>
-
- <target name="local-docs" depends="local-javadocs,docs">
- <copy todir="${docs.dir}">
- <fileset dir="${build.docs}"/>
- </copy>
- </target>
-
- <!-- Update the www directory -->
- <target name="site-docs" depends="local-docs">
-
- <!-- delete all old documents but keep CVS directories -->
- <!-- note that by doing an include the defaultexcludes (CVS dirs) will
be kept -->
- <!-- may not exist, so don't fail -->
- <delete quiet="yes">
- <fileset dir="${www.dir}">
- <include name="**"/>
- </fileset>
- </delete>
-
- <mkdir dir="${www.dir}"/>
- <copy todir="${www.dir}">
- <fileset dir="${docs.dir}" />
- </copy>
-
- </target>
-
- <!-- Create the announcements -->
- <target name="announcement" depends="setup-properties"
- if="someone.fixed.me">
- <!-- The xdocs have all migrated into site/xdocs, so this target
breaks. -->
-
- <filter token="Name" value="Avalon Excalibur"/>
- <filter token="name" value="excalibur"/>
- <filter token="version" value="${version}"/>
- <filter token="year" value="${year}"/>
- <filter token="status" value="${status}"/>
- <filter token="release" value="${release}"/>
- <filter token="short-version" value="${short.version}"/>
-
- <mkdir dir="${build.dir}" />
- <mkdir dir="${dist.base}" />
- <mkdir dir="${build.xdocs}" />
-
- <!-- Copy files from jakarta-avalon src/documentation -->
- <copy todir="${build.context}" filtering="on">
- <fileset dir="${context.dir}">
- <exclude name="**/*.gif"/>
- <exclude name="**/*.jpg"/>
- <exclude name="**/*.png"/>
- <exclude name="xdocs/**"/> <!-- use xdocs from excalibur -->
- </fileset>
- </copy>
- <copy todir="${build.context}" filtering="off">
- <fileset dir="${context.dir}">
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- <exclude name="xdocs/**"/> <!-- use xdocs from excalibur -->
- </fileset>
- </copy>
-
- <!-- Copy files from jakarta-excalibur-core src/xdocs -->
- <copy todir="${build.xdocs}" filtering="on">
- <fileset dir="${xdocs.dir}">
- <include name="announcement.xml" />
- <include name="changes.xml" />
- <include name="dtd/*" />
- </fileset>
- </copy>
-
- <style style="${announce2txt}"
in="${build.context}/xdocs/announcement.xml"
- out="Announcement.txt"/>
- <style style="${announce2header}"
in="${build.context}/xdocs/announcement.xml"
- out="${dist.base}/HEADER.html"/>
- <style style="${announce2readme}"
in="${build.context}/xdocs/announcement.xml"
- out="${dist.base}/README.html"/>
- <style style="${announce2site}"
in="${build.context}/xdocs/announcement.xml"
- out="jakarta-news.xml"/>
-
- </target>
-
- <!-- Creates all the .jar files -->
- <target name="all" depends="compile" description="generates the Excalibur
jar files">
-
- <mkdir dir="${build.lib}"/>
-
- <jar jarfile="${build.lib}/${excalibur.name}.jar"
basedir="${build.classes}" compress="${compress.jars}">
- <include name="org/apache/avalon/excalibur/**"/>
- <exclude name="**/test/*"/>
- <exclude name="ListTest*"/>
- </jar>
-
- <jar jarfile="${build.lib}/${scratchpad.name}.jar"
basedir="${build.scratchpad}" compress="${compress.jars}">
- <include name="org/apache/avalon/excalibur/**"/>
- <exclude name="**/test/*"/>
- <exclude name="ListTest*"/>
- </jar>
-
- </target>
-
- <target name="install" depends="all,install-check-cjan">
-
- <mkdir dir="${cjan.lib}" />
- <copy file="${build.lib}/${excalibur.name}.jar" todir="${cjan.lib}"/>
- <copy file="${build.lib}/${scratchpad.name}.jar" todir="${cjan.lib}"/>
-
- </target>
-
- <target name="install-check-cjan" unless="cjan.lib">
- <fail message="cjan.lib not specified." />
- </target>
-
- <target name="uninstall" depends="install-check-cjan">
- <delete file="${build.lib}/${excalibur.name}.jar" dir="${cjan.lib}"/>
- <delete file="${build.lib}/${scratchpad.name}.jar" dir="${cjan.lib}"/>
- </target>
-
- <!-- Create the distribution -->
- <target name="dist-base" depends="all,javadocs,test-all">
-
- <mkdir dir="${dist.dir}"/>
- <copy file="${build.lib}/${excalibur.name}.jar"
tofile="${dist.dir}/${excalibur.name}-${version}.jar"/>
-
- <copy file="${build.lib}/${scratchpad.name}.jar"
tofile="${dist.dir}/${scratchpad.name}-${version}.jar"/>
- <copy file="${avalon-logkit.jar}" todir="${dist.dir}"/>
- <copy file="${avalon-framework.jar}" todir="${dist.dir}"/>
-
- <mkdir dir="${dist.docs}"/>
- <mkdir dir="${dist.javadocs}"/>
- <mkdir dir="${dist.docs}/test"/>
-
- <copy todir="${dist.docs}/test">
- <fileset dir="${build.testdocs}"/>
- </copy>
-
- <copy todir="${dist.docs}">
- <fileset dir="${build.docs}"/>
- </copy>
-
- <copy todir="${dist.javadocs}">
- <fileset dir="${build.javadocs}"/>
- </copy>
-
- <copy todir="${dist.dir}">
- <fileset dir=".">
- <include name="README.txt"/>
- <include name="LICENSE.txt"/>
- <include name="KEYS"/>
- </fileset>
- </copy>
+ <!-- Compile all classes excluding the tests. They are compiled in
their own task -->
+ <javac srcdir="${java.dir}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <exclude name="**/test/**"/>
+ <exclude name="**/Log4J*"
+ unless="log4j.present"/>
+ <exclude name="**/Jaxen*"
+ unless="jaxen.present"/>
+ <exclude
name="org/apache/avalon/excalibur/xml/xpath/XPathProcessorImpl.java"
+ unless="xpath.present"/>
+ <exclude
name="org/apache/avalon/excalibur/logger/factory/ServletTargetFactory.java"
+ unless="servlet.present"/>
+ <exclude
name="org/apache/avalon/excalibur/logger/factory/JMSTargetFactory.java"
+ unless="jms.present"/>
+ <exclude
name="org/apache/avalon/excalibur/logger/factory/JDBCTargetFactory.java"
+ unless="datasource.present"/>
+ <exclude
name="org/apache/avalon/excalibur/xml/xpath/JaxenProcessorImpl.java"
+ unless="jaxen.present"/>
+ </javac>
+ </target>
+
+ <target name="compile-scratchpad" depends="prepare, dependencies">
+
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.scratchpad}"/>
+
+ <!--
+ <copy todir="${build.scratchpad}">
+ <fileset dir="${scratchpad.dir}">
+ <include name="**/test/**"/>
+ <exclude name="**/test/*.java"/>
+ </fileset>
+ </copy>
+ -->
+
+ <javac srcdir="${scratchpad.dir}"
+ destdir="${build.scratchpad}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ <exclude name="**/test/**"/>
+ </javac>
+ </target>
+
+ <!-- Compiles all of the tests after copying them into a new src
directory -->
+ <target name="compile-tests" depends="compile">
+ <!-- Copy over all of the tests applying test filters -->
+ <mkdir dir="${build.testsrc}"/>
+ <copy todir="${build.testsrc}">
+ <filterset>
+ <filter token="test.jdbc.driver"
value="${test.jdbc.driver}"/>
+ <filter token="test.jdbc.url" value="${test.jdbc.url}"/>
+ <filter token="test.jdbc.user"
value="${test.jdbc.user}"/>
+ <filter token="test.jdbc.password"
value="${test.jdbc.password}"/>
+ </filterset>
+
+ <!-- All tests in the src/test directory -->
+ <fileset dir="${test.dir}">
+ <include name="**/test/**"/>
+ <include name="*Test.java"/>
+ </fileset>
+
+ <!-- All tests in the src/scratchpad directory -->
+ <fileset dir="${scratchpad.dir}">
+ <include name="**/test/**"/>
+ <include name="*Test.java"/>
+ </fileset>
+ </copy>
+
+ <!-- Compile all of the tests -->
+ <mkdir dir="${build.testclasses}"/>
+ <copy todir="${build.testclasses}">
+ <fileset dir="${build.testsrc}">
+ <exclude name="**/*.java"/>
+ </fileset>
+ </copy>
+ <javac srcdir="${build.testsrc}"
+ destdir="${build.testclasses}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="test.class.path" />
+ </javac>
+ </target>
+
+ <!-- Run all of the tests and generate an html report -->
+ <target name="test" depends="check"/>
+ <target name="check" depends="compile-tests" description="perform unit
tests">
+ <mkdir dir="${build.testdocs}"/>
+ <mkdir dir="${build.reports}"/>
+
+ <echo message="Performing Unit Tests" />
+ <junit fork="true" printsummary="yes" dir="${build.reports}">
+ <formatter type="xml"/> <!-- xml reports for junitreport -->
+ <formatter type="plain"/> <!-- text reports for humans -->
+
+ <sysproperty key="test.jdbc.driver"
value="${test.jdbc.driver}"/>
+ <sysproperty key="test.jdbc.url" value="${test.jdbc.url}"/>
+ <sysproperty key="test.jdbc.user" value="${test.jdbc.user}"/>
+ <sysproperty key="test.jdbc.password"
value="${test.jdbc.password}"/>
+
+ <classpath>
+ <path refid="test.class.path"/>
+ <pathelement location="${build.testclasses}"/>
+ </classpath>
+ <batchtest todir="${build.reports}">
+ <fileset dir="${build.testclasses}">
+ <include name="**/test/*TestCase.class"/>
+ <exclude name="**/test/Abstract*TestCase.class"/>
+ <exclude name="**/test/*PerformanceTestCase.class"
unless="test.profile"/>
+ <exclude name="**/test/*Profile.class"
unless="test.profile"/>
+
+ <!-- **** Excalibur tests **** -->
+ <!-- Jdbc based tests -->
+ <exclude name="**/*JdbcTestCase.class"
unless="test.jdbc"/>
+
+ <!-- Slow tests only run when test.all property set -->
+ <exclude
name="org/apache/avalon/excalibur/logger/test/LogKitManagementTestCase.class"
unless="test.all"/>
+ <exclude
name="org/apache/avalon/excalibur/concurrent/test/ReadWriteLockTestCase.class"
unless="test.all"/>
+ <exclude
name="org/apache/avalon/excalibur/monitor/test/MonitorTestCase.class"
unless="test.all"/>
+
+ <!-- **** Scratchpad tests **** -->
+ <!-- Slow tests only run when test.all property set -->
+ <exclude
name="org/apache/avalon/excalibur/pool/test/*Multithread*TestCase.class"
unless="test.all"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
+ <junitreport todir="${build.reports}">
+ <fileset dir="${build.reports}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="frames" todir="${build.testdocs}"/>
+ </junitreport>
+
+ <!-- Clean up the xml reports used by the junitreport task -->
+ <delete>
+ <fileset dir="${build.reports}" includes="TEST-*.xml"/>
+ <fileset dir="${build.reports}" includes="TESTS-*.xml"/>
+ </delete>
+ </target>
+ <target name="test-all-prep">
+ <property name="test.all" value="true"/>
+ </target>
+ <target name="test-all" depends="test-all-prep, check"/>
+
+ <!-- Run a subset of the tests -->
+ <target name="test-subset-check" unless="junit.test">
+ <fail message="junit.test not specified. Example usage: build
-Djunit.test=**/ResourceLimiting*TestCase.class test-subset" />
+ </target>
+ <target name="test-subset" depends="test-subset-check, compile-tests"
description="perferm a subset of unit tests">
+ <mkdir dir="${build.reports}"/>
+
+ <junit fork="true" printsummary="yes" dir="${build.reports}">
+ <formatter type="plain" usefile="no"/> <!-- text reports for
humans -->
+
+ <sysproperty key="test.jdbc.driver"
value="${test.jdbc.driver}"/>
+ <sysproperty key="test.jdbc.url" value="${test.jdbc.url}"/>
+ <sysproperty key="test.jdbc.user" value="${test.jdbc.user}"/>
+ <sysproperty key="test.jdbc.password"
value="${test.jdbc.password}"/>
+
+ <classpath>
+ <path refid="test.class.path"/>
+ <pathelement location="${build.testclasses}"/>
+ </classpath>
+ <batchtest todir="${build.reports}">
+ <fileset dir="${build.testclasses}">
+ <include name="${junit.test}"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!-- Create the API documentation in build directory -->
+ <target name="javadocs-main">
+ <delete dir="${build.javadocs}"/>
+ <mkdir dir="${build.javadocs}"/>
+
+ <javadoc packagenames="org.apache.*"
+ sourcepath="${java.dir}"
+ destdir="${build.javadocs}">
+ <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="-link"
value="http://java.sun.com/j2se/1.4/docs/api/"/>
+ <param name="-link"
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
+ <param name="-link"
value="http://jakarta.apache.org/avalon/api/"/>
+ <param name="-bottom"
+ value=""Copyright © 2001 Apache Jakarta
Project. All Rights Reserved.""/>
+ </doclet>
+ </javadoc>
+
+ </target>
+
+ <target name="javadocs-scratchpad">
+ <delete dir="${build.javadocs-scratchpad}"/>
+ <mkdir dir="${build.javadocs-scratchpad}"/>
+
+ <javadoc packagenames="org.apache.*"
+ sourcepath="${scratchpad.dir}"
+ destdir="${build.javadocs-scratchpad}"
+ excludepackagenames="**/test">
+ <classpath refid="project.class.path" />
+ <doclet name="com.sun.tools.doclets.standard.Standard">
+ <param name="-author"/>
+ <param name="-version"/>
+ <param name="-doctitle" value="${Name} Scratchpad"/>
+ <param name="-windowtitle" value="${Name} Scratchpad API"/>
+ <param name="-link"
value="http://java.sun.com/j2se/1.4/docs/api/"/>
+ <param name="-link"
value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
+ <param name="-link"
value="http://jakarta.apache.org/avalon/api/"/>
+ <param name="-bottom"
+ value=""Copyright © 2001 Apache Jakarta
Project. All Rights Reserved.""/>
+ </doclet>
+ </javadoc>
+ </target>
+ <target name="javadocs" depends="javadocs-main, javadocs-scratchpad"
description="generates the API documentation"/>
+
+ <!-- Create the API documentation in doc/api directory -->
+ <target name="local-javadocs" depends="javadocs">
+ <!-- Copy the main javadocs -->
+ <delete dir="${javadocs.dir}"/>
+ <mkdir dir="${javadocs.dir}"/>
+
+ <copy todir="${javadocs.dir}">
+ <fileset dir="${build.javadocs}" />
+ </copy>
+
+ <!-- Copy the scratchpad javadocs -->
+ <delete dir="${javadocs-scratchpad.dir}"/>
+ <mkdir dir="${javadocs-scratchpad.dir}"/>
+
+ <copy todir="${javadocs-scratchpad.dir}">
+ <fileset dir="${build.javadocs-scratchpad}" />
+ </copy>
+ </target>
+
+ <target name="local-docs" depends="local-javadocs,docs">
+ <copy todir="${docs.dir}">
+ <fileset dir="${build.docs}"/>
+ </copy>
+ </target>
+
+ <!-- Update the www directory -->
+ <target name="site-docs" depends="local-docs">
+
+ <!-- delete all old documents but keep CVS directories -->
+ <!-- note that by doing an include the defaultexcludes (CVS dirs)
will be kept -->
+ <!-- may not exist, so don't fail -->
+ <delete quiet="yes">
+ <fileset dir="${www.dir}">
+ <include name="**"/>
+ </fileset>
+ </delete>
+
+ <mkdir dir="${www.dir}"/>
+ <copy todir="${www.dir}">
+ <fileset dir="${docs.dir}" />
+ </copy>
+
+ </target>
+
+ <!-- Create the announcements -->
+ <target name="announcement" depends="setup-properties"
+ if="someone.fixed.me">
+ <!-- The xdocs have all migrated into site/xdocs, so this target
breaks. -->
+
+ <filter token="Name" value="Avalon Excalibur"/>
+ <filter token="name" value="excalibur"/>
+ <filter token="version" value="${version}"/>
+ <filter token="year" value="${year}"/>
+ <filter token="status" value="${status}"/>
+ <filter token="release" value="${release}"/>
+ <filter token="short-version" value="${short.version}"/>
+
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${dist.base}" />
+ <mkdir dir="${build.xdocs}" />
+
+ <!-- Copy files from jakarta-avalon src/documentation -->
+ <copy todir="${build.context}" filtering="on">
+ <fileset dir="${context.dir}">
+ <exclude name="**/*.gif"/>
+ <exclude name="**/*.jpg"/>
+ <exclude name="**/*.png"/>
+ <exclude name="xdocs/**"/> <!-- use xdocs from excalibur -->
+ </fileset>
+ </copy>
+ <copy todir="${build.context}" filtering="off">
+ <fileset dir="${context.dir}">
+ <include name="**/*.gif"/>
+ <include name="**/*.jpg"/>
+ <include name="**/*.png"/>
+ <exclude name="xdocs/**"/> <!-- use xdocs from excalibur -->
+ </fileset>
+ </copy>
+
+ <!-- Copy files from jakarta-excalibur-core src/xdocs -->
+ <copy todir="${build.xdocs}" filtering="on">
+ <fileset dir="${xdocs.dir}">
+ <include name="announcement.xml" />
+ <include name="changes.xml" />
+ <include name="dtd/*" />
+ </fileset>
+ </copy>
+
+ <style style="${announce2txt}"
in="${build.context}/xdocs/announcement.xml"
+ out="Announcement.txt"/>
+ <style style="${announce2header}"
in="${build.context}/xdocs/announcement.xml"
+ out="${dist.base}/HEADER.html"/>
+ <style style="${announce2readme}"
in="${build.context}/xdocs/announcement.xml"
+ out="${dist.base}/README.html"/>
+ <style style="${announce2site}"
in="${build.context}/xdocs/announcement.xml"
+ out="jakarta-news.xml"/>
+
+ </target>
+
+ <!-- Creates all the .jar files -->
+ <target name="all" depends="compile" description="generates the
Excalibur jar files">
+
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/${excalibur.name}.jar"
basedir="${build.classes}" compress="${compress.jars}">
+ <include name="org/apache/avalon/excalibur/**"/>
+ <exclude name="**/test/*"/>
+ <exclude name="ListTest*"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/${scratchpad.name}.jar"
basedir="${build.scratchpad}" compress="${compress.jars}">
+ <include name="org/apache/avalon/excalibur/**"/>
+ <exclude name="**/test/*"/>
+ <exclude name="ListTest*"/>
+ </jar>
+
+ </target>
+
+ <target name="install" depends="all,install-check-cjan">
+
+ <mkdir dir="${cjan.lib}" />
+ <copy file="${build.lib}/${excalibur.name}.jar" todir="${cjan.lib}"/>
+ <copy file="${build.lib}/${scratchpad.name}.jar"
todir="${cjan.lib}"/>
+
+ </target>
+
+ <target name="install-check-cjan" unless="cjan.lib">
+ <fail message="cjan.lib not specified." />
+ </target>
+
+ <target name="uninstall" depends="install-check-cjan">
+ <delete file="${build.lib}/${excalibur.name}.jar" dir="${cjan.lib}"/>
+ <delete file="${build.lib}/${scratchpad.name}.jar"
dir="${cjan.lib}"/>
+ </target>
+
+ <!-- Create the distribution -->
+ <target name="dist-base" depends="all,javadocs,test-all">
+
+ <mkdir dir="${dist.dir}"/>
+ <copy file="${build.lib}/${excalibur.name}.jar"
tofile="${dist.dir}/${excalibur.name}-${version}.jar"/>
+
+ <copy file="${build.lib}/${scratchpad.name}.jar"
tofile="${dist.dir}/${scratchpad.name}-${version}.jar"/>
+ <copy file="${avalon-logkit.jar}" todir="${dist.dir}"/>
+ <copy file="${avalon-framework.jar}" todir="${dist.dir}"/>
+
+ <mkdir dir="${dist.docs}"/>
+ <mkdir dir="${dist.javadocs}"/>
+ <mkdir dir="${dist.docs}/test"/>
+
+ <copy todir="${dist.docs}/test">
+ <fileset dir="${build.testdocs}"/>
+ </copy>
+
+ <copy todir="${dist.docs}">
+ <fileset dir="${build.docs}"/>
+ </copy>
+
+ <copy todir="${dist.javadocs}">
+ <fileset dir="${build.javadocs}"/>
+ </copy>
+
+ <copy todir="${dist.dir}">
+ <fileset dir=".">
+ <include name="README.txt"/>
+ <include name="LICENSE.txt"/>
+ <include name="KEYS"/>
+ </fileset>
+ </copy>
- <chmod dir="${dist.dir}" perm="go-rwx" />
+ <chmod dir="${dist.dir}" perm="go-rwx" />
- </target>
+ </target>
- <target name="printerdocs" depends="javadocs"
+ <target name="printerdocs" depends="javadocs"
description="generates the Excalibur printer documentation">
- <echo message="Printer friendly docs are not yet implemented"/>
- </target>
+ <echo message="Printer friendly docs are not yet implemented"/>
+ </target>
- <!-- Prepares the documentation directory -->
- <target name="docs" depends="javadocs" description="generates the
Excalibur documentation"/>
+ <!-- Prepares the documentation directory -->
+ <target name="docs" depends="javadocs" description="generates the
Excalibur documentation"/>
- <!-- Create the source distribution -->
- <target name="src-dist" depends="setup-properties">
+ <!-- Create the source distribution -->
+ <target name="src-dist" depends="setup-properties">
- <mkdir dir="${src.dist.dir}" />
+ <mkdir dir="${src.dist.dir}" />
- <copy todir="${src.dist.lib}">
- <fileset dir="${lib.dir}">
- <include name="jdom.jar" />
- </fileset>
- </copy>
+ <copy todir="${src.dist.lib}">
+ <fileset dir="${lib.dir}">
+ <include name="jdom.jar" />
+ </fileset>
+ </copy>
- <copy file="${avalon-logkit.jar}" todir="${src.dist.lib}"/>
- <copy file="${avalon-framework.jar}" todir="${src.dist.lib}"/>
+ <copy file="${avalon-logkit.jar}" todir="${src.dist.lib}"/>
+ <copy file="${avalon-framework.jar}" todir="${src.dist.lib}"/>
- <copy todir="${src.dist.src}">
- <fileset dir="${src.dir}"/>
- </copy>
+ <copy todir="${src.dist.src}">
+ <fileset dir="${src.dir}"/>
+ </copy>
- <copy todir="${src.dist.docs}">
- <fileset dir="${build.docs}"/>
- </copy>
+ <copy todir="${src.dist.docs}">
+ <fileset dir="${build.docs}"/>
+ </copy>
- <copy todir="${src.dist.javadocs}">
- <fileset dir="${build.javadocs}"/>
- </copy>
+ <copy todir="${src.dist.javadocs}">
+ <fileset dir="${build.javadocs}"/>
+ </copy>
- <copy todir="${src.dist.dir}">
- <fileset dir=".">
- <include name="README.txt"/>
- <include name="LICENSE.txt"/>
- <include name="build.xml"/>
- </fileset>
- </copy>
+ <copy todir="${src.dist.dir}">
+ <fileset dir=".">
+ <include name="README.txt"/>
+ <include name="LICENSE.txt"/>
+ <include name="build.xml"/>
+ </fileset>
+ </copy>
- <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
+ <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java"
eol="lf"/>
- <chmod dir="${src.dist.dir}" perm="go-rwx" />
+ <chmod dir="${src.dist.dir}" perm="go-rwx" />
- </target>
+ </target>
- <!-- Completely build all dists -->
- <target name="dist" depends="announcement,site-docs"
+ <!-- Completely build all dists -->
+ <target name="dist" depends="announcement,site-docs"
description="generates the Excalibur distribution">
- <mkdir dir="${dist.base}"/>
+ <mkdir dir="${dist.base}"/>
- <antcall target="dist-base">
- <param name="dist.dir" value="${dist.name}" />
- </antcall>
-
- <copy file="${build.lib}/${excalibur.name}.jar"
tofile="${tools.dir}/ext/${excalibur.name}.jar"/>
-
- <copy todir="${dist.name}/docs">
- <fileset dir="${docs.dir}"/>
- </copy>
-
- <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}" />
-
- <antcall target="src-dist">
- <param name="src.dist.dir" value="${dist.name}" />
- </antcall>
-
- <copy todir="${dist.name}">
- <fileset dir="${src.dist.dir}"/>
- </copy>
-
- <delete dir="${src.dist.dir}"/>
-
- <zip file="${dist.base}/${dist.name}-src.zip"
- basedir="${dist.name}/.."
- includes="${dist.name}/**"/>
-
- <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar" >
- <tarfileset dir="${dist.name}/.." mode="755" username="avalon"
group="avalon">
- <include name="${dist.name}/build.sh"/>
- </tarfileset>
- <tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
- <include name="${dist.name}/**"/>
- <exclude name="${dist.name}/build.sh"/>
- </tarfileset>
- </tar>
-
- <gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
- src="${dist.base}/${dist.name}-src.tar"/>
-
- <delete file="${dist.base}/${dist.name}-src.tar"/>
- <delete dir="${dist.name}" />
-
- </target>
-
- <!-- Cleans up build and distribution directories -->
- <target name="clean" depends="setup-properties" description="cleans up the
created directories">
- <delete dir="${build.dir}" />
- <delete dir="${dist.dir}" />
- <delete dir="test" /> <!-- unit testing output directory -->
- <delete>
- <fileset dir="." includes="**/*~" defaultexcludes="no"/>
- </delete>
- </target>
-
- <!-- Cleans absolutely everything up -->
- <target name="distclean" depends="clean" description="cleans up all
generated files and directories">
- <delete dir="${docs.dir}" />
- <delete dir="${dist.base}" />
- <delete dir="${src.dist.dir}" />
- <delete>
- <fileset dir=".">
- <include name="Announcement.txt" />
- <include name="jakarta-news.xml" />
- <include name="junit*.properties" />
- <include name="test.log" />
- </fileset>
- </delete>
- </target>
+ <antcall target="dist-base">
+ <param name="dist.dir" value="${dist.name}" />
+ </antcall>
+
+ <copy file="${build.lib}/${excalibur.name}.jar"
tofile="${tools.dir}/ext/${excalibur.name}.jar"/>
+
+ <copy todir="${dist.name}/docs">
+ <fileset dir="${docs.dir}"/>
+ </copy>
+
+ <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}" />
+
+ <antcall target="src-dist">
+ <param name="src.dist.dir" value="${dist.name}" />
+ </antcall>
+
+ <copy todir="${dist.name}">
+ <fileset dir="${src.dist.dir}"/>
+ </copy>
+
+ <delete dir="${src.dist.dir}"/>
+
+ <zip file="${dist.base}/${dist.name}-src.zip"
+ basedir="${dist.name}/.."
+ includes="${dist.name}/**"/>
+
+ <tar longfile="gnu" tarfile="${dist.base}/${dist.name}-src.tar" >
+ <tarfileset dir="${dist.name}/.." mode="755" username="avalon"
group="avalon">
+ <include name="${dist.name}/build.sh"/>
+ </tarfileset>
+ <tarfileset dir="${dist.name}/.." username="avalon"
group="avalon">
+ <include name="${dist.name}/**"/>
+ <exclude name="${dist.name}/build.sh"/>
+ </tarfileset>
+ </tar>
+
+ <gzip zipfile="${dist.base}/${dist.name}-src.tar.gz"
+ src="${dist.base}/${dist.name}-src.tar"/>
+
+ <delete file="${dist.base}/${dist.name}-src.tar"/>
+ <delete dir="${dist.name}" />
+
+ </target>
+
+ <!-- Cleans up build and distribution directories -->
+ <target name="clean" depends="setup-properties" description="cleans up
the created directories">
+ <delete dir="${build.dir}" />
+ <delete dir="${dist.dir}" />
+ <delete dir="test" /> <!-- unit testing output directory -->
+ <delete>
+ <fileset dir="." includes="**/*~" defaultexcludes="no"/>
+ </delete>
+ </target>
+
+ <!-- Cleans absolutely everything up -->
+ <target name="distclean" depends="clean" description="cleans up all
generated files and directories">
+ <delete dir="${docs.dir}" />
+ <delete dir="${dist.base}" />
+ <delete dir="${src.dist.dir}" />
+ <delete>
+ <fileset dir=".">
+ <include name="Announcement.txt" />
+ <include name="jakarta-news.xml" />
+ <include name="junit*.properties" />
+ <include name="test.log" />
+ </fileset>
+ </delete>
+ </target>
</project>
1.5 +5 -1 jakarta-avalon-excalibur/all/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/default.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- default.properties 8 Apr 2002 13:14:22 -0000 1.4
+++ default.properties 13 Apr 2002 05:50:14 -0000 1.5
@@ -57,6 +57,11 @@
excalibur-logger.lib=${excalibur-logger.home}
excalibur-logger.jar=${excalibur-logger.lib}/excalibur-logger-1.0.jar
+# ----- Excalibur datasource, version 1.0 or later -----
+excalibur-datasource.home=${basedir}/../datasource/dist
+excalibur-datasource.lib=${excalibur-datasource.home}
+excalibur-datasource.jar=${excalibur-datasource.lib}/excalibur-datasource-1.0.jar
+
# ----- Excalibur fortress, version 1.0 or later -----
excalibur-fortress.home=${basedir}/../fortress/dist
excalibur-fortress.lib=${excalibur-fortress.home}
@@ -92,7 +97,6 @@
# Set the properties for intermediate directory
build.dir = build
-build.src = ${build.dir}/src
build.lib = ${build.dir}/lib
build.classes = ${build.dir}/classes
build.scratchpad = ${build.dir}/scratchpad
1.8 +195 -93 jakarta-avalon-excalibur/datasource/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/build.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- build.xml 13 Apr 2002 01:07:31 -0000 1.7
+++ build.xml 13 Apr 2002 05:50:14 -0000 1.8
@@ -14,6 +14,9 @@
<pathelement path="${java.class.path}"/>
<pathelement location="${build.classes}"/>
<pathelement location="${checkstyle.jar}"/>
+ <pathelement location="${avalon-framework.jar}"/>
+ <pathelement location="${avalon-logkit.jar}"/>
+ <pathelement location="${excalibur-pool.jar}"/>
<!-- Unit testing deps -->
<pathelement location="${junit.jar}"/>
</path>
@@ -31,6 +34,9 @@
<target name="dependencies" description="Check dependencies"
unless="skip.dependencies">
<ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkCommon"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkFramework"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkLogkit"/>
+ <ant antfile="${depchecker.prefix}/depchecker.xml"
target="checkPool"/>
</target>
<target name="dependencies-test" depends="dist-jar, dependencies"
@@ -41,10 +47,65 @@
</target>
+
+ <!-- Checks the environment for existing resources -->
+ <target name="check-environment">
+ <available property="datasource.present"
classname="javax.sql.DataSource">
+ <classpath refid="project.class.path"/>
+ </available>
+ <available property="jdbc3.present" classname="java.sql.Savepoint">
+ <classpath refid="project.class.path"/>
+ </available>
+ <available property="informix.present"
classname="com.informix.jdbc.IfxDriver">
+ <classpath refid="project.class.path"/>
+ </available>
+ </target>
+
+ <target name="check-datasource" depends="check-environment"
if="datasource.present">
+ <property name="j2ee.present" value="true"/>
+ </target>
+
+ <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
+
+ <target name="filter-jdbc" unless="jdbc3.present">
+ <filter token="JDBC3_START" value="/*"/>
+ <filter token="JDBC3_END" value="*/"/>
+ </target>
+
+ <target name="nofilter-jdbc" if="jdbc3.present">
+ <filter token="JDBC3_START" value=""/>
+ <filter token="JDBC3_END" value=""/>
+ </target>
+
+ <!-- Prepares the build directory -->
+ <target name="prepare" depends="check-datasource,prepare-jdbc">
+ <tstamp/>
+ <mkdir dir="${build.dir}"/>
+ </target>
+
<!-- Compiles the source code -->
- <target name="compile" depends="dependencies" description="Compiles the
source code">
+ <target name="compile" depends="prepare, dependencies"
description="Compiles the source code">
<mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.src}"/>
+
+ <!-- Copy patched versions of JdbcConnection classes -->
+ <copy
file="${java.dir}/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"
+
tofile="${build.src}/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"
+ filtering="yes"/>
+ <copy
file="${java.dir}/org/apache/avalon/excalibur/datasource/JdbcConnection.java"
+
tofile="${build.src}/org/apache/avalon/excalibur/datasource/JdbcConnection.java"
+ filtering="yes"/>
+
+ <!-- Compile the Special Classes that had to be patched. -->
+ <javac srcdir="${build.src}"
+ destdir="${build.classes}"
+ debug="${build.debug}"
+ optimize="${build.optimize}"
+ deprecation="${build.deprecation}"
+ target="1.2">
+ <classpath refid="project.class.path" />
+ </javac>
<!-- Compile all classes excluding the tests. -->
<javac srcdir="${java.dir}"
@@ -55,6 +116,17 @@
target="1.2">
<classpath refid="project.class.path" />
<include name="**/*.java"/>
+
+ <exclude
name="org/apache/avalon/excalibur/datasource/J2eeDataSource.java"
+ unless="j2ee.present"/>
+ <exclude
name="org/apache/avalon/excalibur/datasource/InformixDataSource.java"
+ unless="informix.present"/>
+ <exclude
name="org/apache/avalon/excalibur/datasource/Jdbc3Connection.java"
+ unless="jdbc3.present"/>
+
+ <!-- These two are filtered and compiled separately -->
+ <exclude
name="org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"/>
+ <exclude
name="org/apache/avalon/excalibur/datasource/JdbcConnection.java"/>
</javac>
<!-- copy resources to same location as .class files -->
@@ -120,11 +192,41 @@
</target>
<!-- Creates all the Javadocs -->
- <target name="javadocs" depends="compile" description="Generates the
javadocs" unless="skip.javadocs">
+ <target name="javadocs" depends="prepare-jdbc" description="Generates
the javadocs" unless="skip.javadocs">
<mkdir dir="${dist.javadocs}"/>
+
+ <mkdir dir="${build.src}"/>
+
+ <!-- Copy patched versions of JdbcConnection classes -->
+ <copy
file="${java.dir}/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"
+
tofile="${build.src}/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"
+ filtering="yes"/>
+ <copy
file="${java.dir}/org/apache/avalon/excalibur/datasource/JdbcConnection.java"
+
tofile="${build.src}/org/apache/avalon/excalibur/datasource/JdbcConnection.java"
+ filtering="yes"/>
+
+ <!-- Ugly hack work around to remove duplicates
+ of JdbcConnection so javadoc won't be confused -->
+ <copy todir="${build.src}">
+ <fileset dir="${java.dir}">
+ <!-- copied above with filters -->
+ <exclude
name="org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java"/>
+ <exclude
name="org/apache/avalon/excalibur/datasource/JdbcConnection.java"/>
+
+ <!-- not wanted for javadocs -->
+ <exclude
name="org/apache/avalon/excalibur/datasource/Jdbc3Connection.java"/>
+ <exclude
name="org/apache/avalon/excalibur/datasource/Jdbc2Connection.java"/>
+ <exclude
name="org/apache/avalon/excalibur/datasource/J2eeDataSource.java"
+ unless="j2ee.present"/>
+ <exclude
name="org/apache/avalon/excalibur/datasource/InformixDataSource.java"
+ unless="informix.present"/>
+ </fileset>
+ </copy>
+
+
<javadoc packagenames="org.apache.*"
- sourcepath="${java.dir}"
+ sourcepath="${build.src}"
destdir="${dist.javadocs}">
<classpath refid="project.class.path" />
<doclet name="com.sun.tools.doclets.standard.Standard">
@@ -256,24 +358,24 @@
</zip>
<!--
- Not supported by released ant but when it is we should enable this
across
- all of the products
+ Not supported by released ant but when it is we should enable this
across
+ all of the products
<tar longfile="gnu" tarfile="${dist.base}/${dist.name}-bin.tar">
- <tarfileset dir="${dist.dir}"
- prefix="${dist.name}"
- username="avalon"
- group="avalon"/>
+ <tarfileset dir="${dist.dir}"
+ prefix="${dist.name}"
+ username="avalon"
+ group="avalon"/>
</tar>
<gzip zipfile="${dist.base}/${dist.name}-bin.tar.gz"
- src="${dist.name}-bin.tar"/>
+ src="${dist.name}-bin.tar"/>
<bzip2 zipfile="${dist.base}/${dist.name}-bin.tar.gz"
- src="${dist.name}-bin.tar"/>
+ src="${dist.name}-bin.tar"/>
<delete file="${dist.base}/${dist.name}-bin.tar"/>
<checksum fileext=".md5">
- <fileset dir="${dist.base}" />
+ <fileset dir="${dist.base}" />
</checksum>
-->
<delete dir="${dist.dir}" />
@@ -303,93 +405,93 @@
<!-- Setup the filters -->
<target name="setup-filters">
- <filter token="Name" value="Avalon ${Name}"/>
- <filter token="name" value="${dir-name}"/>
- <filter token="version" value="${version}"/>
- <filter token="year" value="${year}"/>
- <filter token="status" value="${status}"/>
- <filter token="release" value="${release}"/>
- <filter token="short-version" value="${short.version}"/>
-
- <property name="avalon.base" value="http://jakarta.apache.org/avalon"/>
- <property name="framework.base"
value="http://jakarta.apache.org/avalon/framework"/>
- <property name="phoenix.base"
value="http://jakarta.apache.org/avalon/phoenix"/>
- <property name="cornerstone.base"
value="http://jakarta.apache.org/avalon/cornerstone"/>
- <property name="logkit.base"
value="http://jakarta.apache.org/avalon/logkit"/>
- <property name="testlet.base"
value="http://jakarta.apache.org/avalon/testlet"/>
-
- <filter token="year" value="${year}"/>
- <filter token="AVALON_BASE" value="${avalon.base}"/>
- <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
- <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
- <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
- <filter token="LOGKIT_BASE" value="${logkit.base}"/>
- <filter token="TESTLET_BASE" value="${testlet.base}"/>
+ <filter token="Name" value="Avalon ${Name}"/>
+ <filter token="name" value="${dir-name}"/>
+ <filter token="version" value="${version}"/>
+ <filter token="year" value="${year}"/>
+ <filter token="status" value="${status}"/>
+ <filter token="release" value="${release}"/>
+ <filter token="short-version" value="${short.version}"/>
+
+ <property name="avalon.base"
value="http://jakarta.apache.org/avalon"/>
+ <property name="framework.base"
value="http://jakarta.apache.org/avalon/framework"/>
+ <property name="phoenix.base"
value="http://jakarta.apache.org/avalon/phoenix"/>
+ <property name="cornerstone.base"
value="http://jakarta.apache.org/avalon/cornerstone"/>
+ <property name="logkit.base"
value="http://jakarta.apache.org/avalon/logkit"/>
+ <property name="testlet.base"
value="http://jakarta.apache.org/avalon/testlet"/>
+
+ <filter token="year" value="${year}"/>
+ <filter token="AVALON_BASE" value="${avalon.base}"/>
+ <filter token="FRAMEWORK_BASE" value="${framework.base}"/>
+ <filter token="PHOENIX_BASE" value="${phoenix.base}"/>
+ <filter token="CORNERSTONE_BASE" value="${cornerstone.base}"/>
+ <filter token="LOGKIT_BASE" value="${logkit.base}"/>
+ <filter token="TESTLET_BASE" value="${testlet.base}"/>
</target>
-
-
+
+
<!-- Prepares the documentation directory -->
<target name="docs" depends="setup-filters"> <!-- depends="javadocs"
description="Generates the Docs" -->
- <mkdir dir="${docs.dir}"/>
+ <mkdir dir="${docs.dir}"/>
+
+ <mkdir dir="${build.context}"/>
+ <mkdir dir="${build.xdocs}"/>
+ <mkdir dir="${build.docs}"/>
+ <mkdir dir="${build.dir}/work"/>
+
+ <!-- Base pointers for non-xdocs documentation. Override these in
.ant.properties to link to local docs -->
+ <copy todir="${build.context}" filtering="on">
+ <fileset dir="${context.dir}">
+ <exclude name="diagrams/**"/>
+ <exclude name="resources/**"/>
+ <exclude name="xdocs"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.context}/xdocs" filtering="on" overwrite="yes">
+ <fileset dir="${xdocs.dir}"/>
+ </copy>
+
+ <copy todir="${build.context}/resources" filtering="off"
overwrite="yes">
+ <fileset dir="${context.dir}/resources"/>
+ <fileset dir="${xdocs.dir}">
+ <include name="**/images/**"/>
+ </fileset>
+ </copy>
+
+ <java classname="org.apache.cocoon.Main" fork="true">
+ <arg value="-c${build.context}/"/>
+ <arg value="-d${build.docs}"/>
+ <arg value="-w${build.dir}/work"/>
+ <arg value="-l${build.dir}/work/cocoon.log"/>
+ <arg value="-uINFO"/>
+ <arg value="-f${xdocs.dir}/${dir-name}.uris"/>
+ <classpath>
+ <path refid="tools.class.path"/>
+ <fileset dir="${tools.dir}/ext"/>
+ </classpath>
+ </java>
+
+ <copy todir="${docs.dir}">
+ <fileset dir="${build.docs}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ <!-- hack for stupid transport on api link -->
+ <replace file="${docs.dir}/index.html" token="index.html.xml"
value="index.html"/>
- <mkdir dir="${build.context}"/>
- <mkdir dir="${build.xdocs}"/>
- <mkdir dir="${build.docs}"/>
- <mkdir dir="${build.dir}/work"/>
-
- <!-- Base pointers for non-xdocs documentation. Override these in
.ant.properties to link to local docs -->
- <copy todir="${build.context}" filtering="on">
- <fileset dir="${context.dir}">
- <exclude name="diagrams/**"/>
- <exclude name="resources/**"/>
- <exclude name="xdocs"/>
- </fileset>
- </copy>
-
- <copy todir="${build.context}/xdocs" filtering="on" overwrite="yes">
- <fileset dir="${xdocs.dir}"/>
- </copy>
-
- <copy todir="${build.context}/resources" filtering="off"
overwrite="yes">
- <fileset dir="${context.dir}/resources"/>
- <fileset dir="${xdocs.dir}">
- <include name="**/images/**"/>
- </fileset>
- </copy>
-
- <java classname="org.apache.cocoon.Main" fork="true">
- <arg value="-c${build.context}/"/>
- <arg value="-d${build.docs}"/>
- <arg value="-w${build.dir}/work"/>
- <arg value="-l${build.dir}/work/cocoon.log"/>
- <arg value="-uINFO"/>
- <arg value="-f${xdocs.dir}/${dir-name}.uris"/>
- <classpath>
- <path refid="tools.class.path"/>
- <fileset dir="${tools.dir}/ext"/>
- </classpath>
- </java>
-
- <copy todir="${docs.dir}">
- <fileset dir="${build.docs}">
- <include name="**"/>
- </fileset>
- </copy>
-
- <!-- hack for stupid transport on api link -->
- <replace file="${docs.dir}/index.html" token="index.html.xml"
value="index.html"/>
-
</target>
-
+
<target name="site" depends="javadocs, docs" description=" Places Docs
ready for hosting on website">
-
- <mkdir dir="../site/dist/docs/${dir-name}"/>
- <copy todir="../site/dist/docs/${dir-name}">
- <fileset dir="${docs.dir}">
- <include name="**"/>
- </fileset>
- </copy>
-
+
+ <mkdir dir="../site/dist/docs/${dir-name}"/>
+ <copy todir="../site/dist/docs/${dir-name}">
+ <fileset dir="${docs.dir}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
</target>
<!-- Cleans up build and distribution directories -->
1.3 +23 -0 jakarta-avalon-excalibur/datasource/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/datasource/default.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- default.properties 8 Apr 2002 10:32:09 -0000 1.2
+++ default.properties 13 Apr 2002 05:50:14 -0000 1.3
@@ -11,6 +11,28 @@
version=1.0
year=2000-2002
+# --------------------------------------------------
+# REQUIRED LIBRARIES
+# --------------------------------------------------
+
+# ----- Avalon Framework -----
+avalon-framework.home=${basedir}/../../jakarta-avalon
+avalon-framework.lib=${avalon-framework.home}/build/lib
+avalon-framework.jar=${avalon-framework.lib}/avalon-framework.jar
+
+# ----- Logkit -----
+avalon-logkit.home=${basedir}/../../jakarta-avalon-logkit
+avalon-logkit.lib=${avalon-logkit.home}/build/lib
+avalon-logkit.jar=${avalon-logkit.lib}/logkit.jar
+
+# ----- Excalibur pool, version 1.0 or later -----
+excalibur-pool.home=${basedir}/../pool/dist
+excalibur-pool.lib=${excalibur-pool.home}
+excalibur-pool.jar=${excalibur-pool.lib}/excalibur-pool-1.0.jar
+
+
+# --------------------------------------------------
+
# Settings used to configure compile environment
build.debug = on
build.optimize = off
@@ -20,6 +42,7 @@
# location of intermediate products
build.dir = build
+build.src = ${build.dir}/src
build.lib = ${build.dir}/lib
build.conf = ${build.dir}/conf
build.classes = ${build.dir}/classes
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
