donaldp 02/03/29 01:39:41
Modified: db build.xml
Log:
Remove ^Ms
Revision Changes Path
1.44 +243 -243 jakarta-avalon-apps/db/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-apps/db/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.xml 28 Mar 2002 20:15:15 -0000 1.43
+++ build.xml 29 Mar 2002 09:39:41 -0000 1.44
@@ -1,5 +1,5 @@
-<?xml version="1.0"?>
-
+<?xml version="1.0"?>
+
<project default="main" basedir=".">
<!--
@@ -35,14 +35,14 @@
<property name="manifest.dir" value="${src.dir}/manifest"/>
<property name="conf.dir" value="${src.dir}/conf"/>
<property name="docs.dir" value="docs"/>
-
- <property name="build.xdocs" value="${build.dir}/xdocs"/>
- <property name="build.context" value="${build.dir}/documentation"/>
- <property name="build.docs" value="${build.dir}/docs"/>
- <property name="tools.dir" value="../../jakarta-avalon/tools"/>
- <property name="xdocs.dir" value="${src.dir}/xdocs"/>
- <property name="context.dir"
value="../../jakarta-avalon/src/documentation"/>
- <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
+
+ <property name="build.xdocs" value="${build.dir}/xdocs"/>
+ <property name="build.context" value="${build.dir}/documentation"/>
+ <property name="build.docs" value="${build.dir}/docs"/>
+ <property name="tools.dir" value="../../jakarta-avalon/tools"/>
+ <property name="xdocs.dir" value="${src.dir}/xdocs"/>
+ <property name="context.dir"
value="../../jakarta-avalon/src/documentation"/>
+ <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
<property name="dist.base" value="distributions"/>
@@ -54,82 +54,82 @@
<include name="*.jar" />
</fileset>
</path>
-
- <path id="test.path">
- <pathelement path="${build.classes}" />
- <pathelement path="lib/commons-altrmi-common.jar" />
- <pathelement path="lib/commons-altrmi-client-interfaces.jar" />
- <pathelement path="lib/commons-altrmi-client-impl.jar" />
- <pathelement path="build/genclasses" />
- </path>
-
- <path id="tools.class.path">
- <pathelement location="${junit.jar}"/>
- <pathelement location="${tools.jar}"/>
- <fileset dir="${tools.dir}/lib"/>
- <fileset dir="${tools.dir}/ext"/>
- </path>
+
+ <path id="test.path">
+ <pathelement path="${build.classes}" />
+ <pathelement path="lib/commons-altrmi-common.jar" />
+ <pathelement path="lib/commons-altrmi-client-interfaces.jar" />
+ <pathelement path="lib/commons-altrmi-client-impl.jar" />
+ <pathelement path="build/genclasses" />
+ </path>
+
+ <path id="tools.class.path">
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${tools.jar}"/>
+ <fileset dir="${tools.dir}/lib"/>
+ <fileset dir="${tools.dir}/ext"/>
+ </path>
<taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
<classpath refid="project.class.path" />
</taskdef>
-
- <taskdef name="altrmiproxies"
classname="org.apache.commons.altrmi.generator.ant.AltrmiProxyTask">
- <classpath refid="project.class.path" />
- </taskdef>
+
+ <taskdef name="altrmiproxies"
classname="org.apache.commons.altrmi.generator.ant.AltrmiProxyTask">
+ <classpath refid="project.class.path" />
+ </taskdef>
<!-- Help on usage -->
<target name="help" depends="usage"/>
<target name="usage">
<echo message="Run ant -projecthelp to get a list of targets to run"/>
</target>
-
- <!-- Setup the filters -->
- <target name="setup-filters">
- <filter token="Name" value="Avalon Apps - AvalonDB"/>
- <filter token="name" value="db"/>
- <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>
-
-
+
+ <!-- Setup the filters -->
+ <target name="setup-filters">
+ <filter token="Name" value="Avalon Apps - AvalonDB"/>
+ <filter token="name" value="db"/>
+ <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>
+
+
<!-- Compiles project -->
<target name="compile">
<mkdir dir="${build.classes}"/>
- <mkdir dir="build/genjava"/>
- <mkdir dir="build/genclasses"/>
+ <mkdir dir="build/genjava"/>
+ <mkdir dir="build/genclasses"/>
<available classname="electric.registry.Registry"
classpathref="project.class.path"
property="glue.present"/>
-
- <available classname="java.sql.Savepoint"
- classpathref="project.class.path"
- property="jdbc30.present"/>
-
- <available classname="javax.xml.parsers.DocumentBuilderFactory"
- classpathref="project.class.path"
- property="DocumentBuilderFactory.present"/>
+
+ <available classname="java.sql.Savepoint"
+ classpathref="project.class.path"
+ property="jdbc30.present"/>
+
+ <available classname="javax.xml.parsers.DocumentBuilderFactory"
+ classpathref="project.class.path"
+ property="DocumentBuilderFactory.present"/>
<javac srcdir="${java.dir}"
destdir="${build.classes}"
@@ -137,55 +137,55 @@
optimize="${build.optimize}"
deprecation="${build.deprecation}">
<classpath refid="project.class.path" />
-
- <exclude name="org/apache/avalon/db/driver/jdbc30/**"
- unless="jdbc30.present" />
- <exclude name="org/apache/avalon/db/driver/jdbc2x/**"
- if="jdbc30.present" />
-
- <exclude name="org/apache/avalon/db/transport/altrmi/client/jdbc30/**"
- unless="jdbc30.present" />
- <exclude name="org/apache/avalon/db/transport/altrmi/client/jdbc2x/**"
- if="jdbc30.present" />
- <exclude
name="org/apache/avalon/db/transport/soap/client/glue/jdbc30/**"
- unless="jdbc30.present" />
- <exclude
name="org/apache/avalon/db/transport/soap/client/glue/jdbc2x/**"
- if="jdbc30.present" />
- <exclude
name="org/apache/avalon/db/transport/cmdstream/client/jdbc30/**"
- unless="jdbc30.present" />
- <exclude
name="org/apache/avalon/db/transport/cmdstream/client/jdbc2x/**"
- if="jdbc30.present" />
- <exclude name="org/apache/avalon/db/transport/soap/client/glue/**"
- unless="glue.present" />
- <exclude name="org/apache/avalon/db/test/TestGUI.java"
- unless="DocumentBuilderFactory.present" />
- <exclude name="org/apache/avalon/db/**LXSQL**"
- unless="DocumentBuilderFactory.present" />
+
+ <exclude name="org/apache/avalon/db/driver/jdbc30/**"
+ unless="jdbc30.present" />
+ <exclude name="org/apache/avalon/db/driver/jdbc2x/**"
+ if="jdbc30.present" />
+
+ <exclude name="org/apache/avalon/db/transport/altrmi/client/jdbc30/**"
+ unless="jdbc30.present" />
+ <exclude name="org/apache/avalon/db/transport/altrmi/client/jdbc2x/**"
+ if="jdbc30.present" />
+ <exclude
name="org/apache/avalon/db/transport/soap/client/glue/jdbc30/**"
+ unless="jdbc30.present" />
+ <exclude
name="org/apache/avalon/db/transport/soap/client/glue/jdbc2x/**"
+ if="jdbc30.present" />
+ <exclude
name="org/apache/avalon/db/transport/cmdstream/client/jdbc30/**"
+ unless="jdbc30.present" />
+ <exclude
name="org/apache/avalon/db/transport/cmdstream/client/jdbc2x/**"
+ if="jdbc30.present" />
+ <exclude name="org/apache/avalon/db/transport/soap/client/glue/**"
+ unless="glue.present" />
+ <exclude name="org/apache/avalon/db/test/TestGUI.java"
+ unless="DocumentBuilderFactory.present" />
+ <exclude name="org/apache/avalon/db/**LXSQL**"
+ unless="DocumentBuilderFactory.present" />
</javac>
-
- <altrmiproxies genname="AvalonDB" srcgendir="build/genjava"
- interfaces="org.apache.avalon.db.services.DatabaseManager"
- classgendir="build/genclasses">
- <classpath>
- <pathelement location="lib/commons-altrmi-client-interfaces.jar"/>
- <pathelement location="lib/commons-altrmi-client-impl.jar"/>
- <pathelement location="lib/commons-altrmi-common.jar"/>
- <pathelement location="lib/commons-altrmi-generator.jar"/>
- <pathelement path="${build.classes}"/>
- </classpath>
+
+ <altrmiproxies genname="AvalonDB" srcgendir="build/genjava"
+ interfaces="org.apache.avalon.db.services.DatabaseManager"
+ classgendir="build/genclasses">
+ <classpath>
+ <pathelement location="lib/commons-altrmi-client-interfaces.jar"/>
+ <pathelement location="lib/commons-altrmi-client-impl.jar"/>
+ <pathelement location="lib/commons-altrmi-common.jar"/>
+ <pathelement location="lib/commons-altrmi-generator.jar"/>
+ <pathelement path="${build.classes}"/>
+ </classpath>
</altrmiproxies>
-
- <!--
-
- <classpath>
- <pathelement location="lib/commons-altrmi-common.jar"/>
- <pathelement location="lib/commons-altrmi-generator.jar"/>
- <pathelement path="build/classes"/>
- <pathelement path="${java.class.path}" />
- </classpath>
-
--->
-
+
+ <!--
+
+ <classpath>
+ <pathelement location="lib/commons-altrmi-common.jar"/>
+ <pathelement location="lib/commons-altrmi-generator.jar"/>
+ <pathelement path="build/classes"/>
+ <pathelement path="${java.class.path}" />
+ </classpath>
+
+-->
+
<copy todir="${build.classes}">
<fileset dir="${java.dir}">
<exclude name="**/test/**"/>
@@ -257,28 +257,28 @@
<lib dir="lib">
<include name="bsf.jar"/>
<include name="js.jar"/>
- <include name="jakarta-regexp.jar"/>
+ <include name="jakarta-regexp.jar"/>
</lib>
<lib dir="lib/" >
- <include name="commons-altrmi-server-*.jar"/>
- <include name="commons-altrmi-common.jar"/>
- <include name="commons-altrmi-generator.jar"/>
- </lib>
-
- <lib dir="lib/" >
+ <include name="commons-altrmi-server-*.jar"/>
+ <include name="commons-altrmi-common.jar"/>
+ <include name="commons-altrmi-generator.jar"/>
+ </lib>
+
+ <lib dir="lib/" >
<include name="cornerstone.jar"/>
- </lib>
+ </lib>
</sar>
-
- <mkdir dir="dist"/>
-
- <copy todir="dist">
- <fileset dir="${build.lib}">
- <include name="**"/>
- </fileset>
- </copy>
+
+ <mkdir dir="dist"/>
+
+ <copy todir="dist">
+ <fileset dir="${build.lib}">
+ <include name="**"/>
+ </fileset>
+ </copy>
</target>
@@ -310,24 +310,24 @@
<!-- Completely build all dists -->
<target name="dist" depends="sars" description="Generates the
distribution">
-
- <property name="dist.name" value="${Name}-${version}"/>
+
+ <property name="dist.name" value="${Name}-${version}"/>
<zip zipfile="dist/${dist.name}-src.zip">
- <fileset dir=".">
- <include name="src/**"/>
- <include name="lib/**"/>
- <include name="build.xml"/>
- <include name="readme.txt"/>
- </fileset>
- </zip>
+ <fileset dir=".">
+ <include name="src/**"/>
+ <include name="lib/**"/>
+ <include name="build.xml"/>
+ <include name="readme.txt"/>
+ </fileset>
+ </zip>
<tar longfile="gnu" tarfile="dist/${dist.name}-src.tar" >
<tarfileset dir="${dist.name}/.." username="avalon" group="avalon">
- <include name="src/**"/>
- <include name="lib/**"/>
- <include name="build.xml"/>
- <include name="readme.txt"/>
+ <include name="src/**"/>
+ <include name="lib/**"/>
+ <include name="build.xml"/>
+ <include name="readme.txt"/>
</tarfileset>
</tar>
@@ -381,7 +381,7 @@
<echo message="Installing to ${install.dir}" />
<copy file="${build.lib}/avalon-db.sar" todir="${install.dir}" />
<delete file="${installvar.dir}/avalon-db-install.log" />
- <delete file="${install.dir}/avalon-db/SAR-INF/lib/avalon-db.jar" />
+ <delete file="${install.dir}/avalon-db/SAR-INF/lib/avalon-db.jar" />
<delete dir="${install.dir}/avalon-db" />
</target>
@@ -403,106 +403,106 @@
<delete dir="${docs.dir}" />
<delete dir="${bin.dist.dir}" />
<delete dir="${dist.base}" />
- <delete dir="dist" />
+ <delete dir="dist" />
+ </target>
+
+ <!-- Prepares the documentation directory -->
+ <target name="docs" depends="setup-filters"> <!-- depends="javadocs"
description="Generates the Docs" -->
+ <mkdir dir="${docs.dir}"/>
+
+ <mkdir dir="${build.context}"/>
+ <mkdir dir="${build.xdocs}"/>
+ <mkdir dir="${build.docs}"/>
+ <mkdir dir="${build.dir}/work"/>
+ <!-- <mkdir dir="../../docs/apps/db"/> -->
+
+ <!-- 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}/cornerstone.uris"/>
+ <classpath>
+ <path refid="tools.class.path"/>
+ <fileset dir="${tools.dir}/ext"/>
+ </classpath>
+ </java>
+
+ <copy todir="docs">
+ <fileset dir="${build.docs}">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
</target>
- <!-- Prepares the documentation directory -->
- <target name="docs" depends="setup-filters"> <!-- depends="javadocs"
description="Generates the Docs" -->
- <mkdir dir="${docs.dir}"/>
-
- <mkdir dir="${build.context}"/>
- <mkdir dir="${build.xdocs}"/>
- <mkdir dir="${build.docs}"/>
- <mkdir dir="${build.dir}/work"/>
- <!-- <mkdir dir="../../docs/apps/db"/> -->
-
- <!-- 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}/cornerstone.uris"/>
- <classpath>
- <path refid="tools.class.path"/>
- <fileset dir="${tools.dir}/ext"/>
- </classpath>
- </java>
-
- <copy todir="docs">
- <fileset dir="${build.docs}">
- <include name="**"/>
- </fileset>
- </copy>
-
- </target>
-
- <target name="site" depends="docs" description=" Places Docs ready for
hosting on website">
-
- <mkdir dir="../site/docs/apps/db"/>
- <copy todir="../site/docs/apps/db">
- <fileset dir="docs">
- <include name="**"/>
- </fileset>
- </copy>
-
- </target>
-
-
- <target name="testl1" depends="main">
- <property name="script" location="src/scripts/lxsql/Test1.script"/>
- <java classname="org.apache.avalon.db.test.Tester" fork="true">
- <arg value="lxsql"/>
- <arg value="${script}"/>
- <classpath refid="test.path"/>
- </java>
- </target>
-
- <target name="testl2" depends="main">
- <property name="script" location="src/scripts/lxsql/Test2.script"/>
- <java classname="org.apache.avalon.db.test.Tester" fork="true">
- <arg value="lxsql"/>
- <arg value="${script}"/>
- <classpath refid="test.path"/>
- </java>
- </target>
-
- <target name="testl3" depends="main">
- <property name="script" location="src/scripts/lxsql/Test3.script"/>
- <java classname="org.apache.avalon.db.test.Tester" fork="true">
- <arg value="lxsql"/>
- <arg value="${script}"/>
- <classpath refid="test.path"/>
- </java>
- </target>
-
- <target name="tests1" depends="main">
- <property name="script" location="src/scripts/sql/Test1.script"/>
- <java classname="org.apache.avalon.db.test.Tester" fork="true">
- <arg value="sql"/>
- <arg value="${script}"/>
- <classpath refid="test.path"/>
- </java>
- </target>
+ <target name="site" depends="docs" description=" Places Docs ready for
hosting on website">
+
+ <mkdir dir="../site/docs/apps/db"/>
+ <copy todir="../site/docs/apps/db">
+ <fileset dir="docs">
+ <include name="**"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+
+ <target name="testl1" depends="main">
+ <property name="script" location="src/scripts/lxsql/Test1.script"/>
+ <java classname="org.apache.avalon.db.test.Tester" fork="true">
+ <arg value="lxsql"/>
+ <arg value="${script}"/>
+ <classpath refid="test.path"/>
+ </java>
+ </target>
+
+ <target name="testl2" depends="main">
+ <property name="script" location="src/scripts/lxsql/Test2.script"/>
+ <java classname="org.apache.avalon.db.test.Tester" fork="true">
+ <arg value="lxsql"/>
+ <arg value="${script}"/>
+ <classpath refid="test.path"/>
+ </java>
+ </target>
+
+ <target name="testl3" depends="main">
+ <property name="script" location="src/scripts/lxsql/Test3.script"/>
+ <java classname="org.apache.avalon.db.test.Tester" fork="true">
+ <arg value="lxsql"/>
+ <arg value="${script}"/>
+ <classpath refid="test.path"/>
+ </java>
+ </target>
+
+ <target name="tests1" depends="main">
+ <property name="script" location="src/scripts/sql/Test1.script"/>
+ <java classname="org.apache.avalon.db.test.Tester" fork="true">
+ <arg value="sql"/>
+ <arg value="${script}"/>
+ <classpath refid="test.path"/>
+ </java>
+ </target>
</project>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
