You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/04/05 00:53:56 UTC
cvs commit: avalon-apps/demo/src/xdocs/stylesheets changes.vsl docs.vsl project.xml templates.vm velocity.properties
donaldp 2003/04/04 14:53:56
Modified: demo build.xml
Removed: demo/src/xdocs demo-altrmi-helloworld.xml
demo-helloworld.xml demo-lifecycle.xml index.xml
demo/src/xdocs/css ns4_only.css print.css site.css
tigris.css
demo/src/xdocs/dtd changes-v10.dtd characters.ent
document-v10.dtd faq-v10.dtd specification-v10.dtd
todo-v10.dtd
demo/src/xdocs/images apache-avalon-logo.png build.gif
code.gif design.gif header.gif update.gif
demo/src/xdocs/stylesheets changes.vsl docs.vsl project.xml
templates.vm velocity.properties
Log:
Docs merged into package.htmls and rest of cruft axed
Revision Changes Path
1.86 +10 -215 avalon-apps/demo/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-apps/demo/build.xml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- build.xml 23 Mar 2003 23:59:03 -0000 1.85
+++ build.xml 4 Apr 2003 22:53:56 -0000 1.86
@@ -2,9 +2,11 @@
<project name="Demo Apps" default="main" basedir=".">
- <!-- ==========================================================================================
- PROPERTY SETUP
- ========================================================================================== -->
+ <!--
+ ==========================================================================================
+ PROPERTY SETUP
+ ==========================================================================================
+ -->
<!-- set up properties -->
<property file="${user.home}/build.properties"/>
@@ -25,10 +27,6 @@
<property name="build.metagenerate" value="${build.dir}/metagenerate"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.classes" value="${build.dir}/classes"/>
- <property name="build.javadocs" value="${build.dir}/javadocs"/>
- <property name="build.docs" value="${build.dir}/docs"/>
- <property name="build.context" value="${build.dir}/documentation"/>
- <property name="build.xdocs" value="${build.context}/content/xdocs"/>
<!-- Set the properties for source directories -->
<property name="src.dir" value="src"/>
@@ -36,11 +34,6 @@
<property name="manifest.dir" value="${src.dir}/manifest"/>
<property name="conf.dir" value="${src.dir}/conf"/>
<property name="context.dir" value="../../avalon/src/documentation"/>
- <property name="xdocs.dir" value="${src.dir}/xdocs"/>
- <property name="tools.dir" location="../../avalon/tools"/>
- <property name="docs.dir" value="${build.dir}/docs"/>
-
- <property name="www.dir" value="../../avalon-site/site"/>
<property name="altrmi.ver" value="0.9.1"/>
@@ -54,9 +47,9 @@
</fileset>
</path>
- <property name="avalon-site.dir" value="../../avalon-site"/>
+ <property name="avalon-site.dir" value="../../avalon-site"/>
<path id="tools.class.path">
- <fileset dir="${avalon-site.dir}/lib"/>
+ <fileset dir="${avalon-site.dir}/lib"/>
</path>
<taskdef name="sar" classname="org.apache.avalon.phoenix.tools.tasks.Sar">
@@ -206,8 +199,7 @@
</target>
- <target name="main" depends="sars" description="Default target to generate build products minus docs"/>
- <target name="all" depends="main,docs" description="Generate build products including docs"/>
+ <target name="main" depends="sars" description="Default target to generate build products"/>
<target name="sars" depends="jars, demo-sar, rmidemo-sar, altrmidemo-sar, lifecycledemo-sar" description="Create SARs">
@@ -286,7 +278,7 @@
<include name="altrmi-generator-${altrmi.ver}.jar"/>
<include name="altrmi-blocks-${altrmi.ver}.jar"/>
<include name="altrmi-registry-${altrmi.ver}.jar"/>
- <include name="excalibur-thread*.jar"/>
+ <include name="excalibur-thread*.jar"/>
<include name="excalibur-pool*.jar"/>
<include name="excalibur-collections*.jar"/>
</lib>
@@ -314,11 +306,6 @@
</target>
-
- <!-- Performs unit tests -->
- <target name="check" depends="compile" description="Perform any built in tests">
- </target>
-
<!-- Performs rmi related unit tests -->
<target name="check-rmi" depends="compile">
<java classname="org.apache.avalon.apps.demos.rmihelloworldserver.RMIHelloWorldClient">
@@ -338,7 +325,6 @@
</java>
</target>
-
<!-- Performs unit tests -->
<target name="rmi-demo-test" depends="check-rmi" description="Change the HelloWorld message via the RMI API (a test aid)"/>
@@ -369,60 +355,14 @@
<delete file="${dist.base}/${dist.name}-bin.tar"/>
<delete dir="${dist.name}"/>
- <antcall target="src-dist" inheritAll="false">
- <param name="src.dist.dir" value="${dist.name}"/>
- </antcall>
-
- <zip zipfile="${dist.base}/${dist.name}-src.zip"
- basedir="${dist.name}/.."
- includes="${dist.name}/**">
- <fileset dir="..">
- <include name="common/lib/altrmi*"/>
- <include name="common/lib/avalon-*"/>
- <include name="common/lib/cornerstone.jar"/>
- <include name="common/lib/phoenix-*"/>
- <include name="common/lib/qdox-*"/>
- </fileset>
- </zip>
-
- <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>
- <tarfileset dir=".." username="avalon" group="avalon">
- <include name="common/lib/altrmi*"/>
- <include name="common/lib/avalon-*"/>
- <include name="common/lib/cornerstone.jar"/>
- <include name="common/lib/phoenix-*"/>
- <include name="common/lib/qdox-*"/>
-
- </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>
<!-- Creates all the .sar files -->
- <target name="bin-dist" depends="all">
+ <target name="bin-dist" depends="main">
<!-- bin.dist.dir usually set before this target is called -->
<property name="bin.dist.dir" value="dist"/>
<property name="bin.dist.lib" value="${bin.dist.dir}/lib"/>
- <property name="bin.dist.docs" value="${bin.dist.dir}/docs"/>
-
- <mkdir dir="${bin.dist.docs}"/>
- <copy todir="${bin.dist.docs}">
- <fileset dir="${build.docs}"/>
- </copy>
<copy file="${build.lib}/avalon-demo.sar" tofile="${bin.dist.dir}/avalon-demo-${version}.sar"/>
<copy file="${build.lib}/avalon-lifecycledemo.sar" tofile="${bin.dist.dir}/avalon-lifecycledemo-${version}.sar"/>
@@ -432,36 +372,6 @@
<chmod dir="${bin.dist.dir}" perm="go-rwx"/>
</target>
- <target name="src-dist" depends="docs">
- <!-- src.dist.dir has usually already been set -->
- <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"/>
-
- <mkdir dir="${src.dist.docs}"/>
-
- <copy todir="${src.dist.docs}">
- <fileset dir="${build.docs}"/>
- </copy>
-
- <copy todir="${src.dist.src}">
- <fileset dir="${src.dir}"/>
- </copy>
-
- <zip zipfile="${src.dist.src}/generated-by-metagenerate.zip"
- basedir="${build.metagenerate}"/>
-
- <copy todir="${src.dist.dir}">
- <fileset dir=".">
- <include name="build.xml"/>
- </fileset>
- </copy>
-
- <fixcrlf srcdir="${src.dist.src}/java" includes="**/*.java" eol="lf"/>
-
- <chmod dir="${src.dist.dir}" perm="go-rwx"/>
- </target>
-
<target name="install" depends="main" description="Installs into Phoenix">
<!-- <fail message="install.dir not specified." unless="install.dir"/> -->
<echo message="Installing to ${install.dir}"/>
@@ -491,120 +401,5 @@
<delete dir="${bin.dist.dir}"/>
<delete dir="${dist.base}"/>
</target>
-
- <!-- ==========================================================================================
- DOCUMENTATION GENERATION
- ========================================================================================== -->
-
- <!-- copy docs to site dir -->
- <target name="site" depends="docs" description=" Places docs ready for hosting on website">
- <mkdir dir="../site/build/docs/apps/${dir-name}"/>
- <copy todir="../site/build/docs/apps/${dir-name}">
- <fileset dir="${build.docs}">
- <include name="**"/>
- </fileset>
- </copy>
- </target>
-
- <!-- Creates javadocs -->
- <target name="javadocs" depends="compile" description="Generates the javadocs" unless="skip.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://avalon.apache.org/framework/api/"/>
- <param name="-bottom"
- value=""Copyright © ${year} Apache Avalon Project. All Rights Reserved.""/>
- </doclet>
- </javadoc>
- </target>
-
-
- <target name="anakia-avail">
- <available classname="org.apache.velocity.anakia.AnakiaTask"
- property="AnakiaTask.present">
- <classpath refid="tools.class.path"/>
- </available>
- </target>
-
- <target name="anakia-check" depends="anakia-avail" unless="AnakiaTask.present">
- <echo>
- AnakiaTask is not present! Please check to make sure that
- velocity.jar is in your classpath. The easiest way to build
- the documentation is to checkout avalon-site CVS and specify
- avalon-site.dir property.
-
- You can also run the build target import-avalon-site, to do
- this automatically.
- </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/**, changes.xml, announcement.xml"
- velocitypropertiesfile="src/xdocs/stylesheets/velocity.properties"
- />
-
- <anakia basedir="${xdocs.dir}"
- destdir="${docs.dir}"
- style="changes.vsl"
- projectfile="stylesheets/project.xml"
- includes="changes.xml"
- velocitypropertiesfile="${xdocs.dir}/stylesheets/velocity.properties"
- />
-
- <copy todir="${docs.dir}" filtering="off">
- <fileset dir="${xdocs.dir}">
- <include name="**/images/**"/>
- <include name="**/*.gif"/>
- <include name="**/*.jpg"/>
- <include name="**/*.png"/>
- <include name="**/*.css"/>
- <include name="**/*.js"/>
- </fileset>
- </copy>
- </target>
-
- <!-- Update the www directory -->
- <target name="site-docs" depends="docs" description="Build docs for jakarta site">
-
- <mkdir dir="${www.dir}"/>
-
- <!-- delete all old documents but keep CVS directories -->
- <!-- note that by doing an include the defaultexcludes (CVS dirs) will be kept -->
- <delete>
- <fileset dir="${www.dir}">
- <include name="**"/>
- </fileset>
- </delete>
-
- <mkdir dir="${www.dir}"/>
-
- <copy todir="${www.dir}">
- <fileset dir="${docs.dir}" />
- </copy>
-
- <copy todir="${www.dir}/api">
- <fileset dir="${build.javadocs}" />
- </copy>
-
- </target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org