bloritsch 2003/02/28 08:40:11
Modified: instrument-manager build.xml default.properties
instrument-manager/src/xdocs index.xml
Log:
fix docs build
Revision Changes Path
1.35 +15 -48 avalon-excalibur/instrument-manager/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-manager/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- build.xml 17 Feb 2003 21:23:09 -0000 1.34
+++ build.xml 28 Feb 2003 16:40:10 -0000 1.35
@@ -23,7 +23,6 @@
<path id="tools.class.path">
<pathelement location="${junit.jar}"/>
- <fileset dir="${jakarta-site.dir}/lib"/>
</path>
<path id="test.class.path">
@@ -182,7 +181,7 @@
<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="-link" value="http://avalon.apache.org/api/"/>
<param name="-bottom"
value=""Copyright © ${year} Apache Jakarta Project.
All Rights Reserved.""/>
</doclet>
@@ -327,58 +326,26 @@
</target>
- <target name="anakia-avail">
- <available classname="org.apache.velocity.anakia.AnakiaTask"
- property="AnakiaTask.present">
- <classpath refid="tools.class.path"/>
- </available>
- </target>
+ <target name="docs" description="Generate documentation and website">
+ <ant antfile="${basedir}/../forrestbuild.xml"/>
- <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 jakarta-site CVS and specify
- jakarta-site.dir property.
- </echo>
- </target>
-
- <target name="docs" depends="anakia-check" description="Generate documentation
and website">
- <taskdef name="anakia"
- classname="org.apache.velocity.anakia.AnakiaTask">
- <classpath refid="tools.class.path"/>
- </taskdef>
+ <copy todir="${docs.dir}">
+ <fileset dir="${build.docs}">
+ <include name="**"/>
+ </fileset>
+ </copy>
- <anakia basedir="${xdocs.dir}"
- destdir="${docs.dir}"
- style="docs.vsl"
- projectfile="menu.xml"
- includes="**/*.xml"
- excludes="menu.xml"
- velocitypropertiesfile="../site/src/stylesheets/velocity.properties"
- />
-
- <copy todir="${docs.dir}" filtering="off">
- <fileset dir="../site/src" includes="css/*.css" />
- <fileset dir="${xdocs.dir}">
- <include name="**/images/**"/>
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- <include name="**/*.css"/>
- <include name="**/*.js"/>
- </fileset>
- </copy>
</target>
<target name="site" depends="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>
1.17 +7 -1 avalon-excalibur/instrument-manager/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-manager/default.properties,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- default.properties 27 Feb 2003 12:03:33 -0000 1.16
+++ default.properties 28 Feb 2003 16:40:10 -0000 1.17
@@ -62,9 +62,15 @@
xdocs.dir = ${src.dir}/xdocs
docs.dir = ${dist.dir}/docs
-jakarta-site.dir = ../../jakarta-site
tools.dir = ../../avalon/tools
+# needed by Cocoon
+build.context = ${build.dir}/documentation
+build.docs = ${build.dir}/docs
+build.xdocs = ${build.dir}/xdocs
+context.dir = ../../avalon/src/documentation
+tools.jar = ${java.home}/../lib/tools.jar
+docs.dir = docs
# name of .zip/.tar.gz/.bz2 files and their top-level directory
dist.name = ${name}-${version}
1.5 +15 -11 avalon-excalibur/instrument-manager/src/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon-excalibur/instrument-manager/src/xdocs/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 27 Feb 2003 12:03:34 -0000 1.4
+++ index.xml 28 Feb 2003 16:40:11 -0000 1.5
@@ -1,17 +1,21 @@
<?xml version="1.0"?>
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.1//EN"
"document-v11.dtd">
<document>
- <properties>
- <title>Excalibur Instrument-Manager - Overview</title>
- <author email="[EMAIL PROTECTED]">Avalon Documentation
- Team</author>
- </properties>
+ <header>
+ <title>Excalibur Instrument-Manager - Overview</title>
+ <authors>
+ <person name="Avalon Documentation Team" email="[EMAIL PROTECTED]"/>
+ </authors>
+ </header>
<body>
- <section name="See the Instrument package docs">
- <p>Documentation for Instrument, Instrument-Client and
- Instrument-Manager is maintained in a single location:
- <a href="http://avalon.apache.org/excalibur/instrument";>the
- instrument package homepage</a>.</p>
- </section>
+ <section><title>See the Instrument package docs</title>
+ <p>
+ Documentation for Instrument, Instrument-Client and
+ Instrument-Manager is maintained in a single location:
+ <link href="http://avalon.apache.org/excalibur/instrument";>the
+ instrument package homepage</link>.
+ </p>
+ </section>
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
