You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/06/20 02:15:02 UTC
svn commit: rev 21456 - in avalon/trunk: central/site central/site/src/xdocs/central central/site/src/xdocs/central/laboratory central/site/src/xdocs/central/laboratory/discovery central/site/src/xdocs/central/laboratory/studio central/site/src/xdocs/products central/site/src/xdocs/products/discovery central/site/src/xdocs/products/legacy central/site/src/xdocs/products/runtime/execmodes central/site/src/xdocs/products/runtime/javadoc central/system central/system/build planet/tutorials/dynamics planet/tutorials/hello runtime runtime/activation runtime/activation/api runtime/activation/impl runtime/composition runtime/composition/api runtime/composition/impl runtime/composition/spi runtime/framework runtime/framework/api runtime/framework/impl runtime/framework/legacy runtime/logging runtime/logging/api runtime/logging/impl runtime/logging/log4j runtime/logging/logkit/api runtime/logging/logkit/impl runtime/logging/logkit/plugins/datagram runtime/logging/logkit/plugins/socket runtime/logging/logkit/plugins/syslog runtime/logging/spi runtime/logging/test runtime/logkit runtime/main runtime/merlin/api runtime/merlin/cli runtime/merlin/impl runtime/merlin/unit runtime/meta runtime/meta/api runtime/meta/impl runtime/meta/spi runtime/meta/tools runtime/repository runtime/repository/api runtime/repository/cli runtime/repository/impl runtime/repository/main runtime/repository/spi runtime/repository/test runtime/repository/util runtime/test runtime/test/components runtime/test/dynamics runtime/test/includes runtime/test/playground runtime/test/testa runtime/test/testb runtime/test/testc runtime/test/testd runtime/test/teste runtime/util runtime/util/configuration runtime/util/criteria runtime/util/defaults runtime/util/env runtime/util/exception runtime/util/extension runtime/util/extension/api runtime/util/extension/impl runtime/util/i18n runtime/util/lifecycle tools/magic/src/main/org/apache/avalon/tools tools/magic/src/main/org/apache/avalon/tools/project tools/magic/src/main/org/apache/avalon/tools/tasks
Author: mcconnell
Date: Sat Jun 19 17:15:01 2004
New Revision: 21456
Added:
avalon/trunk/central/site/src/xdocs/central/laboratory/discovery/
- copied from rev 21442, avalon/trunk/central/site/src/xdocs/products/discovery/
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PublishTask.java
Removed:
avalon/trunk/central/site/src/xdocs/products/discovery/
Modified:
avalon/trunk/central/site/build.properties
avalon/trunk/central/site/build.xml
avalon/trunk/central/site/src/xdocs/central/laboratory/discovery/index.xml
avalon/trunk/central/site/src/xdocs/central/laboratory/navigation.xml
avalon/trunk/central/site/src/xdocs/central/laboratory/studio/index.xml
avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml
avalon/trunk/central/site/src/xdocs/central/navigation.xml
avalon/trunk/central/site/src/xdocs/products/legacy/index.xml
avalon/trunk/central/site/src/xdocs/products/navigation.xml
avalon/trunk/central/site/src/xdocs/products/runtime/execmodes/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/index.xml
avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/navigation.xml
avalon/trunk/central/system/build/reactor.xml
avalon/trunk/central/system/build/standard.xml
avalon/trunk/central/system/index.xml
avalon/trunk/planet/tutorials/dynamics/build.xml
avalon/trunk/planet/tutorials/hello/build.xml
avalon/trunk/runtime/activation/api/build.xml
avalon/trunk/runtime/activation/build.xml
avalon/trunk/runtime/activation/impl/build.xml
avalon/trunk/runtime/build.xml
avalon/trunk/runtime/composition/api/build.xml
avalon/trunk/runtime/composition/build.xml
avalon/trunk/runtime/composition/impl/build.xml
avalon/trunk/runtime/composition/spi/build.xml
avalon/trunk/runtime/framework/api/build.xml
avalon/trunk/runtime/framework/build.xml
avalon/trunk/runtime/framework/impl/build.xml
avalon/trunk/runtime/framework/legacy/build.xml
avalon/trunk/runtime/logging/api/build.xml
avalon/trunk/runtime/logging/build.xml
avalon/trunk/runtime/logging/impl/build.xml
avalon/trunk/runtime/logging/log4j/build.xml
avalon/trunk/runtime/logging/logkit/api/build.xml
avalon/trunk/runtime/logging/logkit/impl/build.xml
avalon/trunk/runtime/logging/logkit/plugins/datagram/build.xml
avalon/trunk/runtime/logging/logkit/plugins/socket/build.xml
avalon/trunk/runtime/logging/logkit/plugins/syslog/build.xml
avalon/trunk/runtime/logging/spi/build.xml
avalon/trunk/runtime/logging/test/build.xml
avalon/trunk/runtime/logkit/build.xml
avalon/trunk/runtime/main/build.properties
avalon/trunk/runtime/main/build.xml
avalon/trunk/runtime/merlin/api/build.xml
avalon/trunk/runtime/merlin/cli/build.xml
avalon/trunk/runtime/merlin/impl/build.xml
avalon/trunk/runtime/merlin/unit/build.xml
avalon/trunk/runtime/meta/api/build.xml
avalon/trunk/runtime/meta/build.xml
avalon/trunk/runtime/meta/impl/build.xml
avalon/trunk/runtime/meta/spi/build.xml
avalon/trunk/runtime/meta/tools/build.xml
avalon/trunk/runtime/repository/api/build.xml
avalon/trunk/runtime/repository/build.xml
avalon/trunk/runtime/repository/cli/build.xml
avalon/trunk/runtime/repository/impl/build.xml
avalon/trunk/runtime/repository/main/build.xml
avalon/trunk/runtime/repository/spi/build.xml
avalon/trunk/runtime/repository/test/build.xml
avalon/trunk/runtime/repository/util/build.xml
avalon/trunk/runtime/test/build.xml
avalon/trunk/runtime/test/components/build.xml
avalon/trunk/runtime/test/dynamics/build.xml
avalon/trunk/runtime/test/includes/build.xml
avalon/trunk/runtime/test/playground/build.xml
avalon/trunk/runtime/test/testa/build.xml
avalon/trunk/runtime/test/testb/build.xml
avalon/trunk/runtime/test/testc/build.xml
avalon/trunk/runtime/test/testd/build.xml
avalon/trunk/runtime/test/teste/build.xml
avalon/trunk/runtime/util/build.xml
avalon/trunk/runtime/util/configuration/build.xml
avalon/trunk/runtime/util/criteria/build.xml
avalon/trunk/runtime/util/defaults/build.xml
avalon/trunk/runtime/util/env/build.xml
avalon/trunk/runtime/util/exception/build.xml
avalon/trunk/runtime/util/extension/api/build.xml
avalon/trunk/runtime/util/extension/build.xml
avalon/trunk/runtime/util/extension/impl/build.xml
avalon/trunk/runtime/util/i18n/build.xml
avalon/trunk/runtime/util/lifecycle/build.xml
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/antlib.xml
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Definition.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java
avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
Log:
A bunch of updates including changes to the javadoc task to generate cotent directory into a central doc repository, the ability to apply javadoc execution to a project other than the executing project, addition of a publish task to handle the population of a doc repository, site updates including moving discovery to the lab, and site build procedure definition updates to sync. with doc repository usage, and updating of build.xml files to use "install" as the default target.
Modified: avalon/trunk/central/site/build.properties
==============================================================================
--- avalon/trunk/central/site/build.properties (original)
+++ avalon/trunk/central/site/build.properties Sat Jun 19 17:15:01 2004
@@ -4,4 +4,4 @@
project.xdoc.anchor.url = https://svn.apache.org/repos/asf/avalon/trunk/central/site/src/xdocs
project.xdoc.logo.left.file = images/feather.jpg
-products.runtime.path = products/runtime
\ No newline at end of file
+project.javadoc.enabled = true
Modified: avalon/trunk/central/site/build.xml
==============================================================================
--- avalon/trunk/central/site/build.xml (original)
+++ avalon/trunk/central/site/build.xml Sat Jun 19 17:15:01 2004
@@ -11,14 +11,18 @@
token="RUNTIME-VERSION"/>
</target>
- <target name="prepare" depends="standard.prepare">
- <x:javadoc root="${products.runtime.path}" title="Merlin Runtime"
- id="avalon-merlin-impl"/>
+ <target name="javadoc">
+ <x:javadoc title="Merlin Runtime" id="avalon-runtime">
+ <x:link href="http://java.sun.com/j2se/1.4/docs/api" />
+ </x:javadoc>
</target>
- <target name="xdocs" depends="xdoc"/>
- <target name="xdoc" depends="standard.init">
- <x:xdoc theme="modern"/>
+ <target name="site" depends="standard.site">
+ <x:publish path="."/>
+ </target>
+
+ <target name="update" depends="xdoc">
+ <x:publish path="."/>
</target>
</project>
Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/discovery/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/discovery/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/discovery/index.xml Sat Jun 19 17:15:01 2004
@@ -6,7 +6,7 @@
</properties>
<body>
- <section name="Introducing Merlin Discovery">
+ <section name="Merlin Discovery">
<p>
Existing business requirements for services supporting the creation and maintenance of repositories capable of supporting the registration and discovery of XML based descriptions of services and implementation solution are required as part of the overall Avalon product development strategy.
</p>
Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/navigation.xml Sat Jun 19 17:15:01 2004
@@ -23,8 +23,8 @@
<body>
<menu>
- <item name="Magic" href="magic/index.html"/>
<item name="Studio" href="studio/index.html"/>
+ <item name="Discovery" href="discovery/index.html"/>
</menu>
</body>
Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/index.xml Sat Jun 19 17:15:01 2004
@@ -3,14 +3,14 @@
<document>
<properties>
- <title>Merlin Developer - Overview</title>
+ <title>Merlin Studio</title>
<author email="dev@avalon.apache.org">Avalon Documentation Team</author>
</properties>
<body>
<section name="Introduction">
<p>
- The <em><strong>Merlin Developer</strong></em> is an Eclipse plugin
+ Merlin Studio is an Eclipse plugin
that allows you to streamline the development of Merlin-based
components and applications.
</p>
Modified: avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/laboratory/studio/navigation.xml Sat Jun 19 17:15:01 2004
@@ -21,12 +21,14 @@
<title>Merlin Developer</title>
<body>
- <menu>
+ <menu>
+ <!--
<item name="Installation" href="installation/index.html"/>
<item name="Getting Started" href="getting-started/index.html"/>
<item name="User Manual" href="manual/index.html"/>
<item name="Reference" href="reference/index.html"/>
- <item name="Developing Plug-ins" href="developing-plugins/index.html"/>
+ <item name="Developing Plug-ins" href="developing-plugins/index.html"/>
+ -->
</menu>
</body>
Modified: avalon/trunk/central/site/src/xdocs/central/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/central/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/central/navigation.xml Sat Jun 19 17:15:01 2004
@@ -30,8 +30,8 @@
<item name="Community" href="community/index.html"/>
<item name="Concepts" href="cop/index.html"/>
<item name="Resources" href="resources/index.html"/>
+ <item name="Avalon Laboratory" href="laboratory/index.html"/>
<item name="DPML" href="dpml/index.html"/>
- <!-- <item name="Laboratory" href="laboratory/index.html"/> -->
<!-- <item name="Legacy" href="legacy/index.html"/> -->
</menu>
</body>
Modified: avalon/trunk/central/site/src/xdocs/products/legacy/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/legacy/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/legacy/index.xml Sat Jun 19 17:15:01 2004
@@ -6,7 +6,7 @@
</properties>
<body>
- <section name="Legacy Avalon Products">
+ <section name="Legacy Products">
<p>
Several Apache Avalon products have been either retired or
spun off into their own Apache projects. For a more detailed
@@ -52,16 +52,6 @@
<a href="http://loom.codehaus.org">Loom</a> project, a
fork of Phoenix.
</td>
- </tr>
- <tr>
- <td>Logkit</td>
- <td>LogKit is a full logging framework similar to Log4J.</td>
- <td>LogKit is stable and used in many products but not
- actively developed. Many logkit utilities (ie- Excalibur
- Logging) are now part of the
- <a href="http://excalibur.apache.org">Apache Excalibur</a>
- Project.
- </td>
</tr>
</table>
</section>
Modified: avalon/trunk/central/site/src/xdocs/products/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/navigation.xml Sat Jun 19 17:15:01 2004
@@ -25,9 +25,9 @@
<menu>
<item name="Merlin Runtime" href="runtime/index.html"/>
<!-- <item name="Merlin Studio" href="studio/index.html"/> -->
- <item name="Merlin Discovery" href="discovery/index.html"/>
+ <!-- <item name="Merlin Discovery" href="discovery/index.html"/> -->
<item name="Developer Tools" href="tools/index.html"/>
- <item name="Legacy Avalon" href="legacy/index.html"/>
+ <item name="Legacy" href="legacy/index.html"/>
</menu>
</body>
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/execmodes/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/execmodes/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/execmodes/index.xml Sat Jun 19 17:15:01 2004
@@ -26,7 +26,7 @@
<body>
- <section name="Embedding">
+ <section name="Execution Modes">
<p>INDEX IN PREPARATION</p>
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/index.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/index.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/index.xml Sat Jun 19 17:15:01 2004
@@ -10,7 +10,7 @@
<table>
<tr><th>Group</th><th>Description</th></tr>
<tr>
- <td><a href="../@RUNTIME-VERSION@/api/index.html">Component API</a></td>
+ <td><a href="../../../avalon/runtime/@RUNTIME-VERSION@/api/index.html">Component API</a></td>
<td>
The set of interfaces included within the Component API define
the computational contract between a component and a container.
@@ -19,7 +19,7 @@
</td>
</tr>
<tr>
- <td><a href="../@RUNTIME-VERSION@/spi/index.html">Facilities SPI</a></td>
+ <td><a href="../../../avalon/runtime/@RUNTIME-VERSION@/spi/index.html">Facilities SPI</a></td>
<td>
The set of interfaces included within the Component SPI defines
the container meta-model within which component types are managed.
@@ -30,7 +30,7 @@
</td>
</tr>
<tr>
- <td><a href="../@RUNTIME-VERSION@/impl/index.html">Platform Implementation</a></td>
+ <td><a href="../../../avalon/runtime/@RUNTIME-VERSION@/impl/index.html">Platform Implementation</a></td>
<td>
The Platform Javadocs cover the full suite of API, SPI and the internal
implementation systems. This documentation is primarily of interest to
Modified: avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/navigation.xml
==============================================================================
--- avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/navigation.xml (original)
+++ avalon/trunk/central/site/src/xdocs/products/runtime/javadoc/navigation.xml Sat Jun 19 17:15:01 2004
@@ -22,10 +22,13 @@
<title>Merlin Runtime</title>
<body>
- <menu>
- <item name="Component API" href="../@RUNTIME-VERSION@/api/index.html"/>
- <item name="Facilities SPI" href="../@RUNTIME-VERSION@/spi/index.html"/>
- <item name="Platform Impl" href="../@RUNTIME-VERSION@/impl/index.html"/>
+ <menu>
+ <!-- disabled pending resolution of bug in xdoc generation -->
+ <!--
+ <item name="Component API" href="../../../@RUNTIME-VERSION@/api/index.html"/>
+ <item name="Facilities SPI" href="../../../@RUNTIME-VERSION@/spi/index.html"/>
+ <item name="Platform Impl" href="../../../@RUNTIME-VERSION@/impl/index.html"/>
+ -->
</menu>
</body>
Modified: avalon/trunk/central/system/build/reactor.xml
==============================================================================
--- avalon/trunk/central/system/build/reactor.xml (original)
+++ avalon/trunk/central/system/build/reactor.xml Sat Jun 19 17:15:01 2004
@@ -31,20 +31,22 @@
<x:reactor target="test"/>
</target>
- <target name="site">
+ <target name="install">
<x:home/>
- <x:reactor target="site"/>
+ <x:reactor target="install"/>
</target>
- <target name="install">
+ <!--
+ <target name="site">
<x:home/>
- <x:reactor target="install"/>
+ <x:reactor target="site"/>
</target>
<target name="dist">
<x:home/>
<x:reactor target="dist"/>
</target>
+ -->
</project>
Modified: avalon/trunk/central/system/build/standard.xml
==============================================================================
--- avalon/trunk/central/system/build/standard.xml (original)
+++ avalon/trunk/central/system/build/standard.xml Sat Jun 19 17:15:01 2004
@@ -23,10 +23,6 @@
<x:javac/>
</target>
- <target name="javadoc" depends="prepare">
- <x:javadoc/>
- </target>
-
<target name="package" depends="build">
<x:jar/>
</target>
@@ -36,14 +32,20 @@
</target>
<target name="install" depends="test">
- <x:install/>
+ <x:install docs="false"/>
+ </target>
+
+ <target name="javadoc" depends="prepare">
+ <x:javadoc/>
</target>
- <target name="site" depends="build,javadoc">
+ <target name="xdoc" depends="prepare">
<x:xdoc theme="modern"/>
</target>
- <target name="dist" depends="test,site,install"/>
+ <target name="site" depends="javadoc,xdoc"/>
+ <target name="dist" depends="install,site"/>
+
</project>
Modified: avalon/trunk/central/system/index.xml
==============================================================================
--- avalon/trunk/central/system/index.xml (original)
+++ avalon/trunk/central/system/index.xml Sat Jun 19 17:15:01 2004
@@ -90,9 +90,6 @@
<group>avalon</group>
<name>site</name>
</info>
- <dependencies>
- <include key="avalon-runtime"/>
- </dependencies>
</project>
<!--
Modified: avalon/trunk/planet/tutorials/dynamics/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/dynamics/build.xml (original)
+++ avalon/trunk/planet/tutorials/dynamics/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-tutorial-dynamics" default="dist" basedir="."
+<project name="avalon-tutorial-dynamics" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/planet/tutorials/hello/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/hello/build.xml (original)
+++ avalon/trunk/planet/tutorials/hello/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-tutorial-hello" default="dist" basedir="."
+<project name="avalon-tutorial-hello" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/activation/api/build.xml
==============================================================================
--- avalon/trunk/runtime/activation/api/build.xml (original)
+++ avalon/trunk/runtime/activation/api/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-activation-api" default="dist" basedir=".">
+<project name="avalon-activation-api" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/activation/build.xml
==============================================================================
--- avalon/trunk/runtime/activation/build.xml (original)
+++ avalon/trunk/runtime/activation/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="activation" default="dist" basedir=".">
+<project name="activation" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/reactor.xml"/>
Modified: avalon/trunk/runtime/activation/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/activation/impl/build.xml (original)
+++ avalon/trunk/runtime/activation/impl/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-activation-impl" default="dist" basedir="."
+<project name="avalon-activation-impl" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/build.xml
==============================================================================
--- avalon/trunk/runtime/build.xml (original)
+++ avalon/trunk/runtime/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="runtime" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="runtime" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
<import file="${project.home}/build/reactor.xml"/>
Modified: avalon/trunk/runtime/composition/api/build.xml
==============================================================================
--- avalon/trunk/runtime/composition/api/build.xml (original)
+++ avalon/trunk/runtime/composition/api/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-composition-api" default="dist" basedir=".">
+<project name="avalon-composition-api" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/composition/build.xml
==============================================================================
--- avalon/trunk/runtime/composition/build.xml (original)
+++ avalon/trunk/runtime/composition/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="composition" default="dist" basedir=".">
+<project name="composition" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/reactor.xml"/>
Modified: avalon/trunk/runtime/composition/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/composition/impl/build.xml (original)
+++ avalon/trunk/runtime/composition/impl/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-composition-impl" default="dist" basedir="."
+<project name="avalon-composition-impl" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/composition/spi/build.xml
==============================================================================
--- avalon/trunk/runtime/composition/spi/build.xml (original)
+++ avalon/trunk/runtime/composition/spi/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-composition-spi" default="dist" basedir=".">
+<project name="avalon-composition-spi" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/framework/api/build.xml
==============================================================================
--- avalon/trunk/runtime/framework/api/build.xml (original)
+++ avalon/trunk/runtime/framework/api/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-framework-api" default="dist" basedir=".">
+<project name="avalon-framework-api" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/framework/build.xml
==============================================================================
--- avalon/trunk/runtime/framework/build.xml (original)
+++ avalon/trunk/runtime/framework/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="test" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="test" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
<import file="${project.home}/build/reactor.xml"/>
Modified: avalon/trunk/runtime/framework/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/framework/impl/build.xml (original)
+++ avalon/trunk/runtime/framework/impl/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-framework-impl" default="dist" basedir=".">
+<project name="avalon-framework-impl" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/framework/legacy/build.xml
==============================================================================
--- avalon/trunk/runtime/framework/legacy/build.xml (original)
+++ avalon/trunk/runtime/framework/legacy/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-framework-api" default="dist" basedir=".">
+<project name="avalon-framework-api" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/logging/api/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/api/build.xml (original)
+++ avalon/trunk/runtime/logging/api/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-api" default="dist" basedir=".">
+<project name="avalon-logging-api" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/logging/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/build.xml (original)
+++ avalon/trunk/runtime/logging/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="avalon-logging" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
<import file="${project.home}/build/reactor.xml"/>
Modified: avalon/trunk/runtime/logging/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/impl/build.xml (original)
+++ avalon/trunk/runtime/logging/impl/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-impl" default="dist" basedir=".">
+<project name="avalon-logging-impl" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/logging/log4j/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/log4j/build.xml (original)
+++ avalon/trunk/runtime/logging/log4j/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-log4j" default="dist" basedir="."
+<project name="avalon-logging-log4j" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/logging/logkit/api/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/api/build.xml (original)
+++ avalon/trunk/runtime/logging/logkit/api/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-logkit-api" default="dist" basedir="."
+<project name="avalon-logging-logkit-api" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/logging/logkit/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/impl/build.xml (original)
+++ avalon/trunk/runtime/logging/logkit/impl/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-logkit-impl" default="dist" basedir="."
+<project name="avalon-logging-logkit-impl" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/logging/logkit/plugins/datagram/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/plugins/datagram/build.xml (original)
+++ avalon/trunk/runtime/logging/logkit/plugins/datagram/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-logkit-datagram" default="dist" basedir="."
+<project name="avalon-logging-logkit-datagram" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/logging/logkit/plugins/socket/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/plugins/socket/build.xml (original)
+++ avalon/trunk/runtime/logging/logkit/plugins/socket/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-logkit-socket" default="dist" basedir="."
+<project name="avalon-logging-logkit-socket" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/logging/logkit/plugins/syslog/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/logkit/plugins/syslog/build.xml (original)
+++ avalon/trunk/runtime/logging/logkit/plugins/syslog/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-logkit-syslog" default="dist" basedir="."
+<project name="avalon-logging-logkit-syslog" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/logging/spi/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/spi/build.xml (original)
+++ avalon/trunk/runtime/logging/spi/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-spi" default="dist" basedir=".">
+<project name="avalon-logging-spi" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/logging/test/build.xml
==============================================================================
--- avalon/trunk/runtime/logging/test/build.xml (original)
+++ avalon/trunk/runtime/logging/test/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logging-tet" default="dist" basedir="."
+<project name="avalon-logging-tet" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/logkit/build.xml
==============================================================================
--- avalon/trunk/runtime/logkit/build.xml (original)
+++ avalon/trunk/runtime/logkit/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-logkit" default="dist" basedir=".">
+<project name="avalon-logkit" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/main/build.properties
==============================================================================
--- avalon/trunk/runtime/main/build.properties (original)
+++ avalon/trunk/runtime/main/build.properties Sat Jun 19 17:15:01 2004
@@ -1,3 +1,3 @@
project.name = avalon-runtime
project.home = ../../central/system
-project.javadoc.enabled = true
\ No newline at end of file
+project.javadoc.enabled = false
\ No newline at end of file
Modified: avalon/trunk/runtime/main/build.xml
==============================================================================
--- avalon/trunk/runtime/main/build.xml (original)
+++ avalon/trunk/runtime/main/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-runtime" default="dist" basedir=".">
+<project name="avalon-runtime" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/merlin/api/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/api/build.xml (original)
+++ avalon/trunk/runtime/merlin/api/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-merlin-api" default="dist" basedir=".">
+<project name="avalon-merlin-api" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/merlin/cli/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/cli/build.xml (original)
+++ avalon/trunk/runtime/merlin/cli/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-merlin-cli" default="dist" basedir="."
+<project name="avalon-merlin-cli" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/merlin/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/impl/build.xml (original)
+++ avalon/trunk/runtime/merlin/impl/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-merlin-impl" default="dist" basedir="."
+<project name="avalon-merlin-impl" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/merlin/unit/build.xml
==============================================================================
--- avalon/trunk/runtime/merlin/unit/build.xml (original)
+++ avalon/trunk/runtime/merlin/unit/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-merlin-unit" default="dist" basedir="."
+<project name="avalon-merlin-unit" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/meta/api/build.xml
==============================================================================
--- avalon/trunk/runtime/meta/api/build.xml (original)
+++ avalon/trunk/runtime/meta/api/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-meta-api" default="dist" basedir=".">
+<project name="avalon-meta-api" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/meta/build.xml
==============================================================================
--- avalon/trunk/runtime/meta/build.xml (original)
+++ avalon/trunk/runtime/meta/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="meta" default="dist" basedir="."
+<project name="meta" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/meta/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/meta/impl/build.xml (original)
+++ avalon/trunk/runtime/meta/impl/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-meta-impl" default="dist" basedir=".">
+<project name="avalon-meta-impl" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/meta/spi/build.xml
==============================================================================
--- avalon/trunk/runtime/meta/spi/build.xml (original)
+++ avalon/trunk/runtime/meta/spi/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-meta-spi" default="dist" basedir="."
+<project name="avalon-meta-spi" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/meta/tools/build.xml
==============================================================================
--- avalon/trunk/runtime/meta/tools/build.xml (original)
+++ avalon/trunk/runtime/meta/tools/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-meta-tools" default="dist" basedir="."
+<project name="avalon-meta-tools" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/repository/api/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/api/build.xml (original)
+++ avalon/trunk/runtime/repository/api/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-repository-api" default="dist" basedir=".">
+<project name="avalon-repository-api" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/repository/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/build.xml (original)
+++ avalon/trunk/runtime/repository/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="repository" default="dist" basedir="."
+<project name="repository" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/repository/cli/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/cli/build.xml (original)
+++ avalon/trunk/runtime/repository/cli/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-repository-cli" default="dist" basedir=".">
+<project name="avalon-repository-cli" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/repository/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/impl/build.xml (original)
+++ avalon/trunk/runtime/repository/impl/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-repository-impl" default="dist" basedir="."
+<project name="avalon-repository-impl" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/repository/main/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/main/build.xml (original)
+++ avalon/trunk/runtime/repository/main/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-repository-main" default="dist" basedir="."
+<project name="avalon-repository-main" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/repository/spi/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/spi/build.xml (original)
+++ avalon/trunk/runtime/repository/spi/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-repository-spi" default="dist" basedir=".">
+<project name="avalon-repository-spi" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/repository/test/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/test/build.xml (original)
+++ avalon/trunk/runtime/repository/test/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-repository-test" default="dist" basedir="."
+<project name="avalon-repository-test" default="test" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/repository/util/build.xml
==============================================================================
--- avalon/trunk/runtime/repository/util/build.xml (original)
+++ avalon/trunk/runtime/repository/util/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-repository-util" default="dist" basedir=".">
+<project name="avalon-repository-util" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/test/build.xml
==============================================================================
--- avalon/trunk/runtime/test/build.xml (original)
+++ avalon/trunk/runtime/test/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="test" default="dist" basedir="."
+<project name="test" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/test/components/build.xml
==============================================================================
--- avalon/trunk/runtime/test/components/build.xml (original)
+++ avalon/trunk/runtime/test/components/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-test-components" default="dist" basedir="."
+<project name="avalon-test-components" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/test/dynamics/build.xml
==============================================================================
--- avalon/trunk/runtime/test/dynamics/build.xml (original)
+++ avalon/trunk/runtime/test/dynamics/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-test-dynamics" default="dist" basedir="."
+<project name="avalon-test-dynamics" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/test/includes/build.xml
==============================================================================
--- avalon/trunk/runtime/test/includes/build.xml (original)
+++ avalon/trunk/runtime/test/includes/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-test-includes" default="dist" basedir="."
+<project name="avalon-test-includes" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/test/playground/build.xml
==============================================================================
--- avalon/trunk/runtime/test/playground/build.xml (original)
+++ avalon/trunk/runtime/test/playground/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-test-playground" default="dist" basedir="."
+<project name="avalon-test-playground" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/test/testa/build.xml
==============================================================================
--- avalon/trunk/runtime/test/testa/build.xml (original)
+++ avalon/trunk/runtime/test/testa/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-test-testa" default="dist" basedir="."
+<project name="avalon-test-testa" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools" >
<property file="build.properties"/>
Modified: avalon/trunk/runtime/test/testb/build.xml
==============================================================================
--- avalon/trunk/runtime/test/testb/build.xml (original)
+++ avalon/trunk/runtime/test/testb/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-test-testb" default="dist" basedir="."
+<project name="avalon-test-testb" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools" >
<property file="build.properties"/>
Modified: avalon/trunk/runtime/test/testc/build.xml
==============================================================================
--- avalon/trunk/runtime/test/testc/build.xml (original)
+++ avalon/trunk/runtime/test/testc/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-test-testc" default="dist" basedir="."
+<project name="avalon-test-testc" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
Modified: avalon/trunk/runtime/test/testd/build.xml
==============================================================================
--- avalon/trunk/runtime/test/testd/build.xml (original)
+++ avalon/trunk/runtime/test/testd/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-test-testd" default="dist" basedir="."
+<project name="avalon-test-testd" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools" >
<property file="build.properties"/>
Modified: avalon/trunk/runtime/test/teste/build.xml
==============================================================================
--- avalon/trunk/runtime/test/teste/build.xml (original)
+++ avalon/trunk/runtime/test/teste/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-test-teste" default="dist" basedir="."
+<project name="avalon-test-teste" default="install" basedir="."
xmlns:x="antlib:org.apache.avalon.tools" >
<property file="build.properties"/>
Modified: avalon/trunk/runtime/util/build.xml
==============================================================================
--- avalon/trunk/runtime/util/build.xml (original)
+++ avalon/trunk/runtime/util/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="test" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="test" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
<import file="${project.home}/build/reactor.xml"/>
Modified: avalon/trunk/runtime/util/configuration/build.xml
==============================================================================
--- avalon/trunk/runtime/util/configuration/build.xml (original)
+++ avalon/trunk/runtime/util/configuration/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-util-configuration" default="dist" basedir=".">
+<project name="avalon-util-configuration" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/util/criteria/build.xml
==============================================================================
--- avalon/trunk/runtime/util/criteria/build.xml (original)
+++ avalon/trunk/runtime/util/criteria/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-util-criteria" default="dist" basedir=".">
+<project name="avalon-util-criteria" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/util/defaults/build.xml
==============================================================================
--- avalon/trunk/runtime/util/defaults/build.xml (original)
+++ avalon/trunk/runtime/util/defaults/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-util-criteria" default="dist" basedir=".">
+<project name="avalon-util-criteria" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/util/env/build.xml
==============================================================================
--- avalon/trunk/runtime/util/env/build.xml (original)
+++ avalon/trunk/runtime/util/env/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-util-env" default="dist" basedir=".">
+<project name="avalon-util-env" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/util/exception/build.xml
==============================================================================
--- avalon/trunk/runtime/util/exception/build.xml (original)
+++ avalon/trunk/runtime/util/exception/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-util-exception" default="dist" basedir=".">
+<project name="avalon-util-exception" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/util/extension/api/build.xml
==============================================================================
--- avalon/trunk/runtime/util/extension/api/build.xml (original)
+++ avalon/trunk/runtime/util/extension/api/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-util-extension-api" default="dist" basedir=".">
+<project name="avalon-util-extension-api" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/util/extension/build.xml
==============================================================================
--- avalon/trunk/runtime/util/extension/build.xml (original)
+++ avalon/trunk/runtime/util/extension/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="test" default="dist" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
+<project name="test" default="install" basedir="." xmlns:x="antlib:org.apache.avalon.tools">
<property file="build.properties"/>
<import file="${project.home}/build/reactor.xml"/>
Modified: avalon/trunk/runtime/util/extension/impl/build.xml
==============================================================================
--- avalon/trunk/runtime/util/extension/impl/build.xml (original)
+++ avalon/trunk/runtime/util/extension/impl/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-util-extension-impl" default="dist" basedir=".">
+<project name="avalon-util-extension-impl" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/util/i18n/build.xml
==============================================================================
--- avalon/trunk/runtime/util/i18n/build.xml (original)
+++ avalon/trunk/runtime/util/i18n/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-util-i18n" default="dist" basedir=".">
+<project name="avalon-util-i18n" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/runtime/util/lifecycle/build.xml
==============================================================================
--- avalon/trunk/runtime/util/lifecycle/build.xml (original)
+++ avalon/trunk/runtime/util/lifecycle/build.xml Sat Jun 19 17:15:01 2004
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<project name="avalon-util-lifecycle" default="dist" basedir=".">
+<project name="avalon-util-lifecycle" default="install" basedir=".">
<property file="build.properties"/>
<import file="${project.home}/build/standard.xml"/>
</project>
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/antlib.xml
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/antlib.xml (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/antlib.xml Sat Jun 19 17:15:01 2004
@@ -20,5 +20,6 @@
<taskdef name="artifact" classname="org.apache.avalon.tools.tasks.ArtifactTask"/>
<taskdef name="bar" classname="org.apache.avalon.tools.tasks.BarTask"/>
<taskdef name="javadoc" classname="org.apache.avalon.tools.tasks.JavadocTask"/>
+ <taskdef name="publish" classname="org.apache.avalon.tools.tasks.PublishTask"/>
</antlib>
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Definition.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Definition.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/project/Definition.java Sat Jun 19 17:15:01 2004
@@ -131,6 +131,22 @@
return (ResourceRef[]) list.toArray( new ResourceRef[0] );
}
+ public File getDocDirectory()
+ {
+ File cache = getHome().getDocsRepository().getCacheDirectory();
+ File root = new File( cache, getInfo().getGroup() );
+ File artifact = new File( root, getInfo().getName() );
+ String version = getInfo().getVersion();
+ if( null == version )
+ {
+ return artifact;
+ }
+ else
+ {
+ return new File( artifact, version );
+ }
+ }
+
public String toString()
{
return "[" + getInfo().getGroup() + "/" + getInfo().getName() + "]";
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/InstallTask.java Sat Jun 19 17:15:01 2004
@@ -41,15 +41,58 @@
*/
public class InstallTask extends SystemTask
{
+ private String m_id;
+ private String m_target;
+ private boolean m_deliverables = true;
+ private boolean m_docs = true;
+
+ public void setId( String id )
+ {
+ m_id = id;
+ }
+
+ public void setDeliverables( boolean flag )
+ {
+ m_deliverables = flag;
+ }
+
+ public void setDocs( boolean flag )
+ {
+ m_docs = flag;
+ }
+
public void execute() throws BuildException
{
- installDeliverables();
- installDocs();
+ Definition definition = getReferenceDefinition();
+ if( m_deliverables )
+ {
+ log( "installing deliverables" );
+ installDeliverables( definition );
+ }
+ if( m_docs )
+ {
+ log( "installing docs" );
+ installDocs( definition );
+ }
}
- private void installDeliverables()
+ private Definition getReferenceDefinition()
{
- File deliverables = getContext().getDeliverablesDirectory();
+ if( null != m_id )
+ {
+ return getHome().getDefinition( m_id );
+ }
+ else
+ {
+ return getHome().getDefinition( getKey() );
+ }
+ }
+
+ private void installDeliverables( Definition definition )
+ {
+ File basedir = definition.getBasedir();
+ File target = new File( basedir, Context.TARGET );
+ File deliverables = new File( target, Context.DELIVERABLES );
if( deliverables.exists() )
{
File cache = getHome().getRepository().getCacheDirectory();
@@ -57,25 +100,28 @@
fileset.setDir( deliverables );
fileset.createInclude().setName( "**/*" );
String group = getHome().getDefinition( getKey() ).getInfo().getGroup();
- File target = new File( cache, group );
- copy( target, fileset );
+ File destination = new File( cache, group );
+ copy( destination, fileset );
}
}
- private void installDocs()
+ private void installDocs( Definition definition )
{
File cache = getHome().getDocsRepository().getCacheDirectory();
- File source = getContext().getDocsDirectory();
+ File basedir = definition.getBasedir();
+ File target = new File( basedir, Context.TARGET );
+ File source = new File( target, Context.DOCS );
+
if( source.exists() )
{
FileSet fileset = new FileSet();
fileset.setDir( source );
fileset.createInclude().setName( "**/*" );
- String group = getHome().getDefinition( getKey() ).getInfo().getGroup();
- String name = getHome().getDefinition( getKey() ).getInfo().getName();
+ String group = definition.getInfo().getGroup();
+ String name = definition.getInfo().getName();
File parent = new File( cache, group );
- File target = new File( parent, name );
- copy( target, fileset );
+ File destination = new File( parent, name );
+ copy( destination, fileset );
}
}
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JavadocTask.java Sat Jun 19 17:15:01 2004
@@ -25,6 +25,7 @@
import org.apache.tools.ant.Task;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.FileSet;
import org.apache.tools.ant.types.DirSet;
import org.apache.tools.ant.types.Path;
import org.apache.tools.ant.taskdefs.Javadoc;
@@ -47,8 +48,6 @@
private static final Link J2SE =
new Link( "http://java.sun.com/j2se/1.4/docs/api/" );
- public static final String JAVADOC_PRODUCTION_KEY = "project.javadoc.enabled";
-
public static class Link
{
private String m_href;
@@ -155,16 +154,10 @@
public static final String SPI = "spi";
public static final String IMPL = "impl";
- private String m_root;
private String m_id;
private String m_title;
private List m_links = new ArrayList();
- public void setRoot( String root )
- {
- m_root = root;
- }
-
public void setId( String id )
{
m_id = id;
@@ -184,21 +177,17 @@
public void execute() throws BuildException
{
- String actionable = getProject().getProperty( JAVADOC_PRODUCTION_KEY );
- if( "true".equals( actionable ) )
- {
- Definition def = getReferenceDefinition();
- File root = getJavadocRootDirectory( def );
- Path classpath = def.getPath( getProject(), Policy.RUNTIME );
-
- File api = new File( root, "api" );
- File spi = new File( root, "spi" );
- File imp = new File( root, "impl" );
-
- setup( def, classpath, ResourceRef.API, api, false );
- setup( def, classpath, ResourceRef.SPI, spi, false );
- setup( def, classpath, ResourceRef.IMPL, imp, true );
- }
+ Definition def = getReferenceDefinition();
+ File root = def.getDocDirectory();
+ Path classpath = def.getPath( getProject(), Policy.RUNTIME );
+
+ File api = new File( root, "api" );
+ File spi = new File( root, "spi" );
+ File imp = new File( root, "impl" );
+
+ setup( def, classpath, ResourceRef.API, api, false );
+ setup( def, classpath, ResourceRef.SPI, spi, false );
+ setup( def, classpath, ResourceRef.IMPL, imp, true );
}
private void setup(
@@ -209,7 +198,6 @@
if( refs.length > 0 )
{
String message = ResourceRef.getCategoryName( category );
- log( "Javadoc " + message + " generation." );
generate( def, classpath, refs, category, root, flag );
}
}
@@ -224,7 +212,10 @@
javadoc.setDestdir( root );
Path source = javadoc.createSourcepath();
javadoc.createClasspath().add( classpath );
- javadoc.setDoctitle( getTitle( definition, category ) );
+ final String title = getTitle( definition, category );
+ javadoc.setDoctitle( title );
+
+ log( "Generating: " + title );
for( int i=0; i<m_links.size(); i++ )
{
@@ -298,9 +289,11 @@
javadoc.execute();
}
+ /*
private File getJavadocRootDirectory( Definition def )
{
- File docs = getProductRoot( def );
+ //File docs = getContext().getDocsDirectory();
+ File docs = getDocRoot( def );
String version = def.getInfo().getVersion();
if( null == version )
@@ -312,19 +305,7 @@
return new File( docs, version );
}
}
-
- private File getProductRoot( Definition def )
- {
- File docs = getContext().getDocsDirectory();
- if( m_root != null )
- {
- return Context.getFile( docs, m_root );
- }
- else
- {
- return docs;
- }
- }
+ */
private String getTitle( Definition def, int category )
{
Added: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PublishTask.java
==============================================================================
--- (empty file)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/PublishTask.java Sat Jun 19 17:15:01 2004
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2004 Apache Software Foundation
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.avalon.tools.tasks;
+
+import java.io.File;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.taskdefs.Copy;
+
+import org.apache.avalon.tools.home.Context;
+import org.apache.avalon.tools.home.Home;
+import org.apache.avalon.tools.project.Definition;
+
+public class PublishTask extends SystemTask
+{
+ private String m_path;
+
+ public void setPath( String path )
+ {
+ m_path = path;
+ }
+
+ public void execute()
+ {
+ File basedir = getProject().getBaseDir();
+ File target = new File( basedir, Context.TARGET );
+ File source = new File( target, Context.DOCS );
+
+ if( source.exists() )
+ {
+ File destination = getPath();
+ FileSet fileset = new FileSet();
+ fileset.setDir( source );
+ fileset.createInclude().setName( "**/*" );
+
+ copy( destination, fileset );
+ }
+ }
+
+ /**
+ * Return the path relative to the document cache to which
+ * documentation content will be published. If no path has
+ * been declared, the default path return is equivalent to
+ * ${project.doc.cache}/[group]/[name]
+ */
+ private File getPath()
+ {
+ String key = getKey();
+ Definition definition = getHome().getDefinition( key );
+ File cache = getHome().getDocsRepository().getCacheDirectory();
+ if( null == m_path )
+ {
+ String group = definition.getInfo().getGroup();
+ String name = definition.getInfo().getName();
+ File parent = new File( cache, group );
+ return new File( parent, name );
+ }
+ else
+ {
+ return Context.getFile( cache, m_path );
+ }
+ }
+
+ private void copy( File destination, FileSet fileset )
+ {
+ mkDir( destination );
+ Copy copy = (Copy) getProject().createTask( "copy" );
+ copy.setPreserveLastModified( true );
+ copy.setTodir( destination );
+ copy.addFileset( fileset );
+ copy.init();
+ copy.execute();
+ }
+
+}
\ No newline at end of file
Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java (original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/XdocTask.java Sat Jun 19 17:15:01 2004
@@ -414,5 +414,5 @@
m = m_Excludes.matcher( fullpath );
return ! m.matches() ;
}
- }
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org