notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
svn commit: r1269 - in development/laboratory/central: . site site/src/docs/products/metro site/src/docs/products/metro/javadoc
- From: mcconnell AT netcompartner.com
- To: notify-dpml AT lists.ibiblio.org
- Subject: svn commit: r1269 - in development/laboratory/central: . site site/src/docs/products/metro site/src/docs/products/metro/javadoc
- Date: Thu, 23 Dec 2004 12:24:18 +0100
Author: mcconnell
Date: Thu Dec 23 12:24:18 2004
New Revision: 1269
Removed:
development/laboratory/central/site/src/docs/products/metro/javadoc/
Modified:
development/laboratory/central/index.xml
development/laboratory/central/site/build.xml
development/laboratory/central/site/src/docs/products/metro/navigation.xml
Log:
fix site generation
Modified: development/laboratory/central/index.xml
==============================================================================
--- development/laboratory/central/index.xml (original)
+++ development/laboratory/central/index.xml Thu Dec 23 12:24:18 2004
@@ -1,47 +1,42 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-
-<index>
-
- <import uri="artifact:module:dpml/magic/dpml-magic#SNAPSHOT"/>
- <import uri="artifact:module:dpml/metro/dpml-metro#SNAPSHOT"/>
- <import uri="artifact:module:dpml/metro/tools/dpml-metro-tools#SNAPSHOT"/>
-
- <!-- Need a Tutorial Module in 'main/' -->
- <!-- import uri="artifact:module:dpml/tutorials/dpml-tutorials#SNAPSHOT" /
-->
-
- <!--
- Module
- -->
-
- <project file="module.xml">
- <info>
- <group>dpml/central</group>
- <name>dpml-central</name>
- <version>1.0.0</version>
- <status>SNAPSHOT</status>
- <type>module</type>
- </info>
- <dependencies>
- <include key="dpml-util"/>
- <include key="dpml-transit"/>
- <include key="dpml-magic"/>
- <include key="dpml-metro"/>
- </dependencies>
- </project>
-
- <!--
- Central.
- -->
-
- <project basedir="site">
- <info>
- <group>dpml/central</group>
- <name>dpml-central-site-lab</name>
- <type>doc</type>
- </info>
- <plugins>
- <include key="dpml-magic-publish" />
- </plugins>
- </project>
-
-</index>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<index>
+
+ <import uri="artifact:module:dpml/central/dpml-central#SNAPSHOT"/>
+
+ <!--
+ Module
+ -->
+
+ <project file="module.xml">
+ <info>
+ <group>dpml/central</group>
+ <name>dpml-central-lab</name>
+ <version>1.0.0</version>
+ <status>SNAPSHOT</status>
+ <type>module</type>
+ </info>
+ <dependencies>
+ <include key="dpml-util"/>
+ <include key="dpml-transit"/>
+ <include key="dpml-magic"/>
+ <include key="dpml-metro"/>
+ </dependencies>
+ </project>
+
+ <!--
+ Central.
+ -->
+
+ <project basedir="site">
+ <info>
+ <group>dpml/central</group>
+ <name>dpml-central-site-lab</name>
+ <type>doc</type>
+ </info>
+ <plugins>
+ <include key="dpml-magic-publish" />
+ </plugins>
+ </project>
+
+</index>
Modified: development/laboratory/central/site/build.xml
==============================================================================
--- development/laboratory/central/site/build.xml (original)
+++ development/laboratory/central/site/build.xml Thu Dec 23 12:24:18
2004
@@ -1,86 +1,80 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-
-<project name="dpml-central-site-lab" default="update" basedir="."
- xmlns:magic="antlib:net.dpml.magic"
- xmlns:x="plugin:dpml/magic/dpml-magic-core" >
-
- <magic:import uri="artifact:template:dpml/magic/standard"/>
-
- <target name="init" depends="standard.init">
- <x:filter key="dpml-metro-main" feature="version"
- token="RUNTIME-VERSION"/>
- <x:filter key="dpml-logging-api" feature="spec"
- token="LOGGING-API-SPEC"/>
- <x:filter key="dpml-activity-api" feature="spec"
- token="ACTIVITY-API-SPEC"/>
- <x:filter key="dpml-context-api" feature="spec"
- token="CONTEXT-API-SPEC"/>
- <x:filter key="dpml-service-api" feature="spec"
- token="SERVICE-API-SPEC"/>
- <x:filter key="dpml-system-impl" feature="plugin"
- token="SYSTEM-PLUGIN-URI"/>
- <x:filter key="dpml-composition-impl" feature="plugin"
- token="COMPOSITION-PLUGIN-URI"/>
- <x:filter key="dpml-logging-logkit-impl" feature="plugin"
- token="LOGGING-LOGKIT-PLUGIN-URI"/>
- <x:filter key="dpml-logging-log4j" feature="plugin"
- token="LOGGING-LOG4J-PLUGIN-URI"/>
- <x:filter key="dpml-activation-impl" feature="plugin"
- token="RUNTIME-PLUGIN-URI"/>
- <x:filter key="dpml-activation-avalon-provider" feature="plugin"
- token="AVALON-RUNTIME-PLUGIN-URI"/>
- <x:filter key="dpml-activation-metro-provider" feature="plugin"
- token="METRO-RUNTIME-PLUGIN-URI"/>
- <x:filter key="dpml-metro-main" feature="plugin"
- token="METRO-PLUGIN-URI"/>
- <x:filter key="dpml-transit" feature="api"
- token="TRANSIT-DOCS-PATH"/>
- <x:filter key="dpml-magic" feature="api"
- token="MAGIC-DOCS-PATH"/>
- <x:filter key="dpml-metro-public" feature="api"
- token="METRO-PUBLIC-DOCS-PATH"/>
- <x:filter key="dpml-metro-protected" feature="api"
- token="METRO-PROTECTED-DOCS-PATH"/>
- <x:filter key="dpml-metro-private" feature="api"
- token="METRO-PRIVATE-DOCS-PATH"/>
- <x:filter key="dpml-metro-tools" feature="api"
- token="METRO-TOOLS-DOCS-PATH"/>
- <x:filter key="dpml-magic-core" feature="plugin"
- token="MAGIC-CORE-PLUGIN-URI"/>
-
- <x:filter key="dpml-tutorial-hello" feature="spec"
- token="TUTORIAL-HELLO-SPEC"/>
- <x:filter key="dpml-configuration-api" feature="spec"
- token="CONFIGURATION-API-SPEC"/>
- <x:filter key="dpml-tutorial-context-custom" feature="spec"
- token="TUTORIAL-CONTEXT-CUSTOM-SPEC"/>
- <x:filter key="dpml-tutorial-context-casting" feature="spec"
- token="TUTORIAL-CONTEXT-CASTING-SPEC"/>
- <x:filter key="dpml-tutorial-location-api" feature="spec"
- token="TUTORIAL-LOCATION-API-SPEC"/>
- <x:filter key="dpml-tutorial-location-impl" feature="spec"
- token="TUTORIAL-LOCATION-IMPL-SPEC"/>
- <x:filter key="dpml-tutorial-publisher-api" feature="spec"
- token="TUTORIAL-PUBLISHER-API-SPEC"/>
- <x:filter key="dpml-tutorial-publisher-impl" feature="spec"
- token="TUTORIAL-PUBLISHER-IMPL-SPEC"/>
- </target>
-
- <target name="javadoc" depends="prepare"/>
-
- <target name="docs" depends="prepare">
- <x:property name="spec" feature="plugin" key="dpml-magic-doc"/>
- <magic:plugin uri="${spec}">
- <task class="net.dpml.magic.doc.DocTask" name="docs"/>
- </magic:plugin>
- <docs/>
- </target>
-
- <target name="update" depends="docs">
- <publish xmlns="plugin:dpml/magic/dpml-magic-publish" path="central"/>
- </target>
-
- <target name="install" depends="docs"/>
-
-</project>
-
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<project name="dpml-central-site-lab" default="update" basedir="."
+ xmlns:magic="antlib:net.dpml.magic"
+ xmlns:x="plugin:dpml/magic/dpml-magic-core" >
+
+ <magic:import uri="artifact:template:dpml/magic/standard"/>
+
+ <target name="init" depends="standard.init">
+ <x:filter key="dpml-metro-main" feature="version"
+ token="RUNTIME-VERSION"/>
+ <x:filter key="dpml-logging-api" feature="spec"
+ token="LOGGING-API-SPEC"/>
+ <x:filter key="dpml-activity-api" feature="spec"
+ token="ACTIVITY-API-SPEC"/>
+ <x:filter key="dpml-context-api" feature="spec"
+ token="CONTEXT-API-SPEC"/>
+ <x:filter key="dpml-service-api" feature="spec"
+ token="SERVICE-API-SPEC"/>
+ <x:filter key="dpml-system-impl" feature="plugin"
+ token="SYSTEM-PLUGIN-URI"/>
+ <x:filter key="dpml-composition-impl" feature="plugin"
+ token="COMPOSITION-PLUGIN-URI"/>
+ <x:filter key="dpml-logging-logkit-impl" feature="plugin"
+ token="LOGGING-LOGKIT-PLUGIN-URI"/>
+ <x:filter key="dpml-logging-log4j" feature="plugin"
+ token="LOGGING-LOG4J-PLUGIN-URI"/>
+ <x:filter key="dpml-activation-impl" feature="plugin"
+ token="RUNTIME-PLUGIN-URI"/>
+ <x:filter key="dpml-activation-avalon-provider" feature="plugin"
+ token="AVALON-RUNTIME-PLUGIN-URI"/>
+ <x:filter key="dpml-activation-metro-provider" feature="plugin"
+ token="METRO-RUNTIME-PLUGIN-URI"/>
+ <x:filter key="dpml-metro-main" feature="plugin"
+ token="METRO-PLUGIN-URI"/>
+ <x:filter key="dpml-transit" feature="api"
+ token="TRANSIT-DOCS-PATH"/>
+ <x:filter key="dpml-magic" feature="api"
+ token="MAGIC-DOCS-PATH"/>
+ <x:filter key="dpml-metro" feature="api"
+ token="METRO-DOCS-PATH"/>
+ <x:filter key="dpml-magic-core" feature="plugin"
+ token="MAGIC-CORE-PLUGIN-URI"/>
+
+ <x:filter key="dpml-tutorial-hello" feature="spec"
+ token="TUTORIAL-HELLO-SPEC"/>
+ <x:filter key="dpml-configuration-api" feature="spec"
+ token="CONFIGURATION-API-SPEC"/>
+ <x:filter key="dpml-tutorial-context-custom" feature="spec"
+ token="TUTORIAL-CONTEXT-CUSTOM-SPEC"/>
+ <x:filter key="dpml-tutorial-context-casting" feature="spec"
+ token="TUTORIAL-CONTEXT-CASTING-SPEC"/>
+ <x:filter key="dpml-tutorial-location-api" feature="spec"
+ token="TUTORIAL-LOCATION-API-SPEC"/>
+ <x:filter key="dpml-tutorial-location-impl" feature="spec"
+ token="TUTORIAL-LOCATION-IMPL-SPEC"/>
+ <x:filter key="dpml-tutorial-publisher-api" feature="spec"
+ token="TUTORIAL-PUBLISHER-API-SPEC"/>
+ <x:filter key="dpml-tutorial-publisher-impl" feature="spec"
+ token="TUTORIAL-PUBLISHER-IMPL-SPEC"/>
+ </target>
+
+ <target name="javadoc" depends="prepare"/>
+
+ <target name="docs" depends="prepare">
+ <x:property name="spec" feature="plugin" key="dpml-magic-doc"/>
+ <magic:plugin uri="${spec}">
+ <task class="net.dpml.magic.doc.DocTask" name="docs"/>
+ </magic:plugin>
+ <docs/>
+ </target>
+
+ <target name="update" depends="docs">
+ <publish xmlns="plugin:dpml/magic/dpml-magic-publish" path="central"/>
+ </target>
+
+ <target name="install" depends="docs"/>
+
+</project>
+
Modified:
development/laboratory/central/site/src/docs/products/metro/navigation.xml
==============================================================================
---
development/laboratory/central/site/src/docs/products/metro/navigation.xml
(original)
+++
development/laboratory/central/site/src/docs/products/metro/navigation.xml
Thu Dec 23 12:24:18 2004
@@ -29,7 +29,7 @@
<item name="System" href="system/index.html"/>
<item name="Composition" href="composition/index.html"/>
<item name="Runtime" href="runtime/index.html"/>
- <item name="Javadoc" href="javadoc/index.html"/>
+ <item name="Javadoc" href="../../../@METRO-DOCS-PATH@/index.html"/>
</menu>
</body>
- svn commit: r1269 - in development/laboratory/central: . site site/src/docs/products/metro site/src/docs/products/metro/javadoc, mcconnell, 12/23/2004
Archive powered by MHonArc 2.6.24.