donaldp 2002/07/06 20:21:00 Modified: converter build.xml default.properties converter/src/xdocs index.xml Added: converter/src/xdocs/stylesheets project.xml Removed: converter README.txt converter/src/xdocs book.xml converter.uris converter/src/xdocs/dtd changes-v10.dtd characters.ent document-v10.dtd faq-v10.dtd todo-v10.dtd converter/src/xdocs/images build.gif code.gif design.gif update.gif Log: Move to anakia. Revision Changes Path 1.6 +43 -80 jakarta-avalon-excalibur/converter/build.xml Index: build.xml =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/converter/build.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- build.xml 6 Jul 2002 05:44:25 -0000 1.5 +++ build.xml 7 Jul 2002 03:21:00 -0000 1.6 @@ -19,9 +19,7 @@ <path id="tools.class.path"> <pathelement location="${junit.jar}"/> - <pathelement location="${tools.jar}"/> - <fileset dir="${tools.dir}/lib"/> - <fileset dir="${tools.dir}/ext"/> + <fileset dir="${jakarta-site.dir}/lib"/> </path> <path id="test.class.path"> @@ -363,84 +361,48 @@ </target> - <!-- 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}"/> - </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"/> - - <!-- 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 name="anakia-avail"> + <available classname="org.apache.velocity.anakia.AnakiaTask" + property="AnakiaTask.present"> + <classpath refid="tools.class.path"/> + </available> + </target> + + <target name="anakia-check" depends="anakia-avail" unless="AnakiaTask.present"> + <echo> + AnakiaTask is not present! Please check to make sure that + velocity.jar is in your classpath. The easiest way to build + the documentation is to checkout 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> + <anakia basedir="${xdocs.dir}" + destdir="${docs.dir}" + style="docs.vsl" + projectfile="stylesheets/project.xml" + includes="**/*.xml" + excludes="stylesheets/**" + 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="javadocs, docs" description=" Places Docs ready for hosting on website"> @@ -461,6 +423,7 @@ <delete dir="${dist.dir}" /> <delete dir="test" /> <!-- unit testing output directory --> <delete> + <fileset dir="." includes="velocity.*"/> <fileset dir="." includes="**/*~" defaultexcludes="no"/> </delete> </target> 1.2 +1 -1 jakarta-avalon-excalibur/converter/default.properties Index: default.properties =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/converter/default.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- default.properties 27 Apr 2002 05:23:00 -0000 1.1 +++ default.properties 7 Jul 2002 03:21:00 -0000 1.2 @@ -52,11 +52,11 @@ context.dir = ../../jakarta-avalon/src/documentation tools.dir = ../../jakarta-avalon/tools tools.jar = ${java.home}/../lib/tools.jar -docs.dir = docs xdocs.dir = ${src.dir}/xdocs # Set the properties for distribution directories dist.dir = dist +docs.dir = ${dist.dir}/docs dist.javadocs = ${dist.dir}/docs/api src.dist.dir= src-dist src.dist.src= ${src.dist.dir}/src 1.2 +12 -20 jakarta-avalon-excalibur/converter/src/xdocs/index.xml Index: index.xml =================================================================== RCS file: /home/cvs/jakarta-avalon-excalibur/converter/src/xdocs/index.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- index.xml 27 Apr 2002 05:23:01 -0000 1.1 +++ index.xml 7 Jul 2002 03:21:00 -0000 1.2 @@ -1,24 +1,16 @@ -<?xml version="1.0"?> - -<!DOCTYPE document SYSTEM "dtd/document-v10.dtd"> - +<?xml version="1.0" encoding="UTF-8"?> <document> - <header> + <properties> <title>Excalibur Converter - Overview</title> - <authors> - <person name="Peter Donald" email="[EMAIL PROTECTED]"/> - </authors> - </header> + + <author email="[EMAIL PROTECTED]">Peter Donald</author> + + </properties> <body> - <s1 title="Introduction"> - <p>Avalon Excalibur's Convertert utilities are in package - <code>org.apache.excalibur.converter</code>.</p> - </s1> + <section name="Introduction"> + <p>The converter package is a set of classes that can be used + to convert a java object from one type to another type.</p> + </section> </body> - <footer> - <legal> - Copyright (c) @year@ The Jakarta Apache Project All rights reserved. - $Revision$ $Date$ - </legal> - </footer> -</document> + +</document> \ No newline at end of file 1.1 jakarta-avalon-excalibur/converter/src/xdocs/stylesheets/project.xml Index: project.xml =================================================================== <?xml version="1.0"?> <project name="Excalibur Converter" href="http://jakarta.apache.org/avalon/excalibur/converter"> <title>Excalibur Converter</title> <body> <menu name="About"> <item name="Overview" href="/index.html"/> <item name="Excalibur Home" href="http://jakarta.apache.org/avalon/excalibur/index.html"/> <item name="Download" href="http://jakarta.apache.org/builds/jakarta-avalon-excalibur/release/converter"/> <item name="API Docs" href="/api/index.html"/> </menu> </body> </project>
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>